From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jesse Barnes <jbarnes@virtuousgeek•org>
Cc: linux-next@vger•kernel.org,
Kenji Kaneshige <kaneshige.kenji@jp•fujitsu.com>,
Justin Chen <justin.chen@hp•com>
Subject: linux-next: manual merge of the pci tree
Date: Tue, 6 Jan 2009 11:54:06 +1100 [thread overview]
Message-ID: <20090106115406.41638593.sfr@canb.auug.org.au> (raw)
Hi Jesse,
Today's linux-next merge of the pci tree got a conflict in
drivers/pci/hotplug/acpiphp_glue.c between commit
b6adc1955d31515be6631e63b1fe4bcdcd41db77 ("PCI hotplug: acpiphp wants a
64-bit _SUN") from Linus' tree and commit
5a21939b5703db326c314cf30b9f2d37df6a8e1f ("PCI hotplug: introduce
functions for ACPI slot detection") from the pci tree.
Just changed context. I fixed it up (see below), but it should be
fixed by merging with Linus' tree (one way or the other).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/pci/hotplug/acpiphp_glue.c
index 3affc64,ffa47be..0000000
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@@ -255,9 -194,8 +194,8 @@@ register_slot(acpi_handle handle, u32 l
bridge->nr_slots++;
- dbg("found ACPI PCI Hotplug slot %d at PCI %04x:%02x:%02x\n",
+ dbg("found ACPI PCI Hotplug slot %llu at PCI %04x:%02x:%02x\n",
- slot->sun, pci_domain_nr(bridge->pci_bus),
- bridge->pci_bus->number, slot->device);
+ slot->sun, pci_domain_nr(pbus), pbus->number, device);
retval = acpiphp_register_hotplug_slot(slot);
if (retval) {
if (retval == -EBUSY)
next reply other threads:[~2009-01-06 0:54 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-06 0:54 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-02-19 22:40 linux-next: manual merge of the pci tree 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-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=20090106115406.41638593.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jbarnes@virtuousgeek$(echo .)org \
--cc=justin.chen@hp$(echo .)com \
--cc=kaneshige.kenji@jp$(echo .)fujitsu.com \
--cc=linux-next@vger$(echo .)kernel.org \
/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