Messages in this thread | | | Date | Tue, 27 Apr 2010 13:57:06 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tty tree with the net tree |
| |
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in include/linux/tty.h between commit 9b27105b4a44c54bf91ecd7d0315034ae75684f7 ("net-caif-driver: add CAIF serial driver (ldisc)") from the net tree and commit f3150d54db0e0caa1871f66b2424f463a34a7e7b ("serial: TTY: new ldiscs for staging") from the tty tree.
I fixed it up (they both changed NR_LDISCS - I used the higher number) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |