Messages in this thread |  | | Date | Thu, 17 Jan 2013 10:40:36 +0100 | From | Samuel Iglesias Gonsalvez <> | Subject | Re: linux-next: manual merge of the char-misc tree with the tty tree |
| |
On Thu, Jan 17, 2013 at 01:54:20PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in > drivers/ipack/devices/ipoctal.c between commit 2e124b4a390c ("TTY: switch > tty_flip_buffer_push") from the tty tree and commits 7e5730d7c222 > ("ipack/devices/ipoctal: fix kernel bug when using pppd"), > e7e664fd688a ("ipack/devices/ipoctal: protect the channel data processing > with a spinlock") and b06073f963b7 ("ipack/devices/ipoctal: remove > redundant tty_flip_buffer_push()") from the char-misc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good to me.
Thanks!
Sam [unhandled content-type:application/pgp-signature] |  |