From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>,
linux-next@vger.kernel.org, David Howells <dhowells@redhat.com>
Subject: Re: linux-next: manual merge of the pci tree
Date: Wed, 2 Jul 2008 20:28:42 -0700 [thread overview]
Message-ID: <20080703032842.GA26951@kroah.com> (raw)
In-Reply-To: <20080703121055.d6f49ae5.sfr@canb.auug.org.au>
On Thu, Jul 03, 2008 at 12:10:55PM +1000, Stephen Rothwell wrote:
> Hi Jesse,
>
> Today's linux-next merge of the pci tree got a conflict in between
> commit 4433d5ff973e2c1ea2f923eea8935588e7b96c06 ("PCI: handle pci_name()
> being const") from the driver-core tree and commit
> 8b285ce84bbc719e363a796f466404576b840d36 ("PCI: fix pci_setup_device()'s
> sprinting into a const buffer") from the pci tree.
>
> Jesse, since dev_set_name is now in mainline, you really should drop this
> commit and replace it with the one from the driver-core tree (which Greg
> has hopefully sent you by now). Or add the equivalent on top of what you
> have.
>
> I have appended it below in case.
Yes, Greg send him these patches earlier today :)
next prev parent reply other threads:[~2008-07-03 3:35 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-03 2:10 linux-next: manual merge of the pci tree Stephen Rothwell
2008-07-03 2:15 ` Stephen Rothwell
2008-07-03 3:28 ` Greg KH [this message]
2008-07-03 19:23 ` Jesse Barnes
2008-07-04 0:09 ` Stephen Rothwell
2008-07-04 0:13 ` Jesse Barnes
2008-07-04 0:14 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2017-02-19 22:40 Stephen Rothwell
2009-01-06 0:54 Stephen Rothwell
2008-12-11 0:53 Stephen Rothwell
2008-10-20 4:00 Stephen Rothwell
2008-10-20 18:36 ` Jesse Barnes
2008-10-16 3:24 Stephen Rothwell
2008-10-16 12:32 ` Jesse Barnes
2008-07-08 1:13 Stephen Rothwell
2008-07-01 3:53 Stephen Rothwell
2008-07-01 5:58 ` Ingo Molnar
2008-07-01 6:29 ` Stephen Rothwell
2008-07-02 1:56 ` Jesse Barnes
2008-07-02 2:09 ` Yinghai Lu
2008-07-02 3:19 ` Stephen Rothwell
2008-06-25 3:01 Stephen Rothwell
2008-06-25 19:28 ` Jesse Barnes
2008-06-25 2:57 Stephen Rothwell
2008-06-25 19:27 ` Jesse Barnes
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=20080703032842.GA26951@kroah.com \
--to=greg@kroah.com \
--cc=dhowells@redhat.com \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-next@vger.kernel.org \
--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).