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, Alan Cox <alan@linux.intel.com>
Subject: Re: linux-next: manual merge of the tty tree with the net tree
Date: Wed, 28 Apr 2010 23:13:58 -0700 [thread overview]
Message-ID: <20100429061358.GA7069@kroah.com> (raw)
In-Reply-To: <20100429155655.479e0982.sfr@canb.auug.org.au>
On Thu, Apr 29, 2010 at 03:56:55PM +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
> 39658c58ebb52fe7a3488fd520aa89c75721fd20 ("tty: n_gsm line discipline")
> from the tty tree.
>
> I used number 21 for the n_gsm line discipline (see below) and 30 for
> NR_LDISCS and can carry this fix as necessary.
That fix looks fine, thanks,
greg k-h
next prev parent reply other threads:[~2010-04-29 6:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-29 5:56 linux-next: manual merge of the tty tree with the net tree Stephen Rothwell
2010-04-29 5:56 ` Stephen Rothwell
2010-04-29 6:13 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-04-27 3:57 Stephen Rothwell
2010-04-27 3:57 ` Stephen Rothwell
2010-04-27 15:14 ` 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=20100429061358.GA7069@kroah.com \
--to=greg@kroah.com \
--cc=alan@linux.intel.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.