diff options
| author | Ben Hutchings <benh@debian.org> | 2013-08-08 08:22:45 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2013-08-08 08:22:45 +0000 |
| commit | e7d79407b059e63bffd3b51beddcee9ee87cf701 (patch) | |
| tree | 899d4fb7d44133115bf3c62d79c3d464e86c24fc /debian/patches/debian/version.patch | |
| parent | 3597b68b6c8ac3caa4fe3876b7cf0c44e929d42c (diff) | |
Update to 3.11-rc4
Drop two bug fixes applied upstream.
Adjust debian/version.patch for renaming of kernel/printk.c.
svn path=/dists/trunk/linux/; revision=20457
Diffstat (limited to 'debian/patches/debian/version.patch')
| -rw-r--r-- | debian/patches/debian/version.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/debian/version.patch b/debian/patches/debian/version.patch index af6483ab4..f8bb63774 100644 --- a/debian/patches/debian/version.patch +++ b/debian/patches/debian/version.patch @@ -98,7 +98,7 @@ are set. #include <asm/pgtable.h> #include <asm/uaccess.h> -@@ -842,8 +843,9 @@ void show_regs(struct pt_regs * regs) +@@ -843,8 +844,9 @@ void show_regs(struct pt_regs * regs) printk("NIP: "REG" LR: "REG" CTR: "REG"\n", regs->nip, regs->link, regs->ctr); @@ -110,8 +110,8 @@ are set. printk("MSR: "REG" ", regs->msr); printbits(regs->msr, msr_bits); printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer); ---- a/kernel/printk.c -+++ b/kernel/printk.c +--- a/kernel/printk/printk.c ++++ b/kernel/printk/printk.c @@ -45,6 +45,7 @@ #include <linux/poll.h> #include <linux/irq_work.h> @@ -120,7 +120,7 @@ are set. #include <asm/uaccess.h> -@@ -2883,11 +2884,12 @@ void __init dump_stack_set_arch_desc(con +@@ -2871,11 +2872,12 @@ void __init dump_stack_set_arch_desc(con */ void dump_stack_print_info(const char *log_lvl) { |