From: Jesse Barnes <jbarnes@virtuousgeek•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
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: Thu, 3 Jul 2008 17:13:01 -0700 [thread overview]
Message-ID: <200807031713.01352.jbarnes@virtuousgeek.org> (raw)
In-Reply-To: <20080704100933.c39faef1.sfr@canb.auug.org.au>
On Thursday, July 03, 2008 5:09 pm Stephen Rothwell wrote:
> 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.
Yeah, I saw that I already had the dev_set_name commit in my linux-next
branch, so I went ahead and made the change. When master.kernel.org comes
back I'll actually push it. :)
Jesse
next prev parent reply other threads:[~2008-07-04 0:13 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
2008-07-04 0:13 ` Jesse Barnes [this message]
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=200807031713.01352.jbarnes@virtuousgeek.org \
--to=jbarnes@virtuousgeek$(echo .)org \
--cc=dhowells@redhat$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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