From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Thomas Petazzoni <thomas.petazzoni@enix.org>
Subject: Re: linux-next: manual merge of the pci tree
Date: Mon, 20 Oct 2008 11:36:50 -0700 [thread overview]
Message-ID: <200810201136.50643.jbarnes@virtuousgeek.org> (raw)
In-Reply-To: <20081020150051.3a3f751f.sfr@canb.auug.org.au>
On Sunday, October 19, 2008 9:00 pm Stephen Rothwell wrote:
> Hi Jesse,
>
> Today's linux-next merge of the pci tree got a conflict in
> drivers/pci/quirks.c between commit
> 2e532d68a2b3e2aa6b19731501222069735c741c ("{pci,pnp} quirks.c: don't use
> deprecated print_fn_descriptor_symbol()") from Linus' tree and commit
> 9a1e6932e1129d0c6b5f06ea39282b21f892a114 ("PCI: allow quirks to be
> compiled out") from the pci tree.
>
> The former commit (which matches commit
> 248cb30af8bd95f1af95d54c0a9558dc2ac62a55 ("PCI: use %pF instead of
> print_fn_descriptor_symbol() in quirks.c") in the pci tree) updates code
> that was moved by the latter. Since the pci tree also does that update,
> I just used the pci tree version.
Sounds good. I just rebased onto master so that should be fixed up now.
--
Jesse Barnes, Intel Open Source Technology Center
next prev parent reply other threads:[~2008-10-20 18:37 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-20 4:00 linux-next: manual merge of the pci tree Stephen Rothwell
2008-10-20 18:36 ` Jesse Barnes [this message]
-- 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-16 3:24 Stephen Rothwell
2008-10-16 12:32 ` Jesse Barnes
2008-07-08 1:13 Stephen Rothwell
2008-07-03 2:10 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
2008-07-04 0:14 ` 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=200810201136.50643.jbarnes@virtuousgeek.org \
--to=jbarnes@virtuousgeek.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=thomas.petazzoni@enix.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).