[kernel] r21704 - in dists/trunk/linux: . debian debian/config/kernelarch-x86 debian/patches debian/patches/bugfix/mips debian/patches/bugfix/s390 debian/patches/bugfix/x86 debian/patches/features/x86 debian/templates debian/templates/po

Ben Hutchings benh at moszumanska.debian.org
Thu Aug 7 20:30:32 UTC 2014


Author: benh
Date: Thu Aug  7 20:30:32 2014
New Revision: 21704

Log:
Merge changes from sid up to 3.14.15-1

Added:
   dists/trunk/linux/debian/patches/bugfix/mips/MIPS-O32-32-bit-Fix-bug-which-can-cause-incorrect-sy.patch
      - copied unchanged from r21703, dists/sid/linux/debian/patches/bugfix/mips/MIPS-O32-32-bit-Fix-bug-which-can-cause-incorrect-sy.patch
   dists/trunk/linux/debian/patches/bugfix/mips/MIPS-OCTEON-make-get_system_type-thread-safe.patch
      - copied unchanged from r21703, dists/sid/linux/debian/patches/bugfix/mips/MIPS-OCTEON-make-get_system_type-thread-safe.patch
   dists/trunk/linux/debian/patches/bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch
      - copied, changed from r21703, dists/sid/linux/debian/patches/bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch
   dists/trunk/linux/debian/patches/bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch
      - copied unchanged from r21703, dists/sid/linux/debian/patches/bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch
   dists/trunk/linux/debian/patches/bugfix/s390/s390-3215-fix-hanging-console-issue.patch
      - copied unchanged from r21703, dists/sid/linux/debian/patches/bugfix/s390/s390-3215-fix-hanging-console-issue.patch
   dists/trunk/linux/debian/patches/bugfix/x86/x86-reject-x32-executables-if-x32-abi-not-supported.patch
      - copied unchanged from r21703, dists/sid/linux/debian/patches/bugfix/x86/x86-reject-x32-executables-if-x32-abi-not-supported.patch
   dists/trunk/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
      - copied unchanged from r21703, dists/sid/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch
Modified:
   dists/trunk/linux/   (props changed)
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64
   dists/trunk/linux/debian/patches/series
   dists/trunk/linux/debian/templates/image.plain.postinst.in
   dists/trunk/linux/debian/templates/po/de.po
   dists/trunk/linux/debian/templates/po/fr.po
   dists/trunk/linux/debian/templates/po/ja.po

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Thu Aug  7 19:01:16 2014	(r21703)
+++ dists/trunk/linux/debian/changelog	Thu Aug  7 20:30:32 2014	(r21704)
@@ -152,6 +152,98 @@
 
  -- maximilian attems <maks at debian.org>  Fri, 16 May 2014 14:33:57 +0200
 
