Merge changes from sid up to 3.9.6-1

svn path=/dists/trunk/linux/; revision=20256
2013-06-15 15:47:11 +00:00 · 2013-06-15 15:47:11 +00:00 · 9d021dd201
parent 3353739262
commit 9d021dd201
5 changed files with 72 additions and 84 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -47,6 +47,31 @@ linux (3.10~rc4-1~exp1) experimental; urgency=low

 -- Ben Hutchings <ben@decadent.org.uk>  Mon, 03 Jun 2013 02:43:51 +0100

+linux (3.9.6-1) unstable; urgency=low
+
+  * New upstream stable update:
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.9.6
+    - xhci - correct comp_mode_recovery_timer on return from hibernate
+    - usb: musb: make use_sg flag URB specific
+    - USB: keyspan: fix bogus array index
+    - [arm] 7747/1: pcpu: ensure __my_cpu_offset cannot be re-ordered across
+      barrier()
+    - hpfs: fix warnings when the filesystem fills up
+    - cifs: fix off-by-one bug in build_unc_path_to_root
+    - ecryptfs: fixed msync to flush data
+    - eCryptfs: Check return of filemap_write_and_wait during fsync
+    - hwmon: (adm1021) Strengthen chip detection for ADM1021, LM84 and MAX1617
+    - drm: fix a use-after-free when GPU acceleration disabled
+    - [powerpc] pseries: Force 32 bit MSIs for devices that require it
+    - [powerpc] pseries: Make 32-bit MSI quirk work on systems lacking firmware
+      support
+
+  [ Ben Hutchings ]
+  * [armel/orion5x] Enable EXPERT; disable FIPS, OABI_COMPAT, PCI_QUIRKS,
+    VGA_ARB to reduce kernel size (really fixes FTBFS)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sat, 15 Jun 2013 04:53:13 +0100
+
 linux (3.9.5-1) unstable; urgency=low

  * New upstream stable update:
--- a/debian/config/armel/config.iop32x
+++ b/debian/config/armel/config.iop32x
@ -176,25 +176,6 @@ CONFIG_INTEL_IOP_ADMA=y
 ##
 # CONFIG_VGA_ARB is not set

-##
-## file: drivers/hid/Kconfig
-##
-CONFIG_HID_A4TECH=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_KYE=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LEDS=y
-
 ##
 ## file: drivers/hwmon/Kconfig
 ##
@ -593,12 +574,6 @@ CONFIG_BINFMT_AOUT=m
 ##
 # CONFIG_AUDITSYSCALL is not set
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
 CONFIG_EXPERT=y
 # CONFIG_SYSCTL_SYSCALL is not set

@ -669,11 +644,6 @@ CONFIG_IPX_INTERN=y
 ##
 # CONFIG_LAPB is not set

-##
-## file: net/mac80211/Kconfig
-##
-# CONFIG_MAC80211_RC_PID is not set
-
 ##
 ## file: security/keys/Kconfig
 ##
@ -739,14 +709,6 @@ CONFIG_SND_RIPTIDE=m
 ##
 # CONFIG_SND_HDA_INTEL is not set

-##
-## file: usr/Kconfig
-##
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-
 ##
 ## file: unknown
 ##
--- a/debian/config/armel/config.ixp4xx
+++ b/debian/config/armel/config.ixp4xx
@ -199,25 +199,6 @@ CONFIG_TELCLOCK=m
 ##
 # CONFIG_VGA_ARB is not set

-##
-## file: drivers/hid/Kconfig
-##
-CONFIG_HID_A4TECH=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_KYE=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LEDS=y
-
 ##
 ## file: drivers/hwmon/Kconfig
 ##
@ -727,12 +708,6 @@ CONFIG_BINFMT_AOUT=m
 ##
 # CONFIG_AUDITSYSCALL is not set
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
 CONFIG_EXPERT=y
 # CONFIG_SYSCTL_SYSCALL is not set

@ -803,11 +778,6 @@ CONFIG_IPX_INTERN=y
 ##
 CONFIG_LAPB=m

