Merge changes from sid up to 2.6.38-3

svn path=/dists/trunk/linux-2.6/; revision=17207
This commit is contained in:
Ben Hutchings 2011-04-06 13:46:15 +00:00
commit d5a289e34a
16 changed files with 222 additions and 19 deletions

73
debian/changelog vendored
View File

@ -4,6 +4,79 @@ linux-2.6 (2.6.39~rc2-1~experimental.1) UNRELEASED; urgency=low
-- Ben Hutchings <ben@decadent.org.uk> Wed, 06 Apr 2011 14:02:37 +0100
linux-2.6 (2.6.38-3) unstable; urgency=low
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line
[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.
[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)
-- Ben Hutchings <ben@decadent.org.uk> Wed, 06 Apr 2011 13:53:30 +0100
linux-2.6 (2.6.38-2) unstable; urgency=low
[ Ben Hutchings ]
* kconfig: Avoid buffer underrun in choice input (fixes FTBFS on mips)
* rt2800usb: Disable powersaving by default (Closes: #618930)
* b43: Enable B43_PHY_N (Closes: #619070)
* net/wireless: Enable RTL8192CE as module (Closes: #619051)
* Add configuration for Debian architecture ppc64, matching the
powerpc/powerpc64 flavour (Closes: #618976)
* Enable BOOT_PRINTK_DELAY (support for the boot_delay kernel parameter)
* [x86/!486] Enable TRANSPARENT_HUGEPAGE, TRANSPARENT_HUGEPAGE_MADVISE
(Closes: #618924)
* [x86/486] Enable X86_32_IRIS (IRIS power-off support) (Closes: #619493)
* Add stable 2.6.38.1, including:
- RDMA/cma: Fix crash in request handlers (CVE-2011-0695)
For the complete list of changes, see:
http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.38.1
* radeon: Add some sanity checks to obj info record parsing, thanks
to John Lindgren (Closes: #618847)
* [x86] KVM: remove isr_ack logic from PIC (Closes: #612105)
* Add stable 2.6.38.2, including:
- cgroups: If you list_empty() a head then don't list_del() it
- oom: Fix various bugs in victim task selection
- xen-kbdfront: Advertise either absolute or relative coordinates
- signal: Prevent rt_sigqueueinfo and rt_tgsigqueueinfo from spoofing
the signal code (CVE-2011-1182)
- ext3: Skip orphan cleanup on rocompat fs
- sysctl: Restrict write access to dmesg_restrict
- proc: Protect mm start_code/end_code in /proc/pid/stat
- nfsd: Fix internal NFSv4.1 operation flags to be non-overlapping
- nfsd: Fix wrong limit used in NFSv4 session creation
- USB: Do not pass negative length to snoop_urb()
- cdc-acm: Fix various bugs that can lead to a crash or memory corruption
- fs: Fix deadlock in pivot_root()
- fs: Assign sb->s_bdi to default_backing_dev_info if the bdi is going away
- x86: Cleanup highmap after brk is concluded
- NFS: Fix a hang/infinite loop in nfs_wb_page()
- ext4: Skip orphan cleanup if fs has unknown ROCOMPAT features
For the complete list of changes, see:
http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.38.2
* [amd64] media/rc: Enable IR_NUVOTON as module (Closes: #619937)
* [x86] media/rc: Enable IR_WINBOND_CIR as module
* [x86] Enable DEBUG_SET_MODULE_RONX (Closes: #619838)
* SCSI: Enable TARGET_CORE and related modules (Closes: #619298)
* [hppa] Remove .size directive for flush_alias_page (should fix FTBFS)
[ Jurij Smakov ]
* Bump CONFIG_NR_CPUS on sparc to 256 to accomodate T2+ machines
(Closes: #619435)
* Bump ABI to 2
-- Ben Hutchings <ben@decadent.org.uk> Tue, 29 Mar 2011 05:31:03 +0100
linux-2.6 (2.6.38-1) unstable; urgency=low
* New upstream release: http://kernelnewbies.org/Linux_2_6_38

23
debian/config/config vendored
View File

@ -861,9 +861,9 @@ CONFIG_DAB=y
CONFIG_USB_DABUSB=m
##
## file: drivers/media/IR/Kconfig
## file: drivers/media/rc/Kconfig
##
CONFIG_IR_CORE=m
CONFIG_RC_CORE=m
CONFIG_IR_NEC_DECODER=m
CONFIG_IR_RC5_DECODER=m
CONFIG_IR_RC6_DECODER=m
@ -878,7 +878,7 @@ CONFIG_IR_MCEUSB=m
CONFIG_IR_STREAMZAP=m
##
## file: drivers/media/IR/keymaps/Kconfig
## file: drivers/media/rc/keymaps/Kconfig
##
CONFIG_RC_MAP=m
@ -1891,6 +1891,7 @@ CONFIG_ATH9K_HTC=m
CONFIG_B43=m
CONFIG_B43_PCMCIA=y
CONFIG_B43_SDIO=y
CONFIG_B43_PHY_N=y
CONFIG_B43_PHY_LP=y
# CONFIG_B43_DEBUG is not set
@ -1996,6 +1997,12 @@ CONFIG_RT2800USB_RT30XX=y
CONFIG_RTL8180=m
CONFIG_RTL8187=m
##
## file: drivers/net/wireless/rtlwifi/Kconfig
##
CONFIG_RTL8192CE=m
CONFIG_RTLWIFI=m
##
## file: drivers/net/wireless/wl1251/Kconfig
##
@ -2588,6 +2595,14 @@ CONFIG_VIDEO_STRADIS=m
##
# CONFIG_PRISM2_USB is not set
##
## file: drivers/target/Kconfig
##
CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m
##
## file: drivers/uio/Kconfig
##
@ -3603,7 +3618,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_SG is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_CREDENTIALS is not set
# CONFIG_BOOT_PRINTK_DELAY is not set
CONFIG_BOOT_PRINTK_DELAY=y
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
# CONFIG_KPROBES_SANITY_TEST is not set

View File

@ -1,5 +1,5 @@
[abi]
abiname: 1
abiname: 2
[base]
arches:
@ -13,6 +13,7 @@ arches:
mips
mipsel
powerpc
ppc64
s390
sh4
sparc

View File

@ -2,6 +2,7 @@
## file: arch/x86/Kconfig
##
# CONFIG_SMP is not set
CONFIG_X86_32_IRIS=m
CONFIG_X86_UP_APIC=y
CONFIG_X86_UP_IOAPIC=y
# CONFIG_X86_MCE is not set
@ -111,3 +112,7 @@ CONFIG_SCSI_SIM710=m
##
CONFIG_FB_GEODE_LX=y
##
## file: mm/Kconfig
##
CONFIG_TRANSPARENT_HUGEPAGE=n

View File

@ -72,6 +72,7 @@ CONFIG_X86_VERBOSE_BOOTUP=y
# CONFIG_X86_PTDUMP is not set
CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
CONFIG_DEBUG_SET_MODULE_RONX=y
# CONFIG_DEBUG_NX_TEST is not set
# CONFIG_IOMMU_DEBUG is not set
# CONFIG_IOMMU_STRESS is not set
@ -666,6 +667,12 @@ CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_MAESTRO=m
CONFIG_USB_DSBR=m
##
## file: drivers/media/rc/Kconfig
##
CONFIG_IR_NUVOTON=m
CONFIG_IR_WINBOND_CIR=m
##
## file: drivers/message/i2o/Kconfig
##
@ -1372,6 +1379,8 @@ CONFIG_SPARSE_IRQ=y
## file: mm/Kconfig
##
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
##
## file: mm/Kconfig.debug

View File

@ -200,11 +200,6 @@ CONFIG_LGUEST=m
##
# CONFIG_MACINTOSH_DRIVERS is not set
##
## file: drivers/media/IR/Kconfig
##
CONFIG_IR_NUVOTON=m
##
## file: drivers/media/radio/Kconfig
##

14
debian/config/ppc64/defines vendored Normal file
View File

@ -0,0 +1,14 @@
[base]
flavours:
powerpc64
kernel-arch: powerpc
[image]
configs: powerpc/config
suggests: mkvmlinuz
[powerpc64_description]
hardware: 64-bit PowerPC
[powerpc64_image]
configs: powerpc/config.powerpc64

View File

@ -2,6 +2,6 @@
## file: arch/sparc/Kconfig
##
CONFIG_SMP=y
CONFIG_NR_CPUS=32
CONFIG_NR_CPUS=256
CONFIG_SCHED_SMT=y

View File

@ -0,0 +1,38 @@
From f924897c3f04927d0d28d71b11c4019c9dd7a9f2 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 19 Mar 2011 04:11:33 +0000
Subject: [PATCH] kconfig: Avoid buffer underrun in choice input
commit 40aee729b350672c2550640622416a855e27938f ('kconfig: fix default
value for choice input') fixed some cases where kconfig would select
the wrong option from a choice with a single valid option and thus
enter an infinite loop.
However, this broke the test for user input of the form 'N?', because
when kconfig selects the single valid option the input is zero-length
and the test will read the byte before the input buffer. If this
happens to contain '?' (as it will in a mips build on Debian unstable
today) then kconfig again enters an infinite loop.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: stable@kernel.org [2.6.17+]
---
scripts/kconfig/conf.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 659326c..006ad81 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -332,7 +332,7 @@ static int conf_choice(struct menu *menu)
}
if (!child)
continue;
- if (line[strlen(line) - 1] == '?') {
+ if (line[0] && line[strlen(line) - 1] == '?') {
print_help(child);
continue;
}
--
1.7.4.1

View File

@ -0,0 +1,27 @@
From: Johannes Stezenbach <js@sig21.net>
Date: Wed Jan 19 04:43:34 EST 2011
Subject: [PATCH RFC] rt2800: disable powersaving as default
Powersaving is broken on rt2800usb (the hardware cannot do timed wakeup
to receive beacons) and also on rt2800pci currently (auto-wakeup irq
does no seem to work, for reasons so far unknown).
Signed-off-by: Johannes Stezenbach <js at sig21.net>
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index b7d91d5..b846fd9 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -3229,10 +3229,9 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
u16 eeprom;
/*
- * Disable powersaving as default on PCI devices.
+ * Disable powersaving as default.
*/
- if (rt2x00_is_pci(rt2x00dev) || rt2x00_is_soc(rt2x00dev))
- rt2x00dev->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+ rt2x00dev->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
/*
* Initialize all hw fields.

View File

@ -38,7 +38,7 @@ class GenPatch(object):
tag_out = "v%s" % self.version.complete
print tag_in, tag_out
backports = self.config[('backports',)]
backports = self.config.get(('backports',), {})
diff_filter = '-x Makefile'
if self.version.release == self.package_version.upstream:
diff_filter += ' ' + ' '.join("-x '%s'" % re.sub(r'/$', r'/*', path)

View File

@ -0,0 +1,19 @@
Subject: [PATCH] Save cr4 to mmu_cr4_features at boot time
Date: Thu, 31 Mar 2011 14:48:44 -0000
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
---
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 5a0484a..0943eb2 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -891,6 +891,7 @@ void __init setup_arch(char **cmdline_p)
max_low_pfn = max_pfn;
high_memory = (void *)__va(max_pfn * PAGE_SIZE - 1) + 1;
+ mmu_cr4_features = read_cr4();
#endif
/*

View File

@ -42,3 +42,6 @@
+ features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch
+ bugfix/arm/arm-Fix-.size-directive-for-xscale_dma_a0_map_area.patch
+ debian/sched-autogroup-disabled.patch
+ bugfix/all/kconfig-Avoid-buffer-underrun-in-choice-input.patch
+ bugfix/all/rt2800-disable-powersaving-as-default.patch
+ bugfix/x86/Save-cr4-to-mmu_cr4_features-at-boot-time.patch

13
debian/rules.real vendored
View File

@ -39,7 +39,7 @@ MAKE_PERF_VARS = prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=
#
binary-arch-arch: install-headers_$(ARCH)
binary-arch-arch: install-libc-dev_$(ARCH)
ifneq ($(filter alpha amd64 armel hppa i386 powerpc s390 sh4 sparc sparc64,$(ARCH)),)
ifneq ($(filter alpha amd64 armel hppa i386 powerpc ppc64 s390 sh4 sparc sparc64,$(ARCH)),)
binary-arch-arch: install-tools_$(ARCH)
endif
binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET)
@ -255,7 +255,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(
cp -a $(SOURCE_DIR)/{.config,.kernel*,Module.symvers,include} $(DIR)
cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/kernel/asm-offsets.s $(DIR)/arch/$(KERNEL_ARCH)/kernel
ifeq ($(ARCH),powerpc)
ifneq ($(filter powerpc ppc64,$(ARCH)),)
if [ -f $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/lib/crtsavres.o ]; then \
mkdir $(DIR)/arch/$(KERNEL_ARCH)/lib; \
cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/lib/crtsavres.o $(DIR)/arch/$(KERNEL_ARCH)/lib; \
@ -385,13 +385,15 @@ install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_image \
install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_image:
install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image:
ifneq ($(filter powerpc ppc64,$(ARCH)),)
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image:
install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
+$(MAKE_CLEAN) -C '$(DIR)' bootwrapper_install \
WRAPPER_OBJDIR='$(WRAPPER_INSTALL_DIR)' \
WRAPPER_DTSDIR='$(WRAPPER_INSTALL_DIR)'/dts \
WRAPPER_BINDIR='$(WRAPPER_INSTALL_DIR)'
endif
install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_image:
install -m644 '$(DIR)/arch/s390/boot/image' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
@ -404,7 +406,8 @@ ARG_KIMAGE = vmlinuz
install-image_hppa_$(FEATURESET)_$(FLAVOUR)_plain_templates \
install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_templates \
install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_templates \
install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_templates \
install-image_ppc64_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
for i in $(wildcard debian/templates/temp.image.plain/*); do \

View File

@ -1,5 +1,5 @@
Package: linux-tools-@version@
Architecture: alpha amd64 armel hppa i386 powerpc s390 sh4 sparc sparc64
Architecture: alpha amd64 armel hppa i386 powerpc ppc64 s390 sh4 sparc sparc64
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
Recommends: linux-base (>= 2.6.32-16)
Suggests: linux-doc-@version@

View File

@ -4,4 +4,5 @@ diagnostic information about the running kernel.
If you are reporting that the kernel fails to boot, please use a digital
camera, serial console or netconsole to record the boot messages and
attach these to your report.
attach these to your report. You can use the kernel parameter
'boot_delay=1000' to slow down the boot messages.