From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Matthew Wilcox <willy@linux.intel.com>,
Alex Chiang <achiang@hp.com>
Subject: linux-next: manual merge of the pci tree with Linus' tree
Date: Tue, 30 Jun 2009 11:56:38 +1000 [thread overview]
Message-ID: <20090630115638.7bfb8e21.sfr@canb.auug.org.au> (raw)
Hi Jesse,
Today's linux-next merge of the pci tree got conflicts in
arch/ia64/include/asm/pci.h, arch/mn10300/include/asm/pci.h and
include/asm-generic/pci.h between commit
a6c140969b4685f9b9f6773c0760f55ca66d1825 ("Delete pcibios_select_root")
from Linus' tree and commit a53cd7419b22c14b5a1e6859a940fb6bfa77963f
("PCI: remove pcibios_scan_all_fns()") from the pci tree.
Just context changes (adjacent removals). I fixed it up (see below) and
can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/ia64/include/asm/pci.h
index fcfca56,55281aa..0000000
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@@ -135,7 -134,18 +134,6 @@@ extern void pcibios_resource_to_bus(str
extern void pcibios_bus_to_resource(struct pci_dev *dev,
struct resource *res, struct pci_bus_region *region);
- #define pcibios_scan_all_fns(a, b) 0
-static inline struct resource *
-pcibios_select_root(struct pci_dev *pdev, struct resource *res)
-{
- struct resource *root = NULL;
-
- if (res->flags & IORESOURCE_IO)
- root = &ioport_resource;
- if (res->flags & IORESOURCE_MEM)
- root = &iomem_resource;
-
- return root;
-}
#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
diff --cc arch/mn10300/include/asm/pci.h
index 35d2ed6,de52a27..0000000
--- a/arch/mn10300/include/asm/pci.h
+++ b/arch/mn10300/include/asm/pci.h
@@@ -102,7 -106,18 +102,6 @@@ extern void pcibios_bus_to_resource(str
struct resource *res,
struct pci_bus_region *region);
- #define pcibios_scan_all_fns(a, b) 0
-static inline struct resource *
-pcibios_select_root(struct pci_dev *pdev, struct resource *res)
-{
- struct resource *root = NULL;
-
- if (res->flags & IORESOURCE_IO)
- root = &ioport_resource;
- if (res->flags & IORESOURCE_MEM)
- root = &iomem_resource;
-
- return root;
-}
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{
diff --cc include/asm-generic/pci.h
index b4326b5,095cca8..0000000
--- a/include/asm-generic/pci.h
+++ b/include/asm-generic/pci.h
@@@ -30,7 -30,18 +30,6 @@@ pcibios_bus_to_resource(struct pci_dev
res->end = region->end;
}
- #define pcibios_scan_all_fns(a, b) 0
-static inline struct resource *
-pcibios_select_root(struct pci_dev *pdev, struct resource *res)
-{
- struct resource *root = NULL;
-
- if (res->flags & IORESOURCE_IO)
- root = &ioport_resource;
- if (res->flags & IORESOURCE_MEM)
- root = &iomem_resource;
-
- return root;
-}
#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
next reply other threads:[~2009-06-30 1:56 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-30 1:56 Stephen Rothwell [this message]
2009-06-30 2:01 ` linux-next: manual merge of the pci tree with Linus' tree Jesse Barnes
2009-06-30 2:16 ` Matthew Wilcox
2009-06-30 16:00 ` Jesse Barnes
2009-10-14 0:05 Stephen Rothwell
2009-10-14 0:38 ` Jesse Barnes
2009-10-14 2:10 ` Stephen Rothwell
2009-10-14 7:41 ` David Woodhouse
2009-12-07 0:25 Stephen Rothwell
2009-12-07 0:25 Stephen Rothwell
2010-12-20 2:08 Stephen Rothwell
2012-06-19 1:15 Stephen Rothwell
2012-06-25 2:31 Stephen Rothwell
2012-06-25 6:32 ` huang ying
2012-06-25 14:14 ` Alan Stern
2012-09-04 1:59 Stephen Rothwell
2012-09-04 6:57 ` Yuval Mintz
2012-09-04 2:04 Stephen Rothwell
2013-06-04 1:49 Stephen Rothwell
2013-06-04 2:11 ` Bjorn Helgaas
2013-06-17 1:42 Stephen Rothwell
2016-01-20 23:33 Stephen Rothwell
2016-06-23 1:44 Stephen Rothwell
2016-06-23 16:43 ` Bjorn Helgaas
2016-12-08 23:44 Stephen Rothwell
2017-06-26 0:51 Stephen Rothwell
2017-07-03 2:58 ` Stephen Rothwell
2018-03-26 1:23 Stephen Rothwell
2018-03-27 16:19 ` Rob Herring
2018-04-03 2:29 Stephen Rothwell
2018-07-20 1:03 Stephen Rothwell
2018-07-20 9:15 ` Lorenzo Pieralisi
2018-07-20 10:49 ` Thomas Petazzoni
2019-09-19 12:33 Mark Brown
2020-03-24 23:58 Stephen Rothwell
2020-03-30 23:49 Stephen Rothwell
2020-03-31 8:37 ` Geert Uytterhoeven
2020-05-14 1:02 Stephen Rothwell
2021-02-23 0:19 Stephen Rothwell
2021-08-25 0:57 Stephen Rothwell
2022-01-13 23:45 Stephen Rothwell
2022-01-14 5:48 ` Sergio Paracuellos
2022-01-14 6:53 ` Stephen Rothwell
2022-01-14 6:57 ` Sergio Paracuellos
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=20090630115638.7bfb8e21.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=achiang@hp.com \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=willy@linux.intel.com \
/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).