diff options
| -rw-r--r-- | driver-core/uio-implement-a-uio-interface-for-the-smx-cryptengine.patch | 2 | ||||
| -rw-r--r-- | driver-core/warn-when-statically-allocated-kobjects-are-used.patch | 2 | ||||
| -rw-r--r-- | pci/ide-remove-ide-reverse-ide-core.patch | 2 | ||||
| -rw-r--r-- | pci/pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch | 2 | ||||
| -rw-r--r-- | pci/pci-fix-issue-with-busses-registering-multiple-times-in-sysfs.patch | 55 | ||||
| -rw-r--r-- | pci/pci-iommu-iotlb-flushing.patch | 2 | ||||
| -rw-r--r-- | pci/pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch | 2 | ||||
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | version | 2 |
9 files changed, 7 insertions, 63 deletions
diff --git a/driver-core/uio-implement-a-uio-interface-for-the-smx-cryptengine.patch b/driver-core/uio-implement-a-uio-interface-for-the-smx-cryptengine.patch index cccd500a6475c4..2bb52ce2efc32e 100644 --- a/driver-core/uio-implement-a-uio-interface-for-the-smx-cryptengine.patch +++ b/driver-core/uio-implement-a-uio-interface-for-the-smx-cryptengine.patch @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -3583,6 +3583,11 @@ M: mhoffman@lightlink.com +@@ -3592,6 +3592,11 @@ M: mhoffman@lightlink.com L: lm-sensors@lm-sensors.org S: Maintained diff --git a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch index e9a907665f0f68..0cf4dea1e2b683 100644 --- a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch +++ b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> void setup_arch(char **); --- a/init/main.c +++ b/init/main.c -@@ -770,12 +770,21 @@ static void run_init_process(char *init_ +@@ -763,12 +763,21 @@ static void run_init_process(char *init_ kernel_execve(init_filename, argv_init, envp_init); } diff --git a/pci/ide-remove-ide-reverse-ide-core.patch b/pci/ide-remove-ide-reverse-ide-core.patch index 66d285beab0581..d7e514f067c4ca 100644 --- a/pci/ide-remove-ide-reverse-ide-core.patch +++ b/pci/ide-remove-ide-reverse-ide-core.patch @@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> the base,ctl ports must not be altered. --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -765,7 +765,7 @@ and is between 256 and 4096 characters. +@@ -762,7 +762,7 @@ and is between 256 and 4096 characters. Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]] ide= [HW] (E)IDE subsystem diff --git a/pci/pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch b/pci/pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch index 10658a220d9ba5..76f06a6c78ce5a 100644 --- a/pci/pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch +++ b/pci/pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch @@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> RCU/ - directory with info on RCU (read-copy update). README.DAC960 -@@ -291,12 +287,6 @@ parport.txt +@@ -289,12 +285,6 @@ parport.txt - how to use the parallel-port driver. parport-lowlevel.txt - description and usage of the low level parallel port functions. diff --git a/pci/pci-fix-issue-with-busses-registering-multiple-times-in-sysfs.patch b/pci/pci-fix-issue-with-busses-registering-multiple-times-in-sysfs.patch deleted file mode 100644 index a22f18c753ea45..00000000000000 --- a/pci/pci-fix-issue-with-busses-registering-multiple-times-in-sysfs.patch +++ /dev/null @@ -1,55 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Wed, 12 Mar 2008 21:48:03 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: PCI: fix issue with busses registering multiple times in sysfs - -PCI busses can be registered multiple times, so we need to detect if we -have registered our bus structure in sysfs already. If so, don't do it -again. - -Thanks to Guennadi Liakhovetski <g.liakhovetski@gmx.de> for reporting -the problem, and to Linus for poking me to get me to believe that it was -a real problem. - -Cc: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/pci/bus.c | 6 +++++- - include/linux/pci.h | 1 + - 2 files changed, 6 insertions(+), 1 deletion(-) - ---- a/drivers/pci/bus.c -+++ b/drivers/pci/bus.c -@@ -143,14 +143,18 @@ void pci_bus_add_devices(struct pci_bus - /* register the bus with sysfs as the parent is now - * properly registered. */ - child_bus = dev->subordinate; -+ if (child_bus->is_added) -+ continue; - child_bus->dev.parent = child_bus->bridge; - retval = device_register(&child_bus->dev); - if (retval) - dev_err(&dev->dev, "Error registering pci_bus," - " continuing...\n"); -- else -+ else { -+ child_bus->is_added = 1; - retval = device_create_file(&child_bus->dev, - &dev_attr_cpuaffinity); -+ } - if (retval) - dev_err(&dev->dev, "Error creating cpuaffinity" - " file, continuing...\n"); ---- a/include/linux/pci.h -+++ b/include/linux/pci.h -@@ -278,6 +278,7 @@ struct pci_bus { - struct device dev; - struct bin_attribute *legacy_io; /* legacy I/O for this bus */ - struct bin_attribute *legacy_mem; /* legacy mem */ -+ unsigned int is_added:1; - }; - - #define pci_bus_b(n) list_entry(n, struct pci_bus, node) diff --git a/pci/pci-iommu-iotlb-flushing.patch b/pci/pci-iommu-iotlb-flushing.patch index 380830fe3e75f8..88b60d697489ec 100644 --- a/pci/pci-iommu-iotlb-flushing.patch +++ b/pci/pci-iommu-iotlb-flushing.patch @@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -830,6 +830,10 @@ and is between 256 and 4096 characters. +@@ -827,6 +827,10 @@ and is between 256 and 4096 characters. than 32 bit addressing. The default is to look for translation below 32 bit and if not available then look in the higher range. diff --git a/pci/pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch b/pci/pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch index d2bca4859ffeec..657a50c9287317 100644 --- a/pci/pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch +++ b/pci/pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch @@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -1426,10 +1426,6 @@ and is between 256 and 4096 characters. +@@ -1423,10 +1423,6 @@ and is between 256 and 4096 characters. nomsi [MSI] If the PCI_MSI kernel config parameter is enabled, this kernel boot option can be used to disable the use of MSI interrupts system-wide. @@ -48,7 +48,6 @@ driver-core/sysfs-crash-debugging.patch # pci patches queued for 2.6.25 (bugfixes, new ids, etc.) -pci/pci-fix-issue-with-busses-registering-multiple-times-in-sysfs.patch # pci patches for after 2.6.25 is out pci/pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch @@ -1 +1 @@ -2.6.25-rc5-git3 +2.6.25-rc6 |