+linux (3.14.15-1) unstable; urgency=medium
+
+  * New upstream stable update:
+    https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.14.14
+    - Bluetooth: Ignore H5 non-link packets in non-active state
+    - fuse: timeout comparison fix
+    - tracing: instance_rmdir() leaks ftrace_event_file->filter
+      (regression in 3.11)
+    - xen/balloon: set ballooned out pages as invalid in p2m
+      (regression in 3.12)
+    - quota: missing lock in dqcache_shrink_scan() (regression in 3.12)
+    - shmem: fix faulting into a hole, not taking i_mutex (CVE-2014-4171)
+    - shmem: fix splicing from a hole while it's punched (CVE-2014-4171)
+    - e1000e: Fix SHRA register access for 82579 (regression in 3.12)
+    - ip_tunnel: fix ip_tunnel_lookup
+    - net: sctp: check proc_dointvec result in proc_sctp_do_auth
+    - 8021q: fix a potential memory leak
+    - net: fix UDP tunnel GSO of frag_list GRO packets
+    - ipv4: fix dst race in sk_dst_get()
+    - ipv4: irq safe sk_dst_[re]set() and ipv4_sk_update_pmtu() fix
+    - bnx2x: fix possible panic under memory stress
+    - tcp: Fix divide by zero when pushing during tcp-repair
+    - ipv4: icmp: Fix pMTU handling for rare case
+    - net: Fix NETDEV_CHANGE notifier usage causing spurious arp flush
+      (regression in 3.11)
+    - igmp: fix the problem when mc leave group
+    - appletalk: Fix socket referencing in skb
+    - netlink: Fix handling of error from netlink_dump().
+    - tipc: clear 'next'-pointer of message fragments before reassembly
+      (regression in 3.13)
+    - net: sctp: fix information leaks in ulpevent layer
+    - bonding: fix ad_select module param check (regression in 3.14)
+    - net-gre-gro: Fix a bug that breaks the forwarding path
+      (regression in 3.14)
+    - perf/x86/intel: ignore CondChgd bit to avoid false NMI handling
+    - mwifiex: fix Tx timeout issue
+    - [x86] tsc: Fix cpufreq lockup (regression in 3.14)
+    - dm thin metadata: do not allow the data block size to change
+    - dm cache metadata: do not allow the data block size to change
+    - locking/mutex: Disable optimistic spinning on some architectures
+    - sched: Fix possible divide by zero in avg_atom() calculation
+    - aio: protect reqs_available updates from changes in interrupt handlers
+      (regression in 3.14.10)
+    - Don't trigger congestion wait on dirty-but-not-writeout pages
+      (regression in 3.11)
+    https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.14.15
+    - nfs: only show Posix ACLs in listxattr if actually present
+      (regression in 3.14)
+    - block: don't assume last put of shared tags is for the host
+    - libata: support the ata host which implements a queue depth less than 32
+      (regression in 3.14.4)
+    - libata: introduce ata_host->n_tags to avoid oops on SAS controllers
+    - blkcg: don't call into policy draining if root_blkg is already gone
+    - coredump: fix the setting of PF_DUMPCORE
+    - [hppa] Remove SA_RESTORER define
+    - hwmon: (smsc47m192) Fix temperature limit and vrm write operations
+    - fs: umount on symlink leaks mnt count (CVE-2014-5045)
+    - [x86] x86_32, entry: Store badsys error code in %eax
+      (regression in 3.14.10)
+    - drm/radeon: fix irq ring buffer overflow handling (regression in 3.14)
+    - mm: hugetlb: fix copy_hugetlb_page_range() (regression in 3.14.12)
+    - [x86] efi: Include a .bss section within the PE/COFF headers
+    - nl80211: move set_qos_map command into split state (regression in 3.14)
+    - platform_get_irq: Revert to platform_get_resource if of_irq_get fails
+      (regression in 3.14.6)
+
+  [ Aurelien Jarno ]
+  * Update German debconf template translations (Holger Wansing) (Closes:
+    #756049).
+  * Update French debconf template translations (David Prévot) (Closes:
+    #756134).
+  * Rewrite postinst to not require File::stat perl module (Closes: #756207).
+  * [mips*] Avoid smp_processor_id() in preemptible code.
+  * [mips*/octeon] Fix /proc/cpuinfo issues.
+  * [mips,mipsel/4kc-malta] Fix bug which can cause incorrect system call
+    restarts (fix hang on boot).
+  * [mips*] Fix hugepage support on machines with R4K like TLB.
+  * [mips*] Prevent user from setting FCSR cause bits and cause possible
+    kernel oops.
+  * Update Japanese debconf template translations (Victory).
+
+  [ Ben Hutchings ]
+  * [amd64] Reject x32 executables if x32 ABI not supported
+  * [amd64] Make x32 syscall support conditional on a kernel parameter
+  * [amd64] Enable X86_X32 (Closes: #708070) and X86_X32_DISABLED.
+    Use the kernel parameter "syscall.x32=y" to enable support for x32.
+  * [s390,s390x] 3215: fix hanging console issue (Closes: #747922)
+  * [armhf] Enable BRCMFMAC, BRCMFMAC_SDIO as modules (Closes: #734430)
+  * net: sctp: inherit auth_capable on INIT collisions (CVE-2014-5077)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Thu, 07 Aug 2014 16:47:21 +0100
+
 linux (3.14.13-2) unstable; urgency=medium
 
   [ Aurelien Jarno ]

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64	Thu Aug  7 19:01:16 2014	(r21703)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64	Thu Aug  7 20:30:32 2014	(r21704)
@@ -15,7 +15,8 @@
 CONFIG_NUMA_EMU=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_ISA_DMA_API=y
-# CONFIG_X86_X32 is not set
+CONFIG_X86_X32=y
+CONFIG_X86_X32_DISABLED=y
 
 ##
 ## file: arch/x86/Kconfig.cpu

Copied: dists/trunk/linux/debian/patches/bugfix/mips/MIPS-O32-32-bit-Fix-bug-which-can-cause-incorrect-sy.patch (from r21703, dists/sid/linux/debian/patches/bugfix/mips/MIPS-O32-32-bit-Fix-bug-which-can-cause-incorrect-sy.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/mips/MIPS-O32-32-bit-Fix-bug-which-can-cause-incorrect-sy.patch	Thu Aug  7 20:30:32 2014	(r21704, copy of r21703, dists/sid/linux/debian/patches/bugfix/mips/MIPS-O32-32-bit-Fix-bug-which-can-cause-incorrect-sy.patch)
@@ -0,0 +1,61 @@
+From: Alex Smith <alex.smith at imgtec.com>
+Date: Wed, 23 Jul 2014 14:40:11 +0100
+Subject: MIPS: O32/32-bit: Fix bug which can cause incorrect system
+ call restarts
+Origin: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=0ae0fe30fc3415727960270bd8fd61aea4c8a882 
+
+On 32-bit/O32, pt_regs has a padding area at the beginning into which the
+syscall arguments passed via the user stack are copied. 4 arguments
+totalling 16 bytes are copied to offset 16 bytes into this area, however
+the area is only 24 bytes long. This means the last 2 arguments overwrite
+pt_regs->regs[{0,1}].
+
+If a syscall function returns an error, handle_sys stores the original
+syscall number in pt_regs->regs[0] for syscall restart. signal.c checks
+whether regs[0] is non-zero, if it is it will check whether the syscall
+return value is one of the ERESTART* codes to see if it must be
+restarted.
+
+Should a syscall be made that results in a non-zero value being copied
+off the user stack into regs[0], and then returns a positive (non-error)
+value that matches one of the ERESTART* error codes, this can be mistaken
+for requiring a syscall restart.
+
+While the possibility for this to occur has always existed, it is made
+much more likely to occur by commit 46e12c07b3b9 ("MIPS: O32 / 32-bit:
+Always copy 4 stack arguments."), since now every syscall will copy 4
+arguments and overwrite regs[0], rather than just those with 7 or 8
+arguments.
+
+Since that commit, booting Debian under a 32-bit MIPS kernel almost
+always results in a hang early in boot, due to a wait4 syscall returning
+a PID that matches one of the ERESTART* codes, which then causes an
+incorrect restart of the syscall.
+
+The problem is fixed by increasing the size of the padding area so that
+arguments copied off the stack will not overwrite pt_regs->regs[{0,1}].
+
+Signed-off-by: Alex Smith <alex.smith at imgtec.com>
+Cc: <stable at vger.kernel.org> # v3.13+
+Tested-by: Aurelien Jarno <aurelien at aurel32.net>
+Reviewed-by: Aurelien Jarno <aurelien at aurel32.net>
+---
+ arch/mips/include/asm/ptrace.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h
+index 7e6e682..c301fa9 100644
+--- a/arch/mips/include/asm/ptrace.h
++++ b/arch/mips/include/asm/ptrace.h
+@@ -23,7 +23,7 @@
+ struct pt_regs {
+ #ifdef CONFIG_32BIT
+ 	/* Pad bytes for argument save space on the stack. */
+-	unsigned long pad0[6];
++	unsigned long pad0[8];
+ #endif
+ 
+ 	/* Saved main processor registers. */
+-- 
+1.7.10.4
+

Copied: dists/trunk/linux/debian/patches/bugfix/mips/MIPS-OCTEON-make-get_system_type-thread-safe.patch (from r21703, dists/sid/linux/debian/patches/bugfix/mips/MIPS-OCTEON-make-get_system_type-thread-safe.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/mips/MIPS-OCTEON-make-get_system_type-thread-safe.patch	Thu Aug  7 20:30:32 2014	(r21704, copy of r21703, dists/sid/linux/debian/patches/bugfix/mips/MIPS-OCTEON-make-get_system_type-thread-safe.patch)
@@ -0,0 +1,66 @@
+From: Aaro Koskinen <aaro.koskinen at nsn.com>
+Date: Tue, 22 Jul 2014 14:51:08 +0300
+Subject: MIPS: OCTEON: make get_system_type() thread-safe
+Origin: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=726d129dfdc9622197a8c3f5947ce09c1a4c935e 
+
+get_system_type() is not thread-safe on OCTEON. It uses static data,
+also more dangerous issue is that it's calling cvmx_fuse_read_byte()
+every time without any synchronization. Currently it's possible to get
+processes stuck looping forever in kernel simply by launching multiple
+readers of /proc/cpuinfo:
+
+	(while true; do cat /proc/cpuinfo > /dev/null; done) &
+	(while true; do cat /proc/cpuinfo > /dev/null; done) &
+	...
+
+Fix by initializing the system type string only once during the early
+boot.
+
+Signed-off-by: Aaro Koskinen <aaro.koskinen at nsn.com>
+Cc: stable at vger.kernel.org
+Reviewed-by: Markos Chandras <markos.chandras at imgtec.com>
+Patchwork: http://patchwork.linux-mips.org/patch/7437/
+Signed-off-by: James Hogan <james.hogan at imgtec.com>
+---
+ arch/mips/cavium-octeon/setup.c |   18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
+index 008e9c8..c9d9c62 100644
+--- a/arch/mips/cavium-octeon/setup.c
++++ b/arch/mips/cavium-octeon/setup.c
+@@ -458,6 +458,18 @@ static void octeon_halt(void)
+ 	octeon_kill_core(NULL);
+ }
+ 
++static char __read_mostly octeon_system_type[80];
++
++static int __init init_octeon_system_type(void)
++{
++	snprintf(octeon_system_type, sizeof(octeon_system_type), "%s (%s)",
++		cvmx_board_type_to_string(octeon_bootinfo->board_type),
++		octeon_model_get_string(read_c0_prid()));
++
++	return 0;
++}
++early_initcall(init_octeon_system_type);
++
+ /**
+  * Return a string representing the system type
+  *
+@@ -465,11 +477,7 @@ static void octeon_halt(void)
+  */
+ const char *octeon_board_type_string(void)
+ {
+-	static char name[80];
+-	sprintf(name, "%s (%s)",
+-		cvmx_board_type_to_string(octeon_bootinfo->board_type),
+-		octeon_model_get_string(read_c0_prid()));
+-	return name;
++	return octeon_system_type;
+ }
+ 
+ const char *get_system_type(void)
+-- 
+1.7.10.4
+

Copied and modified: dists/trunk/linux/debian/patches/bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch (from r21703, dists/sid/linux/debian/patches/bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch)
==============================================================================
--- dists/sid/linux/debian/patches/bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch	Thu Aug  7 19:01:16 2014	(r21703, copy source)
+++ dists/trunk/linux/debian/patches/bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch	Thu Aug  7 20:30:32 2014	(r21704)
@@ -29,19 +29,17 @@
  arch/mips/kernel/ptrace.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
-index f639ccd..3a7f7dd 100644
 --- a/arch/mips/kernel/ptrace.c
 +++ b/arch/mips/kernel/ptrace.c
-@@ -170,6 +170,7 @@ int ptrace_setfpregs(struct task_struct
- 		__get_user(fregs[i], i + (__u64 __user *) data);
+@@ -151,6 +151,7 @@ int ptrace_setfpregs(struct task_struct
+ 	}
  
  	__get_user(child->thread.fpu.fcr31, data + 64);
 +	child->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X;
  
  	/* FIR may not be written.  */
  
-@@ -593,7 +594,7 @@ long arch_ptrace(struct task_struct *chi
+@@ -565,7 +566,7 @@ long arch_ptrace(struct task_struct *chi
  			break;
  #endif
  		case FPC_CSR:
@@ -50,6 +48,3 @@
  			break;
  		case DSP_BASE ... DSP_BASE + 5: {
  			dspreg_t *dregs;
--- 
-1.7.10.4
-

Copied: dists/trunk/linux/debian/patches/bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch (from r21703, dists/sid/linux/debian/patches/bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch	Thu Aug  7 20:30:32 2014	(r21704, copy of r21703, dists/sid/linux/debian/patches/bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch)
@@ -0,0 +1,35 @@
+From: Huacai Chen <chenhc at lemote.com>
+Date: Tue, 29 Jul 2014 14:54:40 +0800
+Subject: MIPS: tlbex: fix a missing statement for HUGETLB
+Origin: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=8393c524a25609a30129e4a8975cf3b91f6c16a5 
+
+In commit 2c8c53e28f1 (MIPS: Optimize TLB handlers for Octeon CPUs)
+build_r4000_tlb_refill_handler() is modified. But it doesn't compatible
+with the original code in HUGETLB case. Because there is a copy & paste
+error and one line of code is missing. It is very easy to produce a bug
+with LTP's hugemmap05 test.
+
+Signed-off-by: Huacai Chen <chenhc at lemote.com>
+Signed-off-by: Binbin Zhou <zhoubb at lemote.com>
+Cc: <stable at vger.kernel.org>
+Tested-by: Aurelien Jarno <aurelien at aurel32.net>
+Reviewed-by: Aurelien Jarno <aurelien at aurel32.net>
+---
+ arch/mips/mm/tlbex.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
+index e80e10b..343fe0f 100644
+--- a/arch/mips/mm/tlbex.c
++++ b/arch/mips/mm/tlbex.c
+@@ -1299,6 +1299,7 @@ static void build_r4000_tlb_refill_handler(void)
+ 	}
+ #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
+ 	uasm_l_tlb_huge_update(&l, p);
++	UASM_i_LW(&p, K0, 0, K1);
+ 	build_huge_update_entries(&p, htlb_info.huge_pte, K1);
+ 	build_huge_tlb_write_entry(&p, &l, &r, K0, tlb_random,
+ 				   htlb_info.restore_scratch);
+-- 
+1.7.10.4
+

Copied: dists/trunk/linux/debian/patches/bugfix/s390/s390-3215-fix-hanging-console-issue.patch (from r21703, dists/sid/linux/debian/patches/bugfix/s390/s390-3215-fix-hanging-console-issue.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/s390/s390-3215-fix-hanging-console-issue.patch	Thu Aug  7 20:30:32 2014	(r21704, copy of r21703, dists/sid/linux/debian/patches/bugfix/s390/s390-3215-fix-hanging-console-issue.patch)
@@ -0,0 +1,69 @@
+From: Martin Schwidefsky <schwidefsky at de.ibm.com>
+Date: Tue, 15 Jul 2014 17:53:12 +0200
+Subject: s390/3215: fix hanging console issue
+Origin: https://git.kernel.org/cgit/linux/kernel/git/s390/linux.git/commit?id=26d766c60f4ea08cd14f0f3435a6db3d6cc2ae96
+Bug-Debian: https://bugs.debian.org/747922
+
+The ccw_device_start in raw3215_start_io can fail. raw3215_try_io
+does not check if the request could be started and removes any
+pending timer. This can leave the system in a hanging state.
+Check for pending request after raw3215_start_io and start a
+timer if necessary.
+
+Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
+---
+ drivers/s390/char/con3215.c | 32 +++++++++++++++++---------------
+ 1 file changed, 17 insertions(+), 15 deletions(-)
+
+diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
+index 5af7f0b..a6d47e5 100644
+--- a/drivers/s390/char/con3215.c
++++ b/drivers/s390/char/con3215.c
+@@ -288,12 +288,16 @@ static void raw3215_timeout(unsigned long __data)
+ 	unsigned long flags;
+ 
+ 	spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
+-	if (raw->flags & RAW3215_TIMER_RUNS) {
+-		del_timer(&raw->timer);
+-		raw->flags &= ~RAW3215_TIMER_RUNS;
+-		if (!(raw->port.flags & ASYNC_SUSPENDED)) {
+-			raw3215_mk_write_req(raw);
+-			raw3215_start_io(raw);
++	raw->flags &= ~RAW3215_TIMER_RUNS;
++	if (!(raw->port.flags & ASYNC_SUSPENDED)) {
++		raw3215_mk_write_req(raw);
++		raw3215_start_io(raw);
++		if ((raw->queued_read || raw->queued_write) &&
++		    !(raw->flags & RAW3215_WORKING) &&
++		    !(raw->flags & RAW3215_TIMER_RUNS)) {
++			raw->timer.expires = RAW3215_TIMEOUT + jiffies;
++			add_timer(&raw->timer);
++			raw->flags |= RAW3215_TIMER_RUNS;
+ 		}
+ 	}
+ 	spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
+@@ -317,17 +321,15 @@ static inline void raw3215_try_io(struct raw3215_info *raw)
+ 		    (raw->flags & RAW3215_FLUSHING)) {
+ 			/* execute write requests bigger than minimum size */
+ 			raw3215_start_io(raw);
+-			if (raw->flags & RAW3215_TIMER_RUNS) {
+-				del_timer(&raw->timer);
+-				raw->flags &= ~RAW3215_TIMER_RUNS;
+-			}
+-		} else if (!(raw->flags & RAW3215_TIMER_RUNS)) {
+-			/* delay small writes */
+-			raw->timer.expires = RAW3215_TIMEOUT + jiffies;
+-			add_timer(&raw->timer);
+-			raw->flags |= RAW3215_TIMER_RUNS;
+ 		}
+ 	}
++	if ((raw->queued_read || raw->queued_write) &&
++	    !(raw->flags & RAW3215_WORKING) &&
++	    !(raw->flags & RAW3215_TIMER_RUNS)) {
++		raw->timer.expires = RAW3215_TIMEOUT + jiffies;
++		add_timer(&raw->timer);
++		raw->flags |= RAW3215_TIMER_RUNS;
++	}
+ }
+ 
+ /*

Copied: dists/trunk/linux/debian/patches/bugfix/x86/x86-reject-x32-executables-if-x32-abi-not-supported.patch (from r21703, dists/sid/linux/debian/patches/bugfix/x86/x86-reject-x32-executables-if-x32-abi-not-supported.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/x86/x86-reject-x32-executables-if-x32-abi-not-supported.patch	Thu Aug  7 20:30:32 2014	(r21704, copy of r21703, dists/sid/linux/debian/patches/bugfix/x86/x86-reject-x32-executables-if-x32-abi-not-supported.patch)
@@ -0,0 +1,31 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 26 Jul 2014 15:03:11 +0100
+Subject: x86: Reject x32 executables if x32 ABI not supported
+Forwarded: http://mid.gmane.org/1406431195.29010.154.camel@deadeye.wl.decadent.org.uk
+
+It is currently possible to execve() an x32 executable on an x86_64
+kernel that has only ia32 compat enabled.  However all its syscalls
+will fail, even _exit().  This usually causes it to segfault.
+
+Change the ELF compat architecture check so that x32 executables are
+rejected if we don't support the x32 ABI.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ arch/x86/include/asm/elf.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/arch/x86/include/asm/elf.h
++++ b/arch/x86/include/asm/elf.h
+@@ -155,8 +155,9 @@ do {						\
+ #define elf_check_arch(x)			\
+ 	((x)->e_machine == EM_X86_64)
+ 
+-#define compat_elf_check_arch(x)		\
+-	(elf_check_arch_ia32(x) || (x)->e_machine == EM_X86_64)
++#define compat_elf_check_arch(x)					\
++	(elf_check_arch_ia32(x) ||					\
++	 (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64))
+ 
+ #if __USER32_DS != __USER_DS
+ # error "The following code assumes __USER32_DS == __USER_DS"

Copied: dists/trunk/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch (from r21703, dists/sid/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch	Thu Aug  7 20:30:32 2014	(r21704, copy of r21703, dists/sid/linux/debian/patches/features/x86/x86-make-x32-syscall-support-conditional.patch)
@@ -0,0 +1,188 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 25 Jul 2014 01:16:15 +0100
+Subject: x86: Make x32 syscall support conditional on a kernel parameter
+Bug-Debian: https://bugs.debian.org/708070
+
+Enabling x32 in the standard amd64 kernel would increase its attack
+surface while provide no benefit to the vast majority of its users.
+No-one seems interested in regularly checking for vulnerabilities
+specific to x32 (at least no-one with a white hat).
+
+Still, adding another flavour just to turn on x32 seems wasteful.  And
+the only differences on syscall entry are two instructions (mask out
+the x32 flag and compare the syscall number).
+
+So pad the standard comparison with a nop and add a kernel parameter
+"syscall.x32" which controls whether this is replaced with the x32
+version at boot time.  Add a Kconfig parameter to set the default.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ Documentation/kernel-parameters.txt |  4 ++++
+ arch/x86/Kconfig                    |  8 +++++++
+ arch/x86/include/asm/elf.h          |  8 ++++++-
+ arch/x86/kernel/entry_64.S          | 36 ++++++++++++++++++++++---------
+ arch/x86/kernel/syscall_64.c        | 43 +++++++++++++++++++++++++++++++++++++
+ 5 files changed, 88 insertions(+), 11 deletions(-)
+
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -3132,6 +3132,10 @@ bytes respectively. Such letter suffixes
+ 
+ 	switches=	[HW,M68k]
+ 
++	syscall.x32=	[KNL,x86_64] Enable/disable use of x32 syscalls on
++			an x86_64 kernel where CONFIG_X86_X32 is enabled.
++			Default depends on CONFIG_X86_X32_DISABLED.
++
+ 	sysfs.deprecated=0|1 [KNL]
+ 			Enable/disable old style sysfs layout for old udev
+ 			on older distributions. When this option is enabled
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -2384,6 +2384,14 @@ config X86_X32
+ 	  elf32_x86_64 support enabled to compile a kernel with this
+ 	  option set.
+ 
++config X86_X32_DISABLED
++	bool "x32 ABI disabled by default"
++	depends on X86_X32
++	default n
++	help
++	  Disable the x32 ABI unless explicitly enabled using the
++	  kernel paramter "syscall.x32=y".
++
+ config COMPAT
+ 	def_bool y
+ 	depends on IA32_EMULATION || X86_X32
+--- a/arch/x86/include/asm/elf.h
++++ b/arch/x86/include/asm/elf.h
+@@ -149,6 +149,12 @@ do {						\
+ 
+ #else /* CONFIG_X86_32 */
+ 
++#ifdef CONFIG_X86_X32_ABI
++extern bool x32_enabled;
++#else
++#define x32_enabled 0
++#endif
++
+ /*
+  * This is used to ensure we don't load something for the wrong architecture.
+  */
+@@ -157,7 +163,7 @@ do {						\
+ 
+ #define compat_elf_check_arch(x)					\
+ 	(elf_check_arch_ia32(x) ||					\
+-	 (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64))
++	 (x32_enabled && (x)->e_machine == EM_X86_64))
+ 
+ #if __USER32_DS != __USER_DS
+ # error "The following code assumes __USER32_DS == __USER_DS"
+--- a/arch/x86/kernel/entry_64.S
++++ b/arch/x86/kernel/entry_64.S
+@@ -621,8 +621,12 @@ system_call_fastpath:
+ #if __SYSCALL_MASK == ~0
+ 	cmpq $__NR_syscall_max,%rax
+ #else
+-	andl $__SYSCALL_MASK,%eax
+-	cmpl $__NR_syscall_max,%eax
++	.globl system_call_fast_compare
++	.globl system_call_fast_compare_end
++system_call_fast_compare:
++	cmpq $511,%rax			/* x32 syscalls start at 512 */
++	.byte P6_NOP4
++system_call_fast_compare_end:
+ #endif
+ 	ja badsys
+ 	movq %r10,%rcx
+@@ -740,8 +744,12 @@ tracesys:
+ #if __SYSCALL_MASK == ~0
+ 	cmpq $__NR_syscall_max,%rax
+ #else
+-	andl $__SYSCALL_MASK,%eax
+-	cmpl $__NR_syscall_max,%eax
++	.globl system_call_trace_compare
++	.globl system_call_trace_compare_end
++system_call_trace_compare:
++	cmpq $511,%rax			/* x32 syscalls start at 512 */
++	.byte P6_NOP4
++system_call_trace_compare_end:
+ #endif
+ 	ja   int_ret_from_sys_call	/* RAX(%rsp) set to -ENOSYS above */
+ 	movq %r10,%rcx	/* fixup for C */
+@@ -813,6 +821,16 @@ int_restore_rest:
+ 	CFI_ENDPROC
+ END(system_call)
+ 
++#if __SYSCALL_MASK != ~0
++	/* This replaces the usual comparisons if syscall.x32 is set */
++	.globl system_call_mask_compare
++	.globl system_call_mask_compare_end
++system_call_mask_compare:
++	andl $__SYSCALL_MASK,%eax
++	cmpl $__NR_syscall_max,%eax
++system_call_mask_compare_end:
++#endif
++
+ 	.macro FORK_LIKE func
+ ENTRY(stub_\func)
+ 	CFI_STARTPROC
+--- a/arch/x86/kernel/syscall_64.c
++++ b/arch/x86/kernel/syscall_64.c
+@@ -3,8 +3,14 @@
+ #include <linux/linkage.h>
+ #include <linux/sys.h>
+ #include <linux/cache.h>
++#include <linux/moduleparam.h>
++#undef MODULE_PARAM_PREFIX
++#define MODULE_PARAM_PREFIX "syscall."
++#include <linux/bug.h>
++#include <linux/init.h>
+ #include <asm/asm-offsets.h>
+ #include <asm/syscall.h>
++#include <asm/alternative.h>
+ 
+ #define __SYSCALL_COMMON(nr, sym, compat) __SYSCALL_64(nr, sym, compat)
+ 
+@@ -30,3 +36,40 @@ asmlinkage const sys_call_ptr_t sys_call
+ 	[0 ... __NR_syscall_max] = &sys_ni_syscall,
+ #include <asm/syscalls_64.h>
+ };
++
++#ifdef CONFIG_X86_X32_ABI
++
++/* Maybe enable x32 syscalls */
++
++bool x32_enabled = !IS_ENABLED(CONFIG_X86_X32_DISABLED);
++module_param_named(x32, x32_enabled, bool, 0444);
++
++extern char system_call_fast_compare_end[], system_call_fast_compare[],
++	system_call_trace_compare_end[], system_call_trace_compare[],
++	system_call_mask_compare_end[], system_call_mask_compare[];
++
++static int __init x32_enable(void)
++{
++	BUG_ON(system_call_fast_compare_end - system_call_fast_compare != 10);
++	BUG_ON(system_call_trace_compare_end - system_call_trace_compare != 10);
++	BUG_ON(system_call_mask_compare_end - system_call_mask_compare != 10);
++
++	if (x32_enabled) {
++		text_poke_early(system_call_fast_compare,
++				system_call_mask_compare, 10);
++		text_poke_early(system_call_trace_compare,
++				system_call_mask_compare, 10);
++#ifdef CONFIG_X86_X32_DISABLED
++		pr_info("Enabled x32 syscalls\n");
++#endif
++	}
++#ifndef CONFIG_X86_X32_DISABLED
++	else
++		pr_info("Disabled x32 syscalls\n");
++#endif
++
++	return 0;
++}
++late_initcall(x32_enable);
++
++#endif

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Thu Aug  7 19:01:16 2014	(r21703)
+++ dists/trunk/linux/debian/patches/series	Thu Aug  7 20:30:32 2014	(r21704)
@@ -55,6 +55,10 @@
 bugfix/m68k/ethernat-kconfig.patch
 bugfix/mips/MIPS-ZBOOT-add-missing-linux-string.h-include.patch
 bugfix/mips/MIPS-math-emu-cp1emu-Fix-typo-when-returning-to-regi.patch
+bugfix/mips/MIPS-OCTEON-make-get_system_type-thread-safe.patch
+bugfix/mips/MIPS-O32-32-bit-Fix-bug-which-can-cause-incorrect-sy.patch
+bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch
+bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch
 
 # Miscellaneous bug fixes
 bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
@@ -65,3 +69,6 @@
 features/all/x86-memtest-WARN-if-bad-RAM-found.patch
 features/all/efi-autoload-efivars.patch
 features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch
+bugfix/x86/x86-reject-x32-executables-if-x32-abi-not-supported.patch
+features/x86/x86-make-x32-syscall-support-conditional.patch
+bugfix/s390/s390-3215-fix-hanging-console-issue.patch

Modified: dists/trunk/linux/debian/templates/image.plain.postinst.in
==============================================================================
--- dists/trunk/linux/debian/templates/image.plain.postinst.in	Thu Aug  7 19:01:16 2014	(r21703)
+++ dists/trunk/linux/debian/templates/image.plain.postinst.in	Thu Aug  7 20:30:32 2014	(r21704)
@@ -5,7 +5,6 @@
 use Cwd 'abs_path';
 use Debconf::Client::ConfModule qw(:all);
 use POSIX ();
-use File::stat;
 version('2.0');
 my $capb = capb('backup', 'escape');
 
@@ -552,9 +551,9 @@
 # of / are the same as that of /sbin/init. This may fail if not running as
 # root or if /proc is not mounted, in which case 2 is returned.
 sub detect_chroot {
-  my $st1 = stat("/") or return 2;
-  my $st2 = stat("/proc/1/root") or return 2;
-  return ($st1->dev != $st2->dev) || ($st1->ino != $st2->ino);
+  my ($dev1, $ino1) = stat("/") or return 2;
+  my ($dev2, $ino2) = stat("/proc/1/root") or return 2;
+  return ($dev1 != $dev2) || ($ino1 != $ino2);
 }
 
 sub is_package_installed {

Modified: dists/trunk/linux/debian/templates/po/de.po
==============================================================================
--- dists/trunk/linux/debian/templates/po/de.po	Thu Aug  7 19:01:16 2014	(r21703)
+++ dists/trunk/linux/debian/templates/po/de.po	Thu Aug  7 20:30:32 2014	(r21704)
@@ -1,20 +1,21 @@
 # Translation of linux templates to german.
-# Copyright (C) 2010 Holger Wansing.
+# Copyright (C) 2010-2014 Holger Wansing.
 # This file is distributed under the same license as the linux package.
-# Holger Wansing <linux at wansing-online.de>, 2010, 2011.
-#
+# Holger Wansing <hwansing at mailbox.org>, 2010, 2011, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6 3.0.0-3\n"
+"Project-Id-Version: linux 3.14\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-20 22:37+0200\n"
-"PO-Revision-Date: 2011-09-13 20:41+0200\n"
-"Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
-"Language-Team: Debian German <debian-l10n-german at lists.debian.org>\n"
+"PO-Revision-Date: 2014-07-25 23:06+0200\n"
+"Last-Translator: Holger Wansing <hwansing at mailbox.org>\n"
+"Language-Team: debian-l10n-german at lists.debian.org\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
 
 #. Type: boolean
 #. Description
@@ -39,7 +40,7 @@
 "Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
 "modules.dep file will not be deleted, even though it may be invalid."
 msgstr ""
-"Da dieses Image eine initrd verwendet, wird die Datei ${modules_base}/"
+"Da dieses Image eine Initrd verwendet, wird die Datei ${modules_base}/"
 "@abiname@@localversion@/modules.dep nicht gelöscht, obwohl sie ungültig sein "
 "könnte."
 
@@ -52,9 +53,9 @@
 "abort the installation, there is a danger that the system will fail to boot."
 msgstr ""
 "Sie sollten die Installation abbrechen und die Fehler bezüglich depmod "
-"beheben, oder erstellen Sie das initrd-Image neu mit einer bekanntermaßen "
+"beheben, oder erstellen Sie das Initrd-Image neu mit einer bekanntermaßen "
 "korrekten modules.dep-Datei. Falls Sie die Installation nicht abbrechen, "
-"besteht die Gefahr, dass das System nicht mehr neu starten kann."
+"besteht die Gefahr, dass das System nicht mehr neu gestartet werden kann."
 
 #. Type: boolean
 #. Description
@@ -84,7 +85,7 @@
 "Das kann dazu führen, dass das System nicht mehr startfähig ist, da dadurch /"
 "boot/vmlinuz-${running} und alle Module unterhalb des Verzeichnisses /lib/"
 "modules/${running} entfernt werden. Dies kann nur mit einer Kopie des Kernel-"
-"Images und der dazugehörigen Module behoben werden."
+"Images und den dazugehörigen Modulen behoben werden."
 
 #. Type: boolean
 #. Description
@@ -93,15 +94,16 @@
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
 msgstr ""
-"Es wird dringend empfohlen, das Entfernen des Kernels abzubrechen, "
-"ausgenommen Sie sind darauf vorbereitet, das System nach der Entfernung "
-"wieder instandzusetzen."
+"Es wird dringend empfohlen, das Entfernen des Kernels abzubrechen, außer Sie "
+"sind darauf vorbereitet, das System nach der Entfernung wieder "
+"instandzusetzen."
 
 #. Type: note
 #. Description
 #: ../image.plain.templates.in:4001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
+"Bootloader-Konfiguration muss aktualisiert werden, um initramfs zu laden"
 
 #. Type: note
 #. Description
@@ -113,6 +115,12 @@
 "flexible boot process, and future kernel versions may require a "
 "corresponding initrd.img to boot."
 msgstr ""
+"Dieses Kernel-Paket wird eine »initramfs«-Datei (/boot/initrd.img-"
+"@abiname@@localversion@) erstellen, die vom Bootloader des Systems "
+"zusätzlich zum Kernel selbst verwendet wird. Diese Methode, früher auf MIPS "
+"nicht unterstützt, ermöglicht einen viel flexibleren Boot-Prozess und "
+"spätere Kernel-Versionen könnten eine passende initrd.img zum Booten "
+"voraussetzen."
 
 #. Type: note
 #. Description
@@ -124,3 +132,8 @@
 "accomplished by using the initrd.img symbolic link maintained by the kernel "
 "package."
 msgstr ""
+"Der aktuell laufende Kernel wurde ohne eine initramfs gebootet. Sie sollten "
+"den Bootloader neu konfigurieren, so dass er die initramfs für Linux Version "
+"@abiname@ und jede spätere Version laden kann. Dies ist über die Verwendung "
+"des symbolischen Links für initrd.img aus dem Kernel-Paket unter Umständen "
+"am einfachsten möglich."

Modified: dists/trunk/linux/debian/templates/po/fr.po
==============================================================================
--- dists/trunk/linux/debian/templates/po/fr.po	Thu Aug  7 19:01:16 2014	(r21703)
+++ dists/trunk/linux/debian/templates/po/fr.po	Thu Aug  7 20:30:32 2014	(r21704)
@@ -1,21 +1,21 @@
 # Translation of linux debconf templates to French
-# Copyright (C) 2010, 2011 Debian French l10n team <debian-l10n-french at lists.debian.org>
+# Copyright (C) 2010, 2011, 2014 Debian French l10n team <debian-l10n-french at lists.debian.org>
 # This file is distributed under the same license as the linux package.
 #
-# David Prévot <david at tilapin.org>, 2010, 2011.
+# David Prévot <david at tilapin.org>, 2010, 2011, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6 2.6.39-1\n"
+"Project-Id-Version: linux 3.14.13-2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-20 22:37+0200\n"
-"PO-Revision-Date: 2011-05-22 08:48-0400\n"
+"PO-Revision-Date: 2014-07-27 13:57+0200\n"
 "Last-Translator: David Prévot <david at tilapin.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. Type: boolean
@@ -31,7 +31,7 @@
 "The 'depmod' command exited with the exit code ${exit_value} "
 "(${SIGNAL}${CORE})."
 msgstr ""
-"La commande depmod s'est terminée avec le code de retour ${exit_value} "
+"La commande depmod s’est terminée avec le code de retour ${exit_value} "
 "(${SIGNAL} ${CORE})."
 
 #. Type: boolean
@@ -53,9 +53,9 @@
 "regenerate the initrd image with a known good modules.dep file. If you don't "
 "abort the installation, there is a danger that the system will fail to boot."
 msgstr ""
-"Vous devriez abandonner l'installation et corriger les erreurs de dépendance "
+"Vous devriez abandonner l’installation et corriger les erreurs de dépendance "
 "entre les modules du noyau (depmod), ou créer une nouvelle image initrd avec "
-"un fichier modules.dep valable. Si vous n'annulez pas l'installation, le "
+"un fichier modules.dep valable. Si vous n’annulez pas l’installation, le "
 "système risque de ne pas redémarrer correctement."
 
 #. Type: boolean
@@ -95,14 +95,16 @@
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
 msgstr ""
-"Il est fortement recommandé d'interrompre la suppression du noyau à moins "
-"d'être ensuite prêt à réparer le système."
+"Interrompre la suppression du noyau est fortement recommandé à moins d’être "
+"ensuite capable de réparer le système."
 
 #. Type: note
 #. Description
 #: ../image.plain.templates.in:4001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
+"La configuration du chargeur de démarrage doit être mise à jour pour charger "
+"le système de fichiers initial en mémoire"
 
 #. Type: note
 #. Description
@@ -114,6 +116,12 @@
 "flexible boot process, and future kernel versions may require a "
 "corresponding initrd.img to boot."
 msgstr ""
+"Ce paquet de noyau construira un système de fichiers initial en mémoire "
+"(fichier « initramfs » : /boot/initrd.img- at abiname@@localversion@) pour que "
+"le chargeur de démarrage du système puisse l’utiliser en plus du noyau lui-"
+"même. Cette méthode, jusqu’alors non prise en charge sous MIPS, active un "
+"processus de démarrage plus flexible et les prochaines versions de noyau "
+"pourraient nécessiter un initrd.img pour démarrer."
 
 #. Type: note
 #. Description
@@ -125,3 +133,8 @@
 "accomplished by using the initrd.img symbolic link maintained by the kernel "
 "package."
 msgstr ""
+"Le noyau actuel a été démarré sans système de fichiers initial en mémoire. "
+"Vous devriez reconfigurer le système de démarrage pour charger le système de "
+"fichiers initial en mémoire pour la version @abiname@ de Linux et toutes les "
+"versions suivantes. Le plus simple est probablement d’utiliser le lien "
+"symbolique initrd.img maintenu par le paquet du noyau."

Modified: dists/trunk/linux/debian/templates/po/ja.po
==============================================================================
--- dists/trunk/linux/debian/templates/po/ja.po	Thu Aug  7 19:01:16 2014	(r21703)
+++ dists/trunk/linux/debian/templates/po/ja.po	Thu Aug  7 20:30:32 2014	(r21704)
@@ -8,8 +8,8 @@
 "Project-Id-Version: linux\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-20 22:37+0200\n"
-"PO-Revision-Date: 2013-08-15 13:21+0200\n"
-"Last-Translator: Nobuhiro Iwamatsu <iwamatsu at debian.org>\n"
+"PO-Revision-Date: 2014-08-03 17:18+0200\n"
+"Last-Translator: Victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -101,7 +101,7 @@
 #. Description
 #: ../image.plain.templates.in:4001
 msgid "Boot loader configuration must be updated to load initramfs"
-msgstr ""
+msgstr "initramfs をロードするためにはブートローダ設定を更新する必要があります"
 
 #. Type: note
 #. Description
@@ -113,6 +113,11 @@
 "flexible boot process, and future kernel versions may require a "
 "corresponding initrd.img to boot."
 msgstr ""
+"このカーネルパッケージはカーネル自体に加え、システムのブートローダで利用する"
+"「initramfs」ファイル (/boot/initrd.img- at abiname@@localversion@) をビルドしま"
+"す。MIPS では以前サポートされていなかったこの方法によってブートプロセスをより"
+"柔軟にできるようになり、将来のバージョンのカーネルではブートするために対応す"
+"る initrd.img が必要となるかもしれません。"
 
 #. Type: note
 #. Description
@@ -124,3 +129,8 @@
 "accomplished by using the initrd.img symbolic link maintained by the kernel "
 "package."
 msgstr ""
+"現在実行中のカーネルは initramfs を使わずにブートされています。Linux バー"
+"ジョン @abiname@ 及び以後の各バージョンで専用の initramfs をロードするために"
+"ブートローダを再設定する必要があります。恐らくこれを最も簡単に実現できるのは"
+"カーネルパッケージにより保守される initrd.img シンボリックリンクを利用する方"
+"法です。"



More information about the Kernel-svn-changes mailing list