From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Alan Stern <stern@rowland.harvard.edu>
Subject: Re: linux-next: manual merge of the driver-core tree
Date: Mon, 21 Jul 2008 20:14:23 -0700 [thread overview]
Message-ID: <20080722031423.GA32013@kroah.com> (raw)
In-Reply-To: <20080722105640.8cb5989b.sfr@canb.auug.org.au>
On Tue, Jul 22, 2008 at 10:56:40AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/usb/core/devio.c between commit
> e04199b2167e88f0e2d0410fafaa2c35ff7ba8c1 ("usbfs: don't store bad
> pointers in registration") from Linus' tree and commits
> 56d207f2504091e7a173640b91cb39072a2f4542 ("device create: usb: convert
> device_create to device_create_drvdata")
> 0de4509ad6495261fba5ebb539ac6fbb5cf66999 ("device create: usb: convert
> device_create_drvdata to device_create") from the driver-core tree.
>
> I did the (reasonably obvious) fixup in usb_classdev_add. Probably worth
> a check when I publish the tree.
If the code builds properly, the merge succeeded :)
I'll look at this as I hit this myself when pushing the USB tree to
Linus. Now it's down to the driver-core tree having to handle these
fixups...
thanks,
greg k-h
next prev parent reply other threads:[~2008-07-22 3:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-22 0:56 linux-next: manual merge of the driver-core tree Stephen Rothwell
2008-07-22 3:14 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the driver-core tree Thierry Reding
2013-10-01 13:54 ` Greg Kroah-Hartman
2008-12-03 23:44 Stephen Rothwell
2008-12-04 4:21 ` Greg KH
2008-12-04 10:42 ` Paul Mackerras
2008-12-04 18:00 ` Greg KH
2009-01-04 23:28 ` Stephen Rothwell
2009-01-05 4:36 ` Greg KH
2009-01-05 5:57 ` Stephen Rothwell
2008-12-01 0:15 Stephen Rothwell
2008-12-01 9:23 ` Russell King
2008-12-01 11:17 ` Catalin Marinas
2008-12-01 17:32 ` Catalin Marinas
2008-12-01 23:31 ` Stephen Rothwell
2008-10-14 3:09 Stephen Rothwell
2008-10-14 3:05 Stephen Rothwell
2008-10-14 3:02 Stephen Rothwell
2008-10-14 2:57 Stephen Rothwell
2008-10-14 2:50 Stephen Rothwell
2008-10-14 3:51 ` Greg KH
2008-07-23 1:31 Stephen Rothwell
2008-07-23 4:21 ` Greg KH
2008-07-23 8:09 ` Stephen Rothwell
2008-07-23 14:04 ` Greg KH
2008-07-18 1:02 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=20080722031423.GA32013@kroah.com \
--to=greg@kroah.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=stern@rowland.harvard.edu \
/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).