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,
Wolfram Sang <w.sang@pengutronix.de>,
Ken Kawasaki <ken_kawasaki@spring.nifty.jp>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the tty.current tree with the net-current tree
Date: Wed, 16 Sep 2009 19:12:02 -0700 [thread overview]
Message-ID: <20090917021202.GA7757@kroah.com> (raw)
In-Reply-To: <20090917105442.297b6ea1.sfr@canb.auug.org.au>
On Thu, Sep 17, 2009 at 10:54:42AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty.current tree got a conflict in
> drivers/serial/serial_cs.c between commit
> 531afd64d027e3d798c416b2b37b3cfb1de417d9 ("pcnet_cs: add cis of Linksys
> multifunction pcmcia card") from the net-current tree and commit
> 5cea4a4e15a918f19d32fd3dc9a5056f333847c3 ("tty: serial/pcmcia: add ID for
> Advantech card") from the tty.current tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix
> for a while.
Thanks, I'll handle this when I sync back up with Linus's tree tomorrow.
greg k-h
next prev parent reply other threads:[~2009-09-17 2:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-17 0:54 linux-next: manual merge of the tty.current tree with the net-current tree Stephen Rothwell
2009-09-17 2:12 ` Greg KH [this message]
2009-09-17 2:44 ` Stephen Rothwell
2009-09-18 17:27 ` 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=20090917021202.GA7757@kroah.com \
--to=greg@kroah.com \
--cc=davem@davemloft.net \
--cc=ken_kawasaki@spring.nifty.jp \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=w.sang@pengutronix.de \
/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).