From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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: Re: linux-next: manual merge of the tty tree with the net tree
Date: Tue, 27 Apr 2010 08:14:34 -0700 [thread overview]
Message-ID: <20100427151434.GD7653@kroah.com> (raw)
In-Reply-To: <20100427135706.259fa9c9.sfr@canb.auug.org.au>
On Tue, Apr 27, 2010 at 01:57:06PM +1000, Stephen Rothwell wrote:
> 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.
Thanks, the higher number should be what is needed here.
greg k-h
next prev parent reply other threads:[~2010-04-27 15:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-27 3:57 linux-next: manual merge of the tty tree with the net tree Stephen Rothwell
2010-04-27 15:14 ` Greg KH [this message]
-- 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=20100427151434.GD7653@kroah.com \
--to=greg@kroah.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pavan_savoy@ti.com \
--cc=sfr@canb.auug.org.au \
--cc=sjur.brandeland@stericsson.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).