[kernel] r19437 - in dists/trunk/linux/debian: . patches patches/bugfix/all patches/bugfix/arm patches/debian

[Ben Hutchings]

Author: benh
Date: Sat Oct 13 08:57:26 2012
New Revision: 19437

Log:
Update to 3.6.2

Drop ite-cir patch applied upstream.
Drop ARM acard workaround; the problem has been fixed differently upstream.

Deleted:
   dists/trunk/linux/debian/patches/bugfix/all/media-rc-ite-cir-Initialise-ite_dev-rdev-earlier.patch
   dists/trunk/linux/debian/patches/bugfix/arm/disable-scsi_acard.patch
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/debian/version.patch
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Fri Oct 12 04:05:04 2012	(r19436)
+++ dists/trunk/linux/debian/changelog	Sat Oct 13 08:57:26 2012	(r19437)
@@ -1,8 +1,9 @@
-linux (3.6.1-1~experimental.1) UNRELEASED; urgency=low
+linux (3.6.2-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release: http://kernelnewbies.org/Linux_3.6
   * New upstream stable update:
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.6.1
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.6.2
 
   [ Ben Hutchings ]
   * aufs: Update to aufs3.x-rcN-20120827

Modified: dists/trunk/linux/debian/patches/debian/version.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/version.patch	Fri Oct 12 04:05:04 2012	(r19436)
+++ dists/trunk/linux/debian/patches/debian/version.patch	Sat Oct 13 08:57:26 2012	(r19437)
@@ -8,7 +8,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -806,7 +806,7 @@
+@@ -806,7 +806,7 @@ endif
  prepare2: prepare3 outputmakefile asm-generic
  
  prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
@@ -17,7 +17,7 @@
  	$(cmd_crmodverdir)
  
  archprepare: archheaders archscripts prepare1 scripts_basic
-@@ -838,12 +838,25 @@
+@@ -838,12 +838,25 @@ define filechk_version.h
  	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
  endef
  
@@ -53,7 +53,7 @@
  #include <asm/uaccess.h>
  #include <asm/io.h>
  #include <linux/atomic.h>
-@@ -164,11 +165,12 @@
+@@ -164,11 +165,12 @@ static void show_last_breaking_event(str
   */
  void dump_stack(void)
  {
@@ -68,7 +68,7 @@
  	printk("Process %s (pid: %d, task: %p, ksp: %p)\n",
  	       current->comm, current->pid, current,
  	       (void *) current->thread.ksp);
-@@ -215,11 +217,12 @@
+@@ -215,11 +217,12 @@ void show_registers(struct pt_regs *regs
  void show_regs(struct pt_regs *regs)
  {
  	print_modules();
@@ -93,7 +93,7 @@
  #include <asm/current.h>
  #include <asm/ptrace.h>
  #include "sysrq.h"
-@@ -16,8 +17,9 @@
+@@ -16,8 +17,9 @@ void __show_regs(struct pt_regs *regs)
  {
  	printk("\n");
  	print_modules();
@@ -115,7 +115,7 @@
  #include <asm/cpu.h>
  #include <asm/apic.h>
  #include <asm/syscalls.h>
-@@ -147,11 +148,12 @@
+@@ -147,11 +148,12 @@ void show_regs_common(void)
  	/* Board Name is optional */
  	board = dmi_get_system_info(DMI_BOARD_NAME);
  
@@ -139,7 +139,7 @@
  
  #include <asm/stacktrace.h>
  
-@@ -188,11 +189,12 @@
+@@ -188,11 +189,12 @@ void dump_stack(void)
  	unsigned long stack;
  
  	bp = stack_frame(current, NULL);
@@ -156,15 +156,15 @@
  EXPORT_SYMBOL(dump_stack);
 --- a/arch/ia64/kernel/process.c
 +++ b/arch/ia64/kernel/process.c
-@@ -29,6 +29,7 @@
- #include <linux/kdebug.h>
+@@ -30,6 +30,7 @@
  #include <linux/utsname.h>
  #include <linux/tracehook.h>
+ #include <linux/rcupdate.h>
 +#include <generated/package.h>
  
  #include <asm/cpu.h>
  #include <asm/delay.h>
-@@ -112,9 +113,9 @@
+@@ -113,9 +114,9 @@ show_regs (struct pt_regs *regs)
  	print_modules();
  	printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
  			smp_processor_id(), current->comm);
@@ -186,7 +186,7 @@
  
  #include <asm/cacheflush.h>
  #include <asm/leds.h>
-@@ -278,11 +279,12 @@
+@@ -278,11 +279,12 @@ void __show_regs(struct pt_regs *regs)
  	unsigned long flags;
  	char buf[64];
  
@@ -211,7 +211,7 @@
  
  #include <asm/pgtable.h>
  #include <asm/uaccess.h>
-@@ -644,8 +645,9 @@
+@@ -644,8 +645,9 @@ void show_regs(struct pt_regs * regs)
  
  	printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
  	       regs->nip, regs->link, regs->ctr);
@@ -233,7 +233,7 @@
  #include <asm/uaccess.h>
  #include <asm/mmu_context.h>
  #include <asm/fpu.h>
-@@ -33,10 +34,11 @@
+@@ -33,10 +34,11 @@ void show_regs(struct pt_regs * regs)
  {
  	printk("\n");
  	printk("Pid : %d, Comm: \t\t%s\n", task_pid_nr(current), current->comm);

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Fri Oct 12 04:05:04 2012	(r19436)
+++ dists/trunk/linux/debian/patches/series	Sat Oct 13 08:57:26 2012	(r19437)
@@ -17,7 +17,6 @@
 
 bugfix/ia64/hardcode-arch-script-output.patch
 bugfix/mips/disable-advansys.patch
-bugfix/arm/disable-scsi_acard.patch
 debian/mips-disable-werror.patch
 bugfix/powerpc/lpar-console.patch
 
@@ -44,6 +43,5 @@
 
 debian/debugfs-set-default-mode-to-700.patch
 
-bugfix/all/media-rc-ite-cir-Initialise-ite_dev-rdev-earlier.patch
 bugfix/alpha/alpha-use-large-data-model.diff
 bugfix/all/speakup-lower-default-software-speech-rate.patch