Update to 3.7

Update aufs to aufs3.x-rcN-20121210.
Disable rt, probably not available for 3.7.
Refresh/drop patches.  They apply but the result may not build.

svn path=/dists/trunk/linux/; revision=19608

7 files changed, 39 insertions, 70 deletions

diff --git a/debian/patches/debian/cgroups-Document-the-Debian-memory-resource-controll.patch b/debian/patches/debian/cgroups-Document-the-Debian-memory-resource-controll.patch
index 83be8481a..24516196d 100644
--- a/debian/patches/debian/cgroups-Document-the-Debian-memory-resource-controll.patch
+++ b/debian/patches/debian/cgroups-Document-the-Debian-memory-resource-controll.patch
@@ -5,8 +5,8 @@ Subject: [PATCH 2/2] cgroups: Document the Debian memory resource controller
 ---
 --- a/Documentation/cgroups/memory.txt
 +++ b/Documentation/cgroups/memory.txt
-@@ -47,6 +47,10 @@ Features:
-  Kernel memory support is work in progress, and the current version provides
+@@ -46,6 +46,10 @@ Features:
+  Kernel memory support is a work in progress, and the current version provides
   basically functionality. (See Section 2.7)
  
 +NOTE: In Debian kernel packages, the memory resource controller is
diff --git a/debian/patches/debian/debugfs-set-default-mode-to-700.patch b/debian/patches/debian/debugfs-set-default-mode-to-700.patch
deleted file mode 100644
index 82bae9947..000000000
--- a/debian/patches/debian/debugfs-set-default-mode-to-700.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Subject: debugfs: Set default mode to 700
-Bug-Debian: http://bugs.debian.org/681418
-
-As discussed here
-<http://lists.linux-foundation.org/pipermail/ksummit-2012-discuss/2012-July/000891.html>.
-
-Mounting of debugfs is a significant security liability, but there are
-applications that depend on some interfaces based on debugfs and they
-(or their packages) will mount it automatically anyway.
-
-Setting the default mode for the debugfs root to 700 (accessible
-to root only) should leave it functional, since most such applications
-will require root anyway, and users can override it to relax
-permissions if they really don't care about the security problems.
-
---- a/fs/debugfs/inode.c
-+++ b/fs/debugfs/inode.c
-@@ -28,7 +28,7 @@
- #include <linux/magic.h>
- #include <linux/slab.h>
- 
--#define DEBUGFS_DEFAULT_MODE	0755
-+#define DEBUGFS_DEFAULT_MODE	0700
- 
- static struct vfsmount *debugfs_mount;
- static int debugfs_mount_count;
diff --git a/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch b/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
index 4b80ad2ea..47bab0b1c 100644
--- a/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
+++ b/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
@@ -1,24 +1,14 @@
-From 2a7d7ecc9fdcdaa0b82865078fd2a47e3b46da1b Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben@decadent.org.uk>
 Date: Mon, 17 Aug 2009 02:45:41 +0100
-Subject: [PATCH 1/2] dvb-usb-af9005: mark as broken
+Subject: dvb-usb-af9005: mark as broken
 
----
- drivers/media/dvb/dvb-usb/Kconfig |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
-index 496c1a3..868e1cb 100644
---- a/drivers/media/dvb/dvb-usb/Kconfig
-+++ b/drivers/media/dvb/dvb-usb/Kconfig
-@@ -238,6 +238,7 @@ config DVB_USB_OPERA1
+--- a/drivers/media/usb/dvb-usb/Kconfig
++++ b/drivers/media/usb/dvb-usb/Kconfig
+@@ -227,6 +227,7 @@ config DVB_USB_OPERA1
  
  config DVB_USB_AF9005
  	tristate "Afatech AF9005 DVB-T USB1.1 support"
 +	depends on BROKEN
- 	depends on DVB_USB && EXPERIMENTAL
- 	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
- 	select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
--- 
-1.6.3.3
-
+ 	depends on DVB_USB
+ 	select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT
+ 	select MEDIA_TUNER_QT1010 if MEDIA_SUBDRV_AUTOSELECT
diff --git a/debian/patches/debian/dfsg/vs6624-disable.patch b/debian/patches/debian/dfsg/vs6624-disable.patch
index e36b6d127..08dba87be 100644
--- a/debian/patches/debian/dfsg/vs6624-disable.patch
+++ b/debian/patches/debian/dfsg/vs6624-disable.patch
@@ -1,8 +1,14 @@
-diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
-index ce1e7ba..4bd5a0c 100644
---- a/drivers/media/video/Kconfig
-+++ b/drivers/media/video/Kconfig
-@@ -497,2 +497,3 @@ config VIDEO_OV7670
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sun, 27 May 2012 01:56:58 +0100
+Subject: vs6624: mark as broken
+
+--- a/drivers/media/i2c/Kconfig
++++ b/drivers/media/i2c/Kconfig
+@@ -422,6 +422,7 @@ config VIDEO_OV7670
+ 	  controller.
+ 
  config VIDEO_VS6624
 +	depends on BROKEN
  	tristate "ST VS6624 sensor support"
+ 	depends on VIDEO_V4L2 && I2C
+ 	depends on MEDIA_CAMERA_SUPPORT
diff --git a/debian/patches/debian/kernelvariables.patch b/debian/patches/debian/kernelvariables.patch
index d5afd5ce5..18eebe1e4 100644
--- a/debian/patches/debian/kernelvariables.patch
+++ b/debian/patches/debian/kernelvariables.patch
@@ -99,5 +99,5 @@ use of $(ARCH) needs to be moved after this.
 +       hdr-arch  := m68k
 +endif
  
- # Use LINUXINCLUDE when you must reference the include/ directory.
- # Needed to be compatible with the O= option
+ # Use USERINCLUDE when you must reference the UAPI directories only.
+ USERINCLUDE    := \
diff --git a/debian/patches/debian/radeon-no-modeset-without-firmware.patch b/debian/patches/debian/radeon-no-modeset-without-firmware.patch
index fde0a05b8..d55d954cf 100644
--- a/debian/patches/debian/radeon-no-modeset-without-firmware.patch
+++ b/debian/patches/debian/radeon-no-modeset-without-firmware.patch
@@ -33,8 +33,8 @@ to both DRM and radeon.
 ---
 --- a/drivers/gpu/drm/radeon/radeon_drv.c
 +++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -37,6 +37,8 @@
- #include "drm_pciids.h"
+@@ -36,6 +36,8 @@
+ #include <drm/drm_pciids.h>
  #include <linux/console.h>
  #include <linux/module.h>
 +#include <linux/namei.h>
@@ -42,7 +42,7 @@ to both DRM and radeon.
  
  
  /*
-@@ -378,6 +380,24 @@ static struct pci_driver radeon_kms_pci_
+@@ -411,6 +413,24 @@ static struct pci_driver radeon_kms_pci_
  	.resume = radeon_pci_resume,
  };
  
@@ -67,7 +67,7 @@ to both DRM and radeon.
  static int __init radeon_init(void)
  {
  	driver = &driver_old;
-@@ -402,6 +422,13 @@ static int __init radeon_init(void)
+@@ -435,6 +455,13 @@ static int __init radeon_init(void)
  		radeon_modeset = 0;
  #endif
  	}
diff --git a/debian/patches/debian/version.patch b/debian/patches/debian/version.patch
index 3c350dd22..bdd2f2ad8 100644
--- a/debian/patches/debian/version.patch
+++ b/debian/patches/debian/version.patch
@@ -8,16 +8,16 @@ are set.
 
 --- a/Makefile
 +++ b/Makefile
-@@ -806,7 +806,7 @@ endif
+@@ -822,7 +822,7 @@ endif
  prepare2: prepare3 outputmakefile asm-generic
  
- prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
+ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
 -                   include/config/auto.conf
 +                   include/config/auto.conf include/generated/package.h
  	$(cmd_crmodverdir)
  
  archprepare: archheaders archscripts prepare1 scripts_basic
-@@ -838,12 +838,25 @@ define filechk_version.h
+@@ -854,12 +854,25 @@ define filechk_version.h
  	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
  endef
  
@@ -31,7 +31,7 @@ are set.
 +endef
 +endif
 +
- include/linux/version.h: $(srctree)/Makefile FORCE
+ $(version_h): $(srctree)/Makefile FORCE
  	$(call filechk,version.h)
  
  include/generated/utsrelease.h: include/config/kernel.release FORCE
@@ -53,7 +53,7 @@ are set.
  #include <asm/uaccess.h>
  #include <asm/io.h>
  #include <linux/atomic.h>
-@@ -164,11 +165,12 @@ static void show_last_breaking_event(str
+@@ -181,11 +182,12 @@ static void show_last_breaking_event(str
   */
  void dump_stack(void)
  {
@@ -68,10 +68,10 @@ are set.
  	printk("Process %s (pid: %d, task: %p, ksp: %p)\n",
  	       current->comm, current->pid, current,
  	       (void *) current->thread.ksp);
-@@ -215,11 +217,12 @@ void show_registers(struct pt_regs *regs
+@@ -231,11 +233,12 @@ void show_registers(struct pt_regs *regs
+ 
  void show_regs(struct pt_regs *regs)
  {
- 	print_modules();
 -	printk("CPU: %d %s %s %.*s\n",
 +	printk("CPU: %d %s %s %.*s%s\n",
  	       task_thread_info(current)->cpu, print_tainted(),
@@ -92,7 +92,7 @@ are set.
 +#include <generated/package.h>
  #include <asm/current.h>
  #include <asm/ptrace.h>
- #include "sysrq.h"
+ #include <asm/sysrq.h>
 @@ -16,8 +17,9 @@ void __show_regs(struct pt_regs *regs)
  {
  	printk("\n");
@@ -115,7 +115,7 @@ are set.
  #include <asm/cpu.h>
  #include <asm/apic.h>
  #include <asm/syscalls.h>
-@@ -147,11 +148,12 @@ void show_regs_common(void)
+@@ -135,11 +136,12 @@ void show_regs_common(void)
  	/* Board Name is optional */
  	board = dmi_get_system_info(DMI_BOARD_NAME);
  
@@ -178,14 +178,14 @@ are set.
  	       regs->ar_unat, regs->ar_pfs, regs->ar_rsc);
 --- a/arch/arm/kernel/process.c
 +++ b/arch/arm/kernel/process.c
-@@ -31,6 +31,7 @@
- #include <linux/random.h>
+@@ -32,6 +32,7 @@
  #include <linux/hw_breakpoint.h>
  #include <linux/cpuidle.h>
+ #include <linux/leds.h>
 +#include <generated/package.h>
  
  #include <asm/cacheflush.h>
- #include <asm/leds.h>
+ #include <asm/processor.h>
 @@ -278,11 +279,12 @@ void __show_regs(struct pt_regs *regs)
  	unsigned long flags;
  	char buf[64];
@@ -211,7 +211,7 @@ are set.
  
  #include <asm/pgtable.h>
  #include <asm/uaccess.h>
-@@ -644,8 +645,9 @@ void show_regs(struct pt_regs * regs)
+@@ -643,8 +644,9 @@ void show_regs(struct pt_regs * regs)
  
  	printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
  	       regs->nip, regs->link, regs->ctr);