From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, David Howells <dhowells@redhat.com>
Subject: Re: linux-next: manual merge of the pci tree
Date: Fri, 4 Jul 2008 10:09:33 +1000 [thread overview]
Message-ID: <20080704100933.c39faef1.sfr@canb.auug.org.au> (raw)
In-Reply-To: <200807031223.10287.jbarnes@virtuousgeek.org>
[-- Attachment #1: Type: text/plain, Size: 1012 bytes --]
Hi Jesse,
On Thu, 3 Jul 2008 12:23:10 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> > Yes, Greg send him these patches earlier today :)
>
> Ok I guess I have to merge upstream into my linux-next tree then. I've really
> been trying to avoid that so far, but I guess it's time...
Not really. You just need to make the changes that are in Greg's patches
and he will drop his version. Basically, the just change every all
references to ->bus_id to use dev_name() and any setting of bus_id (or
pci_name) to use dev_set_name.
Even if Greg doesn't drop his, I can handle the trivial conflicts until
he does.
Unless, of course, there are other changes in upstream that affect all
this (like you don't yet have the part of Linus' tree that defines
dev_name and dev_set_name).
(I should stop writing emails as a train of thought - it ends up as a
wreck too often :-))
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-07-04 0:09 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
2008-07-03 19:23 ` Jesse Barnes
2008-07-04 0:09 ` Stephen Rothwell [this message]
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=20080704100933.c39faef1.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=greg@kroah.com \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-next@vger.kernel.org \
/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).