-##
-## file: net/mac80211/Kconfig
-##
-# CONFIG_MAC80211_RC_PID is not set
-
 ##
 ## file: security/keys/Kconfig
 ##
@ -871,14 +841,6 @@ CONFIG_SND_PCXHR=m
 ##
 # CONFIG_SND_HDA_INTEL is not set

-##
-## file: usr/Kconfig
-##
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-
 ##
 ## file: unknown
 ##
--- a/debian/config/armel/config.orion5x
+++ b/debian/config/armel/config.orion5x
@ -26,6 +26,8 @@ CONFIG_ARCH_ORION5X=y
 # CONFIG_ARCH_OMAP is not set
 ## end choice
 CONFIG_PCI=y
+#. This also disables FP emulation, which saves over 20K
+# CONFIG_OABI_COMPAT is not set
 CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
@ -33,9 +35,6 @@ CONFIG_CMDLINE=""
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
-# CONFIG_FPE_FASTFPE is not set
 CONFIG_VFP=y
 # CONFIG_ARTHUR is not set

@ -103,6 +102,11 @@ CONFIG_SGI_PARTITION=y
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_SUN_PARTITION=y

+##
+## file: crypto/Kconfig
+##
+# CONFIG_CRYPTO_FIPS is not set
+
 ##
 ## file: drivers/ata/Kconfig
 ##
@ -196,6 +200,11 @@ CONFIG_GPIO_SYSFS=y
 ##
 # CONFIG_DRM is not set

+##
+## file: drivers/gpu/vga/Kconfig
+##
+# CONFIG_VGA_ARB is not set
+
 ##
 ## file: drivers/hwmon/Kconfig
 ##
@ -442,6 +451,12 @@ CONFIG_MV643XX_ETH=m
 #. Turned off because this causes networking on some Orion machines to fail
 # CONFIG_MARVELL_PHY is not set

+##
+## file: drivers/pci/Kconfig
+##
+#. Saves about 17K, and none of the quirks are likely to be needed
+# CONFIG_PCI_QUIRKS is not set
+
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
@ -577,6 +592,13 @@ CONFIG_ORION_WATCHDOG=m
 ##
 CONFIG_BINFMT_AOUT=m

+##
+## file: init/Kconfig
+##
+# CONFIG_AUDITSYSCALL is not set
+CONFIG_EXPERT=y
+# CONFIG_SYSCTL_SYSCALL is not set
+
 ##
 ## file: mm/Kconfig
 ##
--- a/debian/config/config
+++ b/debian/config/config
@ -433,14 +433,21 @@ CONFIG_DRM_UDL=m
 CONFIG_HID=m
 CONFIG_HIDRAW=y
 CONFIG_HID_GENERIC=m
+CONFIG_HID_A4TECH=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
 CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
 CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
 CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
+CONFIG_HID_EZKEY=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
 CONFIG_HID_KEYTOUCH=m
@ -450,14 +457,18 @@ CONFIG_HID_WALTOP=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=m
 CONFIG_HID_LENOVO_TPKBD=m
+CONFIG_HID_LOGITECH=m
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
@ -465,6 +476,11 @@ CONFIG_HID_PANTHERLORD=m
 CONFIG_PANTHERLORD_FF=y
 CONFIG_HID_PETALYNX=m
 CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PRIMAX=m
 CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_ROCCAT=m
@ -4170,6 +4186,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
 #. Do not enable this without discussion of the security implications
@ -4336,6 +4353,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_DEBUG_SG is not set
@ -4699,12 +4717,7 @@ CONFIG_LLC2=m
 ## file: net/mac80211/Kconfig
 ##
 CONFIG_MAC80211=m
-CONFIG_MAC80211_RC_PID=y
 CONFIG_MAC80211_RC_MINSTREL=y
-## choice: Default rate control algorithm
-CONFIG_MAC80211_RC_DEFAULT_PID=y
-# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
-## end choice
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
@ -5232,6 +5245,10 @@ CONFIG_SND_USB_6FIRE=m
 ## file: usr/Kconfig
 ##
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y

 ##
 ## file: unknown