Messages in this thread | | | Date | Wed, 28 Nov 2012 08:47:26 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the tty tree |
| |
On Wed, Nov 28, 2012 at 04:14:30PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/dgrp/dgrp_tty.c between commit 3ba89e96610b ("staging: > dgrp: dgrp_tty.c: Remove the TIOCSSOFTCAR ioctl handler from dgrp > driver") from the tty tree and commit 8fdefcb0ab74 ("staging: dgrp: > remove TIOCGSOFTCAR and TIOCSSOFTCAR handling") from the staging tree. > > I fixed it up (using the staging tree version - since it is a superset of > the tty tree version) and can carry the fix as necessary (no action is > required).
That is correct, thanks for doing this.
greg k-h
| |