Merge /dists/sid/linux-2.6 (3.1.6-1).
svn path=/dists/trunk/linux-2.6/; revision=18414
This commit is contained in:
Bastian Blank
commit
72fb377acc
|
|
@ -49,7 +49,7 @@ class main(object):
|
|||
|
||||
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')
|
||||
|
|
|
|||
|
|
@ -337,10 +337,10 @@ class Gencontrol(Base):
|
|||
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
|
||||
|
|
|
|||
|
|
@ -45,6 +45,52 @@ linux-2.6 (3.2~rc4-1~experimental.1) experimental; urgency=low
|
|||
|
||||
-- Ben Hutchings <ben@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@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@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:
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ CONFIG_KVM_GUEST=y
|
|||
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_CRYPTO_DEV_PADLOCK_SHA=m
|
|||
##
|
||||
CONFIG_DMADEVICES=y
|
||||
CONFIG_INTEL_IOATDMA=m
|
||||
# CONFIG_PCH_DMA is not set
|
||||
CONFIG_PCH_DMA=m
|
||||
CONFIG_NET_DMA=y
|
||||
|
||||
##
|
||||
|
|
@ -392,6 +392,12 @@ CONFIG_ISCSI_IBFT=y
|
|||
##
|
||||
# CONFIG_GOOGLE_FIRMWARE is not set
|
||||
|
||||
##
|
||||
## file: drivers/gpio/Kconfig
|
||||
##
|
||||
CONFIG_GPIO_PCH=m
|
||||
CONFIG_GPIO_ML_IOH=m
|
||||
|
||||
##
|
||||
## file: drivers/gpu/drm/Kconfig
|
||||
##
|
||||
|
|
@ -499,6 +505,7 @@ CONFIG_I2C_VIAPRO=m
|
|||
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_IBM_ASM=m
|
|||
CONFIG_PHANTOM=m
|
||||
CONFIG_CS5535_MFGPT=m
|
||||
CONFIG_HP_ILO=m
|
||||
CONFIG_PCH_PHUB=m
|
||||
|
||||
##
|
||||
## file: drivers/mmc/Kconfig
|
||||
|
|
@ -805,6 +813,7 @@ CONFIG_MTD_NAND_PLATFORM=m
|
|||
##
|
||||
CONFIG_DUMMY=m
|
||||
CONFIG_NET_SB1000=m
|
||||
CONFIG_PCH_GBE=m
|
||||
CONFIG_XEN_NETDEV_FRONTEND=m
|
||||
CONFIG_XEN_NETDEV_BACKEND=m
|
||||
CONFIG_FDDI=y
|
||||
|
|
@ -831,6 +840,11 @@ CONFIG_ARCNET_COM20020=m
|
|||
CONFIG_ARCNET_COM20020_PCI=m
|
||||
CONFIG_ARCNET_COM20020_CS=m
|
||||
|
||||
##
|
||||
## file: drivers/net/can/Kconfig
|
||||
##
|
||||
CONFIG_PCH_CAN=m
|
||||
|
||||
##
|
||||
## file: drivers/net/ethernet/Kconfig
|
||||
##
|
||||
|
|
@ -968,6 +982,11 @@ CONFIG_ALI_FIR=m
|
|||
CONFIG_VLSI_FIR=m
|
||||
CONFIG_VIA_FIR=m
|
||||
|
||||
##
|
||||
## file: drivers/net/spi/Kconfig
|
||||
##
|
||||
CONFIG_SPI_TOPCLIFF_PCH=m
|
||||
|
||||
##
|
||||
## file: drivers/net/tulip/Kconfig
|
||||
##
|
||||
|
|
@ -1267,6 +1286,15 @@ CONFIG_ET131X=m
|
|||
##
|
||||
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
|
||||
##
|
||||
|
|
@ -1387,6 +1415,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
|
|||
# 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
|
||||
|
|
@ -1400,6 +1429,12 @@ CONFIG_USB_USS720=m
|
|||
CONFIG_USB_ATM=m
|
||||
CONFIG_USB_SPEEDTOUCH=m
|
||||
|
||||
##
|
||||
## file: drivers/usb/gadget/Kconfig
|
||||
##
|
||||
CONFIG_USB_GADGET=m
|
||||
CONFIG_USB_EG20T=m
|
||||
|
||||
##
|
||||
## file: drivers/usb/host/Kconfig
|
||||
##
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
From: Ben Hutchings <ben@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@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
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue