Home » Mailing list archives » linux-kernel » 2010 » April » 27

linux-next: manual merge of the tty tree with the net tree

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Stephen Rothwell
Subject: linux-next: manual merge of the tty tree with the net tree
Date: Monday, April 26, 2010 - 8:57 pm

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/
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
linux-next: manual merge of the tty tree with the net tree, Stephen Rothwell, (Mon Apr 26, 8:57 pm)