Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2011-07-12 21:16:09 -0400
committerJeff Mahoney <jeffm@suse.com>2011-07-12 21:16:09 -0400
commit0de37e18993ef84fbbbe2c66b2bf84cea4ec7499 (patch)
treef4a4328a98689dd53361db3a75c8c864c606291e
parente95707dc90da6c7a3ad2385e0d0e110cea488091 (diff)
- Update to 3.0-rc7.
-rw-r--r--config/i386/debug2
-rw-r--r--config/i386/default2
-rw-r--r--config/i386/desktop2
-rw-r--r--config/i386/ec22
-rw-r--r--config/i386/pae2
-rw-r--r--config/i386/trace2
-rw-r--r--config/i386/xen2
-rw-r--r--config/ia64/debug2
-rw-r--r--config/ia64/default2
-rw-r--r--config/ia64/trace2
-rw-r--r--config/ppc/default2
-rw-r--r--config/ppc/ppc642
-rw-r--r--config/ppc/ps32
-rw-r--r--config/ppc64/debug2
-rw-r--r--config/ppc64/default2
-rw-r--r--config/ppc64/ppc642
-rw-r--r--config/ppc64/trace2
-rw-r--r--config/s390/s3902
-rw-r--r--config/s390/trace2
-rw-r--r--config/s390x/default2
-rw-r--r--config/s390x/trace2
-rw-r--r--config/x86_64/debug2
-rw-r--r--config/x86_64/default2
-rw-r--r--config/x86_64/desktop2
-rw-r--r--config/x86_64/ec22
-rw-r--r--config/x86_64/trace2
-rw-r--r--config/x86_64/xen2
-rw-r--r--patches.xen/pci-reserve47
-rw-r--r--rpm/config.sh2
29 files changed, 56 insertions, 47 deletions
diff --git a/config/i386/debug b/config/i386/debug
index c3d14642b8..07623171b1 100644
--- a/config/i386/debug
+++ b/config/i386/debug
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc6 Kernel Configuration
+# Linux/i386 3.0.0-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/i386/default b/config/i386/default
index 33b79dfa16..61f3131c0b 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc6 Kernel Configuration
+# Linux/i386 3.0.0-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/i386/desktop b/config/i386/desktop
index 656b0117db..ab73ca31d7 100644
--- a/config/i386/desktop
+++ b/config/i386/desktop
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc6 Kernel Configuration
+# Linux/i386 3.0.0-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/i386/ec2 b/config/i386/ec2
index c84bb0285a..a05759b4d1 100644
--- a/config/i386/ec2
+++ b/config/i386/ec2
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc6 Kernel Configuration
+# Linux/i386 3.0.0-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/i386/pae b/config/i386/pae
index 73e9ed5523..1c58645561 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc6 Kernel Configuration
+# Linux/i386 3.0.0-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/i386/trace b/config/i386/trace
index 6ff0f7b09e..760dcc95b8 100644
--- a/config/i386/trace
+++ b/config/i386/trace
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc6 Kernel Configuration
+# Linux/i386 3.0.0-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/i386/xen b/config/i386/xen
index c35491db33..bc3b05c49b 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc6 Kernel Configuration
+# Linux/i386 3.0.0-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/ia64/debug b/config/ia64/debug
index 8a277660e7..fb50903761 100644
--- a/config/ia64/debug
+++ b/config/ia64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/ia64 3.0.0-rc6 Kernel Configuration
+# Linux/ia64 3.0.0-rc7 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
diff --git a/config/ia64/default b/config/ia64/default
index 528eeb1a51..ac49c92082 100644
--- a/config/ia64/default
+++ b/config/ia64/default
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/ia64 3.0.0-rc6 Kernel Configuration
+# Linux/ia64 3.0.0-rc7 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
diff --git a/config/ia64/trace b/config/ia64/trace
index 8110850b16..c993385cc1 100644
--- a/config/ia64/trace
+++ b/config/ia64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/ia64 3.0.0-rc6 Kernel Configuration
+# Linux/ia64 3.0.0-rc7 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
diff --git a/config/ppc/default b/config/ppc/default
index ed7234e916..b327630276 100644
--- a/config/ppc/default
+++ b/config/ppc/default
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc6 Kernel Configuration
+# Linux/powerpc 3.0.0-rc7 Kernel Configuration
#
# CONFIG_PPC64 is not set
diff --git a/config/ppc/ppc64 b/config/ppc/ppc64
index f15c4ef8ee..f8a9c7242a 100644
--- a/config/ppc/ppc64
+++ b/config/ppc/ppc64
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc6 Kernel Configuration
+# Linux/powerpc 3.0.0-rc7 Kernel Configuration
#
CONFIG_PPC64=y
diff --git a/config/ppc/ps3 b/config/ppc/ps3
index 7a1298648f..6c80fd90d9 100644
--- a/config/ppc/ps3
+++ b/config/ppc/ps3
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc6 Kernel Configuration
+# Linux/powerpc 3.0.0-rc7 Kernel Configuration
#
CONFIG_PPC64=y
diff --git a/config/ppc64/debug b/config/ppc64/debug
index 21f68a337e..e0bece446b 100644
--- a/config/ppc64/debug
+++ b/config/ppc64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc6 Kernel Configuration
+# Linux/powerpc 3.0.0-rc7 Kernel Configuration
#
CONFIG_PPC64=y
diff --git a/config/ppc64/default b/config/ppc64/default
index 76eeab10ce..d648020403 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc6 Kernel Configuration
+# Linux/powerpc 3.0.0-rc7 Kernel Configuration
#
CONFIG_PPC64=y
diff --git a/config/ppc64/ppc64 b/config/ppc64/ppc64
index 9f9a5b748f..5132226129 100644
--- a/config/ppc64/ppc64
+++ b/config/ppc64/ppc64
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc6 Kernel Configuration
+# Linux/powerpc 3.0.0-rc7 Kernel Configuration
#
CONFIG_PPC64=y
diff --git a/config/ppc64/trace b/config/ppc64/trace
index 6437d9635b..e85bf99344 100644
--- a/config/ppc64/trace
+++ b/config/ppc64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 3.0.0-rc6 Kernel Configuration
+# Linux/powerpc 3.0.0-rc7 Kernel Configuration
#
CONFIG_PPC64=y
diff --git a/config/s390/s390 b/config/s390/s390
index d1e95f3571..895b0f86be 100644
--- a/config/s390/s390
+++ b/config/s390/s390
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 3.0.0-rc6 Kernel Configuration
+# Linux/s390 3.0.0-rc7 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390/trace b/config/s390/trace
index bfbec31764..d45df2ddff 100644
--- a/config/s390/trace
+++ b/config/s390/trace
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 3.0.0-rc6 Kernel Configuration
+# Linux/s390 3.0.0-rc7 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390x/default b/config/s390x/default
index d3958ff1ee..c57d70c193 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 3.0.0-rc6 Kernel Configuration
+# Linux/s390 3.0.0-rc7 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390x/trace b/config/s390x/trace
index 907abe3fc9..d9322b0992 100644
--- a/config/s390x/trace
+++ b/config/s390x/trace
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 3.0.0-rc6 Kernel Configuration
+# Linux/s390 3.0.0-rc7 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/x86_64/debug b/config/x86_64/debug
index 4bae40922e..6105231f2e 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc6 Kernel Configuration
+# Linux/x86_64 3.0.0-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
diff --git a/config/x86_64/default b/config/x86_64/default
index 54c6e0dc0f..12652163c3 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc6 Kernel Configuration
+# Linux/x86_64 3.0.0-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
diff --git a/config/x86_64/desktop b/config/x86_64/desktop
index d993c3101b..d74f147fd0 100644
--- a/config/x86_64/desktop
+++ b/config/x86_64/desktop
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc6 Kernel Configuration
+# Linux/x86_64 3.0.0-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
diff --git a/config/x86_64/ec2 b/config/x86_64/ec2
index d0913e79ae..18ddb3a5c3 100644
--- a/config/x86_64/ec2
+++ b/config/x86_64/ec2
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc6 Kernel Configuration
+# Linux/x86_64 3.0.0-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
diff --git a/config/x86_64/trace b/config/x86_64/trace
index 730f44f75c..33fddaee24 100644
--- a/config/x86_64/trace
+++ b/config/x86_64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc6 Kernel Configuration
+# Linux/x86_64 3.0.0-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
diff --git a/config/x86_64/xen b/config/x86_64/xen
index 60081972f5..576a23e4e8 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.0-rc6 Kernel Configuration
+# Linux/x86_64 3.0.0-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
diff --git a/patches.xen/pci-reserve b/patches.xen/pci-reserve
index d6a83b2734..77ea60d6c0 100644
--- a/patches.xen/pci-reserve
+++ b/patches.xen/pci-reserve
@@ -8,11 +8,20 @@ by PCI hotplug.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Acked-by: jbeulich@novell.com
---- head-2011-06-30.orig/Documentation/kernel-parameters.txt 2011-06-30 15:22:39.000000000 +0200
-+++ head-2011-06-30/Documentation/kernel-parameters.txt 2011-06-30 15:22:45.000000000 +0200
-@@ -2034,6 +2034,13 @@ bytes respectively. Such letter suffixes
- off: Turn ECRC off
- on: Turn ECRC on.
+---
+ Documentation/kernel-parameters.txt | 7 +
+ drivers/pci/Kconfig | 7 +
+ drivers/pci/Makefile | 1
+ drivers/pci/pci.h | 15 +++
+ drivers/pci/reserve.c | 137 ++++++++++++++++++++++++++++++++++++
+ drivers/pci/setup-bus.c | 8 +-
+ 6 files changed, 174 insertions(+), 1 deletion(-)
+
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -2036,6 +2036,13 @@ bytes respectively. Such letter suffixes
+ realloc reallocate PCI resources if allocations done by BIOS
+ are erroneous.
+ pci_reserve= [PCI]
+ Format: [<sbdf>[+IO<size>][+MEM<size>]][,<sbdf>...]
@@ -24,8 +33,8 @@ Acked-by: jbeulich@novell.com
pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power
Management.
off Disable ASPM.
---- head-2011-06-30.orig/drivers/pci/Kconfig 2011-01-31 14:31:27.000000000 +0100
-+++ head-2011-06-30/drivers/pci/Kconfig 2011-01-31 14:32:40.000000000 +0100
+--- a/drivers/pci/Kconfig
++++ b/drivers/pci/Kconfig
@@ -45,6 +45,13 @@ config PCI_IOMULTI
help
Say Y here if you need io multiplexing.
@@ -40,8 +49,8 @@ Acked-by: jbeulich@novell.com
config PCI_STUB
tristate "PCI Stub driver"
depends on PCI
---- head-2011-06-30.orig/drivers/pci/Makefile 2011-01-31 14:31:28.000000000 +0100
-+++ head-2011-06-30/drivers/pci/Makefile 2011-01-31 14:32:40.000000000 +0100
+--- a/drivers/pci/Makefile
++++ b/drivers/pci/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_PCI_GUESTDEV) += guestdev.o
obj-$(CONFIG_PCI_IOMULTI) += pci-iomul.o
iomul-$(CONFIG_PCI_IOMULTI) := iomulti.o
@@ -50,9 +59,9 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_PCI_QUIRKS) += quirks.o
---- head-2011-06-30.orig/drivers/pci/pci.h 2011-06-30 15:22:12.000000000 +0200
-+++ head-2011-06-30/drivers/pci/pci.h 2011-06-30 15:22:59.000000000 +0200
-@@ -319,4 +319,19 @@ extern int pci_is_iomuldev(struct pci_de
+--- a/drivers/pci/pci.h
++++ b/drivers/pci/pci.h
+@@ -321,4 +321,19 @@ extern int pci_is_iomuldev(struct pci_de
#define pci_is_iomuldev(dev) 0
#endif
@@ -72,8 +81,8 @@ Acked-by: jbeulich@novell.com
+#endif /* CONFIG_PCI_RESERVE */
+
#endif /* DRIVERS_PCI_H */
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/drivers/pci/reserve.c 2011-01-31 14:32:40.000000000 +0100
+--- /dev/null
++++ b/drivers/pci/reserve.c
@@ -0,0 +1,137 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -212,9 +221,9 @@ Acked-by: jbeulich@novell.com
+ return 1;
+}
+__setup("pci_reserve=", pci_reserve_setup);
---- head-2011-06-30.orig/drivers/pci/setup-bus.c 2011-06-30 15:04:15.000000000 +0200
-+++ head-2011-06-30/drivers/pci/setup-bus.c 2011-05-23 10:39:28.000000000 +0200
-@@ -554,7 +554,7 @@ static void pbus_size_io(struct pci_bus
+--- a/drivers/pci/setup-bus.c
++++ b/drivers/pci/setup-bus.c
+@@ -561,7 +561,7 @@ static void pbus_size_io(struct pci_bus
{
struct pci_dev *dev;
struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO);
@@ -223,7 +232,7 @@ Acked-by: jbeulich@novell.com
if (!b_res)
return;
-@@ -582,6 +582,11 @@ static void pbus_size_io(struct pci_bus
+@@ -589,6 +589,11 @@ static void pbus_size_io(struct pci_bus
size1 = (!add_head || (add_head && !add_size)) ? size0 :
calculate_iosize(size, min_size+add_size, size1,
resource_size(b_res), 4096);
@@ -235,7 +244,7 @@ Acked-by: jbeulich@novell.com
if (!size0 && !size1) {
if (b_res->start || b_res->end)
dev_info(&bus->self->dev, "disabling bridge window "
-@@ -676,6 +681,7 @@ static int pbus_size_mem(struct pci_bus
+@@ -683,6 +688,7 @@ static int pbus_size_mem(struct pci_bus
min_align = align1 >> 1;
align += aligns[order];
}
diff --git a/rpm/config.sh b/rpm/config.sh
index ba754bca8d..4585435d80 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=3.0-rc6
+SRCVERSION=3.0-rc7
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against