Linux kernel stable tree (mirror) https://git.radix-linux.su/kernel/linux.git/atom?h=linux-4.4.y 2015-06-25T22:22:36+00:00 2015-06-25T22:22:36+00:00 Linus Torvalds torvalds@linux-foundation.org 2015-06-25T22:22:36+00:00 urn:sha1:ad90fb97515b732bc27a0109baa10af636c3c8cd Pull asm/scatterlist.h removal from Jens Axboe: "We don't have any specific arch scatterlist anymore, since parisc finally switched over. Kill the include" * 'for-4.2/sg' of git://git.kernel.dk/linux-block: remove scatterlist.h generation from arch Kbuild files remove <asm/scatterlist.h> 2015-06-24T15:44:40+00:00 Linus Torvalds torvalds@linux-foundation.org 2015-06-24T15:44:40+00:00 urn:sha1:aaa64485267c14e79382fbf7f4b0689a5de94fe9 Pull Microblaze updates from Michal Simek: - some PCI fixups - add new MB versions - sparse fixups * tag 'microblaze-4.2-rc1' of git://git.monstr.eu/linux-2.6-microblaze: microblaze/PCI: Remove unnecessary struct pci_dev declaration microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration microblaze/PCI: Remove unused declarations microblaze: Label local function static microblaze: Add missing release version code 2015-06-08T12:56:43+00:00 Bjorn Helgaas bhelgaas@google.com 2015-06-04T21:38:17+00:00 urn:sha1:01d72a95188880b22190e937ed8718ed4b45bdce pci_dma_burst_advice() was added by e24c2d963a60 ("[PATCH] PCI: DMA bursting advice") but apparently never used. Remove it. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Michal Simek <monstr@monstr.eu> # microblaze CC: David S. Miller <davem@davemloft.net> 2015-06-08T12:56:21+00:00 Bjorn Helgaas bhelgaas@google.com 2015-06-04T21:38:08+00:00 urn:sha1:d59d36a7fce6707acae644621320a75ab93f1856 a6c140969b46 ("Delete pcibios_select_root") removed pcibios_select_root(). But a7db50405216 ("PCI: remove pcibios_scan_all_fns()") added a few copies back, probably with some incorrect merge conflict resolutions. Remove the still-unused pcibios_select_root() definitions. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> 2015-06-08T08:03:14+00:00 Bjorn Helgaas bhelgaas@google.com 2015-06-04T21:49:43+00:00 urn:sha1:c4fa9a6ae285ec4777d0524a4ee9c9039a5a4c28 All users of arch/microblaze/include/asm/pci.h get it by including include/linux/pci.h, which in turn includes <asm/pci.h> after it declares struct pci_dev. The forward declaration here is unnecessary, so remove it. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: Michal Simek <monstr@monstr.eu> Signed-off-by: Michal Simek <michal.simek@xilinx.com> 2015-06-08T08:03:06+00:00 Bjorn Helgaas bhelgaas@google.com 2015-06-04T21:49:36+00:00 urn:sha1:99fdc6b9bd022ab5fb0f2e45f11a5a53697221fb pci_bus_find_capability() is declared in include/linux/pci.h. Remove the pci_bus_find_capability() declaration from arch/microblaze/include/asm/pci.h. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: Michal Simek <monstr@monstr.eu> Signed-off-by: Michal Simek <michal.simek@xilinx.com> 2015-06-08T08:02:55+00:00 Bjorn Helgaas bhelgaas@google.com 2015-06-04T21:49:29+00:00 urn:sha1:de093d3ea1938cc1d1b4c28e3b88b085a110154b The following declarations were copied from powerpc but are unused on microblaze: struct pci_controller *init_phb_dynamic(struct device_node *dn) int remove_phb_dynamic(struct pci_controller *phb) struct pci_dev *of_create_pci_dev(struct device_node *node, ...) void of_scan_pci_bridge(struct device_node *node, ...) void of_scan_bus(struct device_node *node, struct pci_bus *bus) void of_rescan_bus(struct device_node *node, struct pci_bus *bus) Remove them. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: Michal Simek <monstr@monstr.eu> Signed-off-by: Michal Simek <michal.simek@xilinx.com> 2015-05-05T19:35:39+00:00 Christoph Hellwig hch@lst.de 2015-05-01T10:46:15+00:00 urn:sha1:84be456f883c4685680fba8e5154b5f72e92957e We don't have any arch specific scatterlist now that parisc switched over to the generic one. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com> 2014-06-05T23:15:33+00:00 Linus Torvalds torvalds@linux-foundation.org 2014-06-05T23:15:33+00:00 urn:sha1:2b03adc1911d1c84cb7fad8b424234f589547cb3 Pull Microblaze updates from Michal Simek: - cleanup PCI and DMA handling - use generic device.h - some cleanups * tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Fix typo in head.S s/substract/subtract/ microblaze: remove check for CONFIG_XILINX_CONSOLE microblaze: Use generic device.h microblaze: Do not setup empty unmap_sg function microblaze: Remove device_to_mask microblaze: Clean device dma_ops structure microblaze: Cleanup PCI_DRAM_OFFSET handling microblaze: Do not setup pci_dma_ops microblaze: Return default dma operations microblaze: Enable SERIAL_OF_PLATFORM 2014-06-04T04:59:56+00:00 Michal Simek michal.simek@xilinx.com 2014-05-16T11:29:45+00:00 urn:sha1:28d1880c6872af3d1c17bc46da5795b9eba04bee pci_dma_ops are dma_direct_ops which are setup by default that's why not setup it again. Signed-off-by: Michal Simek <michal.simek@xilinx.com>