From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sjur Braendeland <sjur.brandeland@stericsson•com>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, Pavan Savoy <pavan_savoy@ti•com>
Subject: linux-next: manual merge of the tty tree with the net tree
Date: Tue, 27 Apr 2010 13:57:06 +1000 [thread overview]
Message-ID: <20100427135706.259fa9c9.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-04-27 3:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-27 3:57 Stephen Rothwell [this message]
2010-04-27 15:14 ` linux-next: manual merge of the tty tree with the net tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2010-04-29 5:56 Stephen Rothwell
2010-04-29 6:13 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100427135706.259fa9c9.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pavan_savoy@ti$(echo .)com \
--cc=sjur.brandeland@stericsson$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox