[kernel] r18414 - in dists/trunk/linux-2.6: . debian debian/bin debian/config/kernelarch-x86 debian/patches/debian debian/patches/series
Bastian Blank
waldi at alioth.debian.org
Fri Dec 23 18:56:39 UTC 2011
Author: waldi
Date: Fri Dec 23 18:56:37 2011
New Revision: 18414
Log:
Merge /dists/sid/linux-2.6 (3.1.6-1).
Added:
dists/trunk/linux-2.6/debian/patches/debian/x86-memtest-WARN-if-bad-RAM-found.patch
- copied unchanged from r18410, dists/sid/linux-2.6/debian/patches/debian/x86-memtest-WARN-if-bad-RAM-found.patch
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/bin/abiupdate.py
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
dists/trunk/linux-2.6/debian/patches/series/base
Modified: dists/trunk/linux-2.6/debian/bin/abiupdate.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/abiupdate.py Fri Dec 23 18:41:35 2011 (r18413)
+++ dists/trunk/linux-2.6/debian/bin/abiupdate.py Fri Dec 23 18:56:37 2011 (r18414)
@@ -49,7 +49,7 @@
local_config = ConfigCoreDump(fp = file("debian/config.defines.dump"))
- self.version_abi = self.version + '-' + local_config['abi',]['abiname']
+ self.version_abi = local_config['version',]['abiname']
def __call__(self):
self.dir = tempfile.mkdtemp(prefix = 'abiupdate')
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py Fri Dec 23 18:41:35 2011 (r18413)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Fri Dec 23 18:56:37 2011 (r18414)
@@ -337,10 +337,10 @@
packages.append(new_package)
def process_changelog(self):
- act_upstream = self.changelog[0].version.linux_upstream
+ act_upstream = self.changelog[0].version.upstream
versions = []
for i in self.changelog:
- if i.version.linux_upstream != act_upstream:
+ if i.version.upstream != act_upstream:
break
versions.append(i.version)
self.versions = versions
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Fri Dec 23 18:41:35 2011 (r18413)
+++ dists/trunk/linux-2.6/debian/changelog Fri Dec 23 18:56:37 2011 (r18414)
@@ -45,6 +45,52 @@
-- Ben Hutchings <ben at decadent.org.uk> Sat, 03 Dec 2011 23:07:41 +0000
+linux-2.6 (3.1.6-1) UNRELEASED; urgency=low
+
+ * New upstream stable update:
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.6
+ - staging: r8712u: Add new USB ID (Closes: #651622)
+ - [arm] setup: initialize arm_dma_zone_size earlier (Closes: #651215)
+
+ [ Ben Hutchings ]
+ * [x86] Enable HYPERV, HYPERV_STORAGE, HYPERV_NET, HYPERV_UTILS,
+ HYPERV_MOUSE as modules (Closes: #652014)
+ * cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
+ (Closes: #650119)
+ * udeb: Update configuration:
+ - Provide the default configuration instead of including it from the
+ kernel-wedge package
+ - [x86] Include et131x (Closes: #651440)
+ - [x86] Include isci (Closes: #652897)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Tue, 13 Dec 2011 05:50:44 +0000
+
+linux-2.6 (3.1.5-1) unstable; urgency=low
+
+ * New upstream stable update:
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.5
+ - bridge: correct IPv6 checksum after pull (Closes: #651469)
+ - USB: EHCI: fix HUB TT scheduling issue with iso transfer
+ (Closes: #651015)
+ - [x86] mpparse: Account for bus types other than ISA and PCI
+ (Closes: #586494)
+
+ [ Bastian Blank ]
+ * Fix generation of revisions for the patch list.
+
+ [ Hector Oron ]
+ * regulator: backport fix for nullpointer dereference in core.
+
+ [ Ben Hutchings ]
+ * [x86] Enable MEMTEST (Closes: #613321, #646361)
+ - If bad RAM is detected, WARN and recommend a more thorough test
+ * brcmsmac: Fix I/O functions for MIPS and for big-endian architectures
+ * [x86] Enable GPIO_PCH, GPIO_ML_IOH, I2C_EG20T, PCH_CAN, PCH_DMA,
+ PCH_GBE, PCH_PHUB, SERIAL_PCH_UART, SPI_TOPCLIFF_PCH, USB_GADGET,
+ USB_EG20T as modules
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 11 Dec 2011 05:28:40 +0000
+
linux-2.6 (3.1.4-1) unstable; urgency=low
* New upstream stable updates:
Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Fri Dec 23 18:41:35 2011 (r18413)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Fri Dec 23 18:56:37 2011 (r18414)
@@ -18,7 +18,7 @@
CONFIG_PARAVIRT=y
# CONFIG_PARAVIRT_SPINLOCKS is not set
# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_MEMTEST is not set
+CONFIG_MEMTEST=y
CONFIG_HPET_TIMER=y
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
@@ -351,7 +351,7 @@
##
CONFIG_DMADEVICES=y
CONFIG_INTEL_IOATDMA=m
-# CONFIG_PCH_DMA is not set
+CONFIG_PCH_DMA=m
CONFIG_NET_DMA=y
##
@@ -393,6 +393,12 @@
# CONFIG_GOOGLE_FIRMWARE is not set
##
+## file: drivers/gpio/Kconfig
+##
+CONFIG_GPIO_PCH=m
+CONFIG_GPIO_ML_IOH=m
+
+##
## file: drivers/gpu/drm/Kconfig
##
CONFIG_DRM=m
@@ -499,6 +505,7 @@
CONFIG_I2C_SCMI=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_EG20T=m
CONFIG_I2C_PCA_ISA=m
CONFIG_SCx200_ACB=m
@@ -696,6 +703,7 @@
CONFIG_PHANTOM=m
CONFIG_CS5535_MFGPT=m
CONFIG_HP_ILO=m
+CONFIG_PCH_PHUB=m
##
## file: drivers/mmc/Kconfig
@@ -805,6 +813,7 @@
##
CONFIG_DUMMY=m
CONFIG_NET_SB1000=m
+CONFIG_PCH_GBE=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_FDDI=y
@@ -832,6 +841,11 @@
CONFIG_ARCNET_COM20020_CS=m
##
+## file: drivers/net/can/Kconfig
+##
+CONFIG_PCH_CAN=m
+
+##
## file: drivers/net/ethernet/Kconfig
##
CONFIG_FEALNX=m
@@ -969,6 +983,11 @@
CONFIG_VIA_FIR=m
##
+## file: drivers/net/spi/Kconfig
+##
+CONFIG_SPI_TOPCLIFF_PCH=m
+
+##
## file: drivers/net/tulip/Kconfig
##
CONFIG_NET_TULIP=y
@@ -1268,6 +1287,15 @@
CONFIG_DRM_PSB=m
##
+## file: drivers/staging/hv/Kconfig
+##
+CONFIG_HYPERV=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_HYPERV_NET=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_MOUSE=m
+
+##
## file: drivers/staging/lirc/Kconfig
##
CONFIG_LIRC_STAGING=y
@@ -1387,6 +1415,7 @@
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
CONFIG_SERIAL_8250_RSA=y
CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_PCH_UART=m
##
## file: drivers/usb/Kconfig
@@ -1401,6 +1430,12 @@
CONFIG_USB_SPEEDTOUCH=m
##
+## file: drivers/usb/gadget/Kconfig
+##
+CONFIG_USB_GADGET=m
+CONFIG_USB_EG20T=m
+
+##
## file: drivers/usb/host/Kconfig
##
CONFIG_USB_EHCI_HCD=m
Copied: dists/trunk/linux-2.6/debian/patches/debian/x86-memtest-WARN-if-bad-RAM-found.patch (from r18410, dists/sid/linux-2.6/debian/patches/debian/x86-memtest-WARN-if-bad-RAM-found.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/x86-memtest-WARN-if-bad-RAM-found.patch Fri Dec 23 18:56:37 2011 (r18414, copy of r18410, dists/sid/linux-2.6/debian/patches/debian/x86-memtest-WARN-if-bad-RAM-found.patch)
@@ -0,0 +1,29 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 5 Dec 2011 04:00:58 +0000
+Subject: [PATCH] x86: memtest: WARN if bad RAM found
+
+Since this is not a particularly thorough test, if we find any bad
+bits of RAM then there is a fair chance that there are other bad bits
+we fail to detect.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ arch/x86/mm/memtest.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/arch/x86/mm/memtest.c b/arch/x86/mm/memtest.c
+index 92faf3a..ac6bdaa 100644
+--- a/arch/x86/mm/memtest.c
++++ b/arch/x86/mm/memtest.c
+@@ -30,6 +30,8 @@ static u64 patterns[] __initdata = {
+
+ static void __init reserve_bad_mem(u64 pattern, u64 start_bad, u64 end_bad)
+ {
++ WARN_ONCE(1, "Bad RAM detected. Use memtest86+ to perform a thorough test\n"
++ "and the memmap= parameter to reserve the bad areas.");
+ printk(KERN_INFO " %016llx bad mem addr %010llx - %010llx reserved\n",
+ (unsigned long long) pattern,
+ (unsigned long long) start_bad,
+--
+1.7.7.3
+
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Fri Dec 23 18:41:35 2011 (r18413)
+++ dists/trunk/linux-2.6/debian/patches/series/base Fri Dec 23 18:56:37 2011 (r18414)
@@ -55,4 +55,4 @@
+ bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch
+ features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch
-+ features/all/aufs3/aufs3-fix-export-__devcgroup_inode_permission.patch
++ debian/x86-memtest-WARN-if-bad-RAM-found.patch
More information about the Kernel-svn-changes
mailing list