From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Jonathan McDowell <noodles@earth.li>,
Jeff Garzik <jgarzik@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Denis Joseph Barrow <D.Barow@option.com>
Subject: Re: linux-next: manual merge of the usb tree
Date: Sun, 9 Nov 2008 17:40:57 -0800 [thread overview]
Message-ID: <20081110014057.GA5996@kroah.com> (raw)
In-Reply-To: <20081110120620.c41afd61.sfr@canb.auug.org.au>
On Mon, Nov 10, 2008 at 12:06:20PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/net/usb/hso.c between commit
> 939a9516416ad8ccec27aa05bd19236c550c0c03 ("[netdrvr] usb/hso: Cleanup
> rfkill error handling") from the net-current tree and commit
> d0797ae05df8297aa1db7216c8814419047d5a12 ("HSO: put linefeeds on printk's
> in hso.c") from the usb tree.
>
> Some of the changes from the latter have been done on the former and the
> former added some code next to those changes. I have fixed it up for now
> but the net-current change will (presumably) be in Linus' tree shortly,
> so I expect this to be fixed in the usb tree soon.
Thanks, I'll drop the HSO patches from the usb tree as Jeff has now
picked them up.
greg k-h
next prev parent reply other threads:[~2008-11-10 3:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-10 1:06 linux-next: manual merge of the usb tree Stephen Rothwell
2008-11-10 1:40 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the usb tree Thierry Reding
2013-10-22 18:02 ` Srinivas Pandruvada
2008-10-14 3:53 Stephen Rothwell
2008-10-14 3:47 Stephen Rothwell
2008-10-14 3:37 Stephen Rothwell
2008-10-14 3:31 Stephen Rothwell
2008-10-14 5:44 ` Alexey Klimov
2008-10-14 3:27 Stephen Rothwell
2008-07-17 0:54 Stephen Rothwell
2008-07-17 7:04 ` Greg KH
2008-07-16 2:02 Stephen Rothwell
2008-07-16 2:30 ` Greg KH
2008-07-16 7:06 ` Jaswinder Singh
2008-07-16 7:13 ` Stephen Rothwell
2008-07-16 7:20 ` Jaswinder Singh
2008-07-16 7:45 ` Stephen Rothwell
2008-07-16 7:49 ` Jaswinder Singh
2008-07-16 7:58 ` Stephen Rothwell
2008-07-07 3:09 Stephen Rothwell
2008-07-07 14:09 ` Alan Stern
2008-07-07 16:09 ` Stephen Rothwell
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=20081110014057.GA5996@kroah.com \
--to=greg@kroah.com \
--cc=D.Barow@option.com \
--cc=davem@davemloft.net \
--cc=jgarzik@redhat.com \
--cc=linux-next@vger.kernel.org \
--cc=noodles@earth.li \
--cc=sfr@canb.auug.org.au \
/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).