fixes for two wrong backports

3 files changed, 502 insertions, 0 deletions

diff --git a/patches/don-t-bugger-nd-seq-on-set_root_rcu-from-follow_dotdot_rcu.patch b/patches/don-t-bugger-nd-seq-on-set_root_rcu-from-follow_dotdot_rcu.patch
new file mode 100644
index 0000000..eedcf31
--- /dev/null
+++ b/patches/don-t-bugger-nd-seq-on-set_root_rcu-from-follow_dotdot_rcu.patch
@@ -0,0 +1,38 @@
+From 7bd88377d482e1eae3c5329b12e33cfd664fa6a9 Mon Sep 17 00:00:00 2001
+From: Al Viro <viro@zeniv.linux.org.uk>
+Date: Sat, 13 Sep 2014 21:55:46 -0400
+Subject: don't bugger nd->seq on set_root_rcu() from follow_dotdot_rcu()
+
+commit 7bd88377d482e1eae3c5329b12e33cfd664fa6a9 upstream.
+
+return the value instead, and have path_init() do the assignment.  Broken by
+"vfs: Fix absolute RCU path walk failures due to uninitialized seq number",
+which was Cc-stable with 2.6.38+ as destination.  This one should go where
+it went.
+
+To avoid dummy value returned in case when root is already set (it would do
+no harm, actually, since the only caller that doesn't ignore the return value
+is guaranteed to have nd->root *not* set, but it's more obvious that way),
+lift the check into callers.  And do the same to set_root(), to keep them
+in sync.
+
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Cc: Ian Jackson <ian.jackson@eu.citrix.com>
+[lizf: the previous backport of this upstream commit is buggy. fix it]
+Signed-off-by: Zefan Li <lizefan@huawei.com>
+---
+ fs/namei.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -579,7 +579,8 @@ static __always_inline int __vfs_follow_
+ 		goto fail;
+ 
+ 	if (*link == '/') {
+-		set_root(nd);
++		if (!nd->root.mnt)
++			set_root(nd);
+ 		path_put(&nd->path);
+ 		nd->path = nd->root;
+ 		path_get(&nd->root);
diff --git a/patches/pci-convert-pcibios_resource_to_bus-to-take-a-pci_bus-not-a-pci_dev.patch b/patches/pci-convert-pcibios_resource_to_bus-to-take-a-pci_bus-not-a-pci_dev.patch
new file mode 100644
index 0000000..7045084
--- /dev/null
+++ b/patches/pci-convert-pcibios_resource_to_bus-to-take-a-pci_bus-not-a-pci_dev.patch
@@ -0,0 +1,462 @@
+From fc2798502f860b18f3c7121e4dc659d3d9d28d74 Mon Sep 17 00:00:00 2001
+From: Yinghai Lu <yinghai@kernel.org>
+Date: Mon, 9 Dec 2013 22:54:40 -0800
+Subject: PCI: Convert pcibios_resource_to_bus() to take a pci_bus, not a
+ pci_dev
+
+commit fc2798502f860b18f3c7121e4dc659d3d9d28d74 upstream.
+
+These interfaces:
+
+  pcibios_resource_to_bus(struct pci_dev *dev, *bus_region, *resource)
+  pcibios_bus_to_resource(struct pci_dev *dev, *resource, *bus_region)
+
+took a pci_dev, but they really depend only on the pci_bus.  And we want to
+use them in resource allocation paths where we have the bus but not a
+device, so this patch converts them to take the pci_bus instead of the
+pci_dev:
+
+  pcibios_resource_to_bus(struct pci_bus *bus, *bus_region, *resource)
+  pcibios_bus_to_resource(struct pci_bus *bus, *resource, *bus_region)
+
+In fact, with standard PCI-PCI bridges, they only depend on the host
+bridge, because that's the only place address translation occurs, but
+we aren't going that far yet.
+
+[bhelgaas: changelog]
+Signed-off-by: Yinghai Lu <yinghai@kernel.org>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Cc: Dirk Behme <dirk.behme@gmail.com>
+[lizf: Backported to 3.4:
+ - make changes to pci_host_bridge() instead of find_pci_root_bus()
+ - adjust context]
+Signed-off-by: Zefan Li <lizefan@huawei.com>
+---
+ arch/alpha/kernel/pci-sysfs.c       |    4 ++--
+ arch/powerpc/kernel/pci_of_scan.c   |    4 ++--
+ arch/sparc/kernel/pci.c             |   12 ++++++------
+ drivers/pci/probe.c                 |   32 +++++++++++++++-----------------
+ drivers/pci/rom.c                   |    2 +-
+ drivers/pci/setup-bus.c             |   14 +++++++-------
+ drivers/pci/setup-res.c             |    2 +-
+ drivers/pcmcia/i82092.c             |    2 +-
+ drivers/pcmcia/yenta_socket.c       |    6 +++---
+ drivers/scsi/sym53c8xx_2/sym_glue.c |    5 +++--
+ drivers/video/arkfb.c               |    2 +-
+ drivers/video/s3fb.c                |    2 +-
+ drivers/video/vt8623fb.c            |    2 +-
+ include/linux/pci.h                 |    4 ++--
+ 14 files changed, 46 insertions(+), 47 deletions(-)
+
+--- a/arch/alpha/kernel/pci-sysfs.c
++++ b/arch/alpha/kernel/pci-sysfs.c
+@@ -84,7 +84,7 @@ static int pci_mmap_resource(struct kobj
+ 	if (iomem_is_exclusive(res->start))
+ 		return -EINVAL;
+ 
+-	pcibios_resource_to_bus(pdev, &bar, res);
++	pcibios_resource_to_bus(pdev->bus, &bar, res);
+ 	vma->vm_pgoff += bar.start >> (PAGE_SHIFT - (sparse ? 5 : 0));
+ 	mmap_type = res->flags & IORESOURCE_MEM ? pci_mmap_mem : pci_mmap_io;
+ 
+@@ -140,7 +140,7 @@ static int sparse_mem_mmap_fits(struct p
+ 	long dense_offset;
+ 	unsigned long sparse_size;
+ 
+-	pcibios_resource_to_bus(pdev, &bar, &pdev->resource[num]);
++	pcibios_resource_to_bus(pdev->bus, &bar, &pdev->resource[num]);
+ 
+ 	/* All core logic chips have 4G sparse address space, except
+ 	   CIA which has 16G (see xxx_SPARSE_MEM and xxx_DENSE_MEM
+--- a/arch/powerpc/kernel/pci_of_scan.c
++++ b/arch/powerpc/kernel/pci_of_scan.c
+@@ -111,7 +111,7 @@ static void of_pci_parse_addrs(struct de
+ 		res->name = pci_name(dev);
+ 		region.start = base;
+ 		region.end = base + size - 1;
+-		pcibios_bus_to_resource(dev, res, &region);
++		pcibios_bus_to_resource(dev->bus, res, &region);
+ 	}
+ }
+ 
+@@ -276,7 +276,7 @@ void __devinit of_scan_pci_bridge(struct
+ 		res->flags = flags;
+ 		region.start = of_read_number(&ranges[1], 2);
+ 		region.end = region.start + size - 1;
+-		pcibios_bus_to_resource(dev, res, &region);
++		pcibios_bus_to_resource(dev->bus, res, &region);
+ 	}
+ 	sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),
+ 		bus->number);
+--- a/arch/sparc/kernel/pci.c
++++ b/arch/sparc/kernel/pci.c
+@@ -409,7 +409,7 @@ static void __devinit pci_cfg_fake_range
+ 		res2.flags = res->flags;
+ 		region.start = base;
+ 		region.end = limit + 0xfff;
+-		pcibios_bus_to_resource(dev, &res2, &region);
++		pcibios_bus_to_resource(dev->bus, &res2, &region);
+ 		if (!res->start)
+ 			res->start = res2.start;
+ 		if (!res->end)
+@@ -427,7 +427,7 @@ static void __devinit pci_cfg_fake_range
+ 			      IORESOURCE_MEM);
+ 		region.start = base;
+ 		region.end = limit + 0xfffff;
+-		pcibios_bus_to_resource(dev, res, &region);
++		pcibios_bus_to_resource(dev->bus, res, &region);
+ 	}
+ 
+ 	pci_read_config_word(dev, PCI_PREF_MEMORY_BASE, &mem_base_lo);
+@@ -458,7 +458,7 @@ static void __devinit pci_cfg_fake_range
+ 			      IORESOURCE_MEM | IORESOURCE_PREFETCH);
+ 		region.start = base;
+ 		region.end = limit + 0xfffff;
+-		pcibios_bus_to_resource(dev, res, &region);
++		pcibios_bus_to_resource(dev->bus, res, &region);
+ 	}
+ }
+ 
+@@ -480,7 +480,7 @@ static void __devinit apb_fake_ranges(st
+ 	res->flags = IORESOURCE_IO;
+ 	region.start = (first << 21);
+ 	region.end = (last << 21) + ((1 << 21) - 1);
+-	pcibios_bus_to_resource(dev, res, &region);
++	pcibios_bus_to_resource(dev->bus, res, &region);
+ 
+ 	pci_read_config_byte(dev, APB_MEM_ADDRESS_MAP, &map);
+ 	apb_calc_first_last(map, &first, &last);
+@@ -488,7 +488,7 @@ static void __devinit apb_fake_ranges(st
+ 	res->flags = IORESOURCE_MEM;
+ 	region.start = (first << 29);
+ 	region.end = (last << 29) + ((1 << 29) - 1);
+-	pcibios_bus_to_resource(dev, res, &region);
++	pcibios_bus_to_resource(dev->bus, res, &region);
+ }
+ 
+ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
+@@ -579,7 +579,7 @@ static void __devinit of_scan_pci_bridge
+ 		res->flags = flags;
+ 		region.start = GET_64BIT(ranges, 1);
+ 		region.end = region.start + size - 1;
+-		pcibios_bus_to_resource(dev, res, &region);
++		pcibios_bus_to_resource(dev->bus, res, &region);
+ 	}
+ after_ranges:
+ 	sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),
+--- a/drivers/pci/probe.c
++++ b/drivers/pci/probe.c
+@@ -44,12 +44,10 @@ int no_pci_devices(void)
+ }
+ EXPORT_SYMBOL(no_pci_devices);
+ 
+-static struct pci_host_bridge *pci_host_bridge(struct pci_dev *dev)
++static struct pci_host_bridge *pci_host_bridge(struct pci_bus *bus)
+ {
+-	struct pci_bus *bus;
+ 	struct pci_host_bridge *bridge;
+ 
+-	bus = dev->bus;
+ 	while (bus->parent)
+ 		bus = bus->parent;
+ 
+@@ -66,10 +64,10 @@ static bool resource_contains(struct res
+ 	return res1->start <= res2->start && res1->end >= res2->end;
+ }
+ 
+-void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
++void pcibios_resource_to_bus(struct pci_bus *bus, struct pci_bus_region *region,
+ 			     struct resource *res)
+ {
+-	struct pci_host_bridge *bridge = pci_host_bridge(dev);
++	struct pci_host_bridge *bridge = pci_host_bridge(bus);
+ 	struct pci_host_bridge_window *window;
+ 	resource_size_t offset = 0;
+ 
+@@ -94,10 +92,10 @@ static bool region_contains(struct pci_b
+ 	return region1->start <= region2->start && region1->end >= region2->end;
+ }
+ 
+-void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
++void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res,
+ 			     struct pci_bus_region *region)
+ {
+-	struct pci_host_bridge *bridge = pci_host_bridge(dev);
++	struct pci_host_bridge *bridge = pci_host_bridge(bus);
+ 	struct pci_host_bridge_window *window;
+ 	struct pci_bus_region bus_region;
+ 	resource_size_t offset = 0;
+@@ -298,11 +296,11 @@ int __pci_read_base(struct pci_dev *dev,
+ 			pci_write_config_dword(dev, pos + 4, 0);
+ 			region.start = 0;
+ 			region.end = sz64;
+-			pcibios_bus_to_resource(dev, res, &region);
++			pcibios_bus_to_resource(dev->bus, res, &region);
+ 		} else {
+ 			region.start = l64;
+ 			region.end = l64 + sz64;
+-			pcibios_bus_to_resource(dev, res, &region);
++			pcibios_bus_to_resource(dev->bus, res, &region);
+ 			dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n",
+ 				   pos, res);
+ 		}
+@@ -314,7 +312,7 @@ int __pci_read_base(struct pci_dev *dev,
+ 
+ 		region.start = l;
+ 		region.end = l + sz;
+-		pcibios_bus_to_resource(dev, res, &region);
++		pcibios_bus_to_resource(dev->bus, res, &region);
+ 
+ 		dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n", pos, res);
+ 	}
+@@ -373,7 +371,7 @@ static void __devinit pci_read_bridge_io
+ 		res2.flags = res->flags;
+ 		region.start = base;
+ 		region.end = limit + 0xfff;
+-		pcibios_bus_to_resource(dev, &res2, &region);
++		pcibios_bus_to_resource(dev->bus, &res2, &region);
+ 		if (!res->start)
+ 			res->start = res2.start;
+ 		if (!res->end)
+@@ -399,7 +397,7 @@ static void __devinit pci_read_bridge_mm
+ 		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
+ 		region.start = base;
+ 		region.end = limit + 0xfffff;
+-		pcibios_bus_to_resource(dev, res, &region);
++		pcibios_bus_to_resource(dev->bus, res, &region);
+ 		dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);
+ 	}
+ }
+@@ -448,7 +446,7 @@ static void __devinit pci_read_bridge_mm
+ 			res->flags |= IORESOURCE_MEM_64;
+ 		region.start = base;
+ 		region.end = limit + 0xfffff;
+-		pcibios_bus_to_resource(dev, res, &region);
++		pcibios_bus_to_resource(dev->bus, res, &region);
+ 		dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);
+ 	}
+ }
+@@ -1063,24 +1061,24 @@ int pci_setup_device(struct pci_dev *dev
+ 				region.end = 0x1F7;
+ 				res = &dev->resource[0];
+ 				res->flags = LEGACY_IO_RESOURCE;
+-				pcibios_bus_to_resource(dev, res, &region);
++				pcibios_bus_to_resource(dev->bus, res, &region);
+ 				region.start = 0x3F6;
+ 				region.end = 0x3F6;
+ 				res = &dev->resource[1];
+ 				res->flags = LEGACY_IO_RESOURCE;
+-				pcibios_bus_to_resource(dev, res, &region);
++				pcibios_bus_to_resource(dev->bus, res, &region);
+ 			}
+ 			if ((progif & 4) == 0) {
+ 				region.start = 0x170;
+ 				region.end = 0x177;
+ 				res = &dev->resource[2];
+ 				res->flags = LEGACY_IO_RESOURCE;
+-				pcibios_bus_to_resource(dev, res, &region);
++				pcibios_bus_to_resource(dev->bus, res, &region);
+ 				region.start = 0x376;
+ 				region.end = 0x376;
+ 				res = &dev->resource[3];
+ 				res->flags = LEGACY_IO_RESOURCE;
+-				pcibios_bus_to_resource(dev, res, &region);
++				pcibios_bus_to_resource(dev->bus, res, &region);
+ 			}
+ 		}
+ 		break;
+--- a/drivers/pci/rom.c
++++ b/drivers/pci/rom.c
+@@ -31,7 +31,7 @@ int pci_enable_rom(struct pci_dev *pdev)
+ 	if (!res->flags)
+ 		return -1;
+ 
+-	pcibios_resource_to_bus(pdev, &region, res);
++	pcibios_resource_to_bus(pdev->bus, &region, res);
+ 	pci_read_config_dword(pdev, pdev->rom_base_reg, &rom_addr);
+ 	rom_addr &= ~PCI_ROM_ADDRESS_MASK;
+ 	rom_addr |= region.start | PCI_ROM_ADDRESS_ENABLE;
+--- a/drivers/pci/setup-bus.c
++++ b/drivers/pci/setup-bus.c
+@@ -408,7 +408,7 @@ void pci_setup_cardbus(struct pci_bus *b
+ 		 bus->secondary, bus->subordinate);
+ 
+ 	res = bus->resource[0];
+-	pcibios_resource_to_bus(bridge, &region, res);
++	pcibios_resource_to_bus(bridge->bus, &region, res);
+ 	if (res->flags & IORESOURCE_IO) {
+ 		/*
+ 		 * The IO resource is allocated a range twice as large as it
+@@ -422,7 +422,7 @@ void pci_setup_cardbus(struct pci_bus *b
+ 	}
+ 
+ 	res = bus->resource[1];
+-	pcibios_resource_to_bus(bridge, &region, res);
++	pcibios_resource_to_bus(bridge->bus, &region, res);
+ 	if (res->flags & IORESOURCE_IO) {
+ 		dev_info(&bridge->dev, "  bridge window %pR\n", res);
+ 		pci_write_config_dword(bridge, PCI_CB_IO_BASE_1,
+@@ -432,7 +432,7 @@ void pci_setup_cardbus(struct pci_bus *b
+ 	}
+ 
+ 	res = bus->resource[2];
+-	pcibios_resource_to_bus(bridge, &region, res);
++	pcibios_resource_to_bus(bridge->bus, &region, res);
+ 	if (res->flags & IORESOURCE_MEM) {
+ 		dev_info(&bridge->dev, "  bridge window %pR\n", res);
+ 		pci_write_config_dword(bridge, PCI_CB_MEMORY_BASE_0,
+@@ -442,7 +442,7 @@ void pci_setup_cardbus(struct pci_bus *b
+ 	}
+ 
+ 	res = bus->resource[3];
+-	pcibios_resource_to_bus(bridge, &region, res);
++	pcibios_resource_to_bus(bridge->bus, &region, res);
+ 	if (res->flags & IORESOURCE_MEM) {
+ 		dev_info(&bridge->dev, "  bridge window %pR\n", res);
+ 		pci_write_config_dword(bridge, PCI_CB_MEMORY_BASE_1,
+@@ -473,7 +473,7 @@ static void pci_setup_bridge_io(struct p
+ 
+ 	/* Set up the top and bottom of the PCI I/O segment for this bus. */
+ 	res = bus->resource[0];
+-	pcibios_resource_to_bus(bridge, &region, res);
++	pcibios_resource_to_bus(bridge->bus, &region, res);
+ 	if (res->flags & IORESOURCE_IO) {
+ 		pci_read_config_dword(bridge, PCI_IO_BASE, &l);
+ 		l &= 0xffff0000;
+@@ -504,7 +504,7 @@ static void pci_setup_bridge_mmio(struct
+ 
+ 	/* Set up the top and bottom of the PCI Memory segment for this bus. */
+ 	res = bus->resource[1];
+-	pcibios_resource_to_bus(bridge, &region, res);
++	pcibios_resource_to_bus(bridge->bus, &region, res);
+ 	if (res->flags & IORESOURCE_MEM) {
+ 		l = (region.start >> 16) & 0xfff0;
+ 		l |= region.end & 0xfff00000;
+@@ -530,7 +530,7 @@ static void pci_setup_bridge_mmio_pref(s
+ 	/* Set up PREF base/limit. */
+ 	bu = lu = 0;
+ 	res = bus->resource[2];
+-	pcibios_resource_to_bus(bridge, &region, res);
++	pcibios_resource_to_bus(bridge->bus, &region, res);
+ 	if (res->flags & IORESOURCE_PREFETCH) {
+ 		l = (region.start >> 16) & 0xfff0;
+ 		l |= region.end & 0xfff00000;
+--- a/drivers/pci/setup-res.c
++++ b/drivers/pci/setup-res.c
+@@ -50,7 +50,7 @@ void pci_update_resource(struct pci_dev
+ 	if (res->flags & IORESOURCE_PCI_FIXED)
+ 		return;
+ 
+-	pcibios_resource_to_bus(dev, &region, res);
++	pcibios_resource_to_bus(dev->bus, &region, res);
+ 
+ 	new = region.start | (res->flags & PCI_REGION_FLAG_MASK);
+ 	if (res->flags & IORESOURCE_IO)
+--- a/drivers/pcmcia/i82092.c
++++ b/drivers/pcmcia/i82092.c
+@@ -610,7 +610,7 @@ static int i82092aa_set_mem_map(struct p
+ 	
+ 	enter("i82092aa_set_mem_map");
+ 
+-	pcibios_resource_to_bus(sock_info->dev, &region, mem->res);
++	pcibios_resource_to_bus(sock_info->dev->bus, &region, mem->res);
+ 	
+ 	map = mem->map;
+ 	if (map > 4) {
+--- a/drivers/pcmcia/yenta_socket.c
++++ b/drivers/pcmcia/yenta_socket.c
+@@ -445,7 +445,7 @@ static int yenta_set_mem_map(struct pcmc
+ 	unsigned int start, stop, card_start;
+ 	unsigned short word;
+ 
+-	pcibios_resource_to_bus(socket->dev, &region, mem->res);
++	pcibios_resource_to_bus(socket->dev->bus, &region, mem->res);
+ 
+ 	map = mem->map;
+ 	start = region.start;
+@@ -709,7 +709,7 @@ static int yenta_allocate_res(struct yen
+ 	region.start = config_readl(socket, addr_start) & mask;
+ 	region.end = config_readl(socket, addr_end) | ~mask;
+ 	if (region.start && region.end > region.start && !override_bios) {
+-		pcibios_bus_to_resource(dev, res, &region);
++		pcibios_bus_to_resource(dev->bus, res, &region);
+ 		if (pci_claim_resource(dev, PCI_BRIDGE_RESOURCES + nr) == 0)
+ 			return 0;
+ 		dev_printk(KERN_INFO, &dev->dev,
+@@ -1033,7 +1033,7 @@ static void yenta_config_init(struct yen
+ 	struct pci_dev *dev = socket->dev;
+ 	struct pci_bus_region region;
+ 
+-	pcibios_resource_to_bus(socket->dev, &region, &dev->resource[0]);
++	pcibios_resource_to_bus(socket->dev->bus, &region, &dev->resource[0]);
+ 
+ 	config_writel(socket, CB_LEGACY_MODE_BASE, 0);
+ 	config_writel(socket, PCI_BASE_ADDRESS_0, region.start);
+--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
++++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
+@@ -1609,7 +1609,7 @@ sym_iomap_device(struct sym_device *devi
+ 	struct pci_bus_region bus_addr;
+ 	int i = 2;
+ 
+-	pcibios_resource_to_bus(pdev, &bus_addr, &pdev->resource[1]);
++	pcibios_resource_to_bus(pdev->bus, &bus_addr, &pdev->resource[1]);
+ 	device->mmio_base = bus_addr.start;
+ 
+ 	if (device->chip.features & FE_RAM) {
+@@ -1619,7 +1619,8 @@ sym_iomap_device(struct sym_device *devi
+ 		 */
+ 		if (!pdev->resource[i].flags)
+ 			i++;
+-		pcibios_resource_to_bus(pdev, &bus_addr, &pdev->resource[i]);
++		pcibios_resource_to_bus(pdev->bus, &bus_addr,
++					&pdev->resource[i]);
+ 		device->ram_base = bus_addr.start;
+ 	}
+ 
+--- a/drivers/video/arkfb.c
++++ b/drivers/video/arkfb.c
+@@ -1014,7 +1014,7 @@ static int __devinit ark_pci_probe(struc
+ 
+ 	vga_res.flags = IORESOURCE_IO;
+ 
+-	pcibios_bus_to_resource(dev, &vga_res, &bus_reg);
++	pcibios_bus_to_resource(dev->bus, &vga_res, &bus_reg);
+ 
+ 	par->state.vgabase = (void __iomem *) vga_res.start;
+ 
+--- a/drivers/video/s3fb.c
++++ b/drivers/video/s3fb.c
+@@ -1172,7 +1172,7 @@ static int __devinit s3_pci_probe(struct
+ 
+ 	vga_res.flags = IORESOURCE_IO;
+ 
+-	pcibios_bus_to_resource(dev, &vga_res, &bus_reg);
++	pcibios_bus_to_resource(dev->bus, &vga_res, &bus_reg);
+ 
+ 	par->state.vgabase = (void __iomem *) vga_res.start;
+ 
+--- a/drivers/video/vt8623fb.c
++++ b/drivers/video/vt8623fb.c
+@@ -727,7 +727,7 @@ static int __devinit vt8623_pci_probe(st
+ 
+ 	vga_res.flags = IORESOURCE_IO;
+ 
+-	pcibios_bus_to_resource(dev, &vga_res, &bus_reg);
++	pcibios_bus_to_resource(dev->bus, &vga_res, &bus_reg);
+ 
+ 	par->state.vgabase = (void __iomem *) vga_res.start;
+ 
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -648,9 +648,9 @@ void pci_fixup_cardbus(struct pci_bus *)
+ 
+ /* Generic PCI functions used internally */
+ 
+-void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
++void pcibios_resource_to_bus(struct pci_bus *bus, struct pci_bus_region *region,
+ 			     struct resource *res);
+-void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
++void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res,
+ 			     struct pci_bus_region *region);
+ void pcibios_scan_specific_bus(int busn);
+ extern struct pci_bus *pci_find_bus(int domain, int busnr);
diff --git a/patches/series b/patches/series
index 278f3cf..e0baff5 100644
--- a/patches/series
+++ b/patches/series
@@ -164,3 +164,5 @@ autofs4-check-dev-ioctl-size-before-allocating.patch
 ubi-fix-soft-lockup-in-ubi_check_volume.patch
 perf-tools-fix-build-with-perl-5.18.patch
 config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch
+pci-convert-pcibios_resource_to_bus-to-take-a-pci_bus-not-a-pci_dev.patch
+don-t-bugger-nd-seq-on-set_root_rcu-from-follow_dotdot_rcu.patch