[kernel] r21710 - in dists/trunk/linux: . debian debian/patches/bugfix/mips

[Ben Hutchings]

Author: benh
Date: Sat Aug  9 02:40:27 2014
New Revision: 21710

Log:
Merge changes from sid up to 3.14.15-2

Modified:
   dists/trunk/linux/   (props changed)
   dists/trunk/linux/debian/changelog
   dists/trunk/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-prevent-user-from-setting-FCSR-cause-bits.patch
   dists/trunk/linux/debian/patches/bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sat Aug  9 02:39:33 2014	(r21709)
+++ dists/trunk/linux/debian/changelog	Sat Aug  9 02:40:27 2014	(r21710)
@@ -152,6 +152,14 @@
 
  -- maximilian attems <maks at debian.org>  Fri, 16 May 2014 14:33:57 +0200
 
+linux (3.14.15-2) unstable; urgency=medium
+
+  [ Aurelien Jarno ]
+  * [mips*/4kc-malta] Remove ABI reference as previous kernels were not
+    really usable, and the fix changes the ABI.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 09 Aug 2014 01:09:38 +0100
+
 linux (3.14.15-1) unstable; urgency=medium
 
   * New upstream stable update:

Modified: dists/trunk/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-O32-32-bit-Fix-bug-which-can-cause-incorrect-sy.patch	Sat Aug  9 02:39:33 2014	(r21709)
+++ dists/trunk/linux/debian/patches/bugfix/mips/MIPS-O32-32-bit-Fix-bug-which-can-cause-incorrect-sy.patch	Sat Aug  9 02:40:27 2014	(r21710)
@@ -2,7 +2,7 @@
 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 
+Origin: https://git.kernel.org/linus/e90e6fddc57055c4c6b57f92787fea1c065d440b
 
 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

Modified: dists/trunk/linux/debian/patches/bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch	Sat Aug  9 02:39:33 2014	(r21709)
+++ dists/trunk/linux/debian/patches/bugfix/mips/MIPS-prevent-user-from-setting-FCSR-cause-bits.patch	Sat Aug  9 02:40:27 2014	(r21710)
@@ -1,7 +1,7 @@
 From: Paul Burton <paul.burton at imgtec.com>
 Date: Tue, 22 Jul 2014 14:21:21 +0100
 Subject: MIPS: prevent user from setting FCSR cause bits
-Origin: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=b1442d39fac2fcfbe6a4814979020e993ca59c9e 
+Origin: https://git.kernel.org/linus/b1442d39fac2fcfbe6a4814979020e993ca59c9e
 
 If one or more matching FCSR cause & enable bits are set in saved thread
 context then when that context is restored the kernel will take an FP

Modified: dists/trunk/linux/debian/patches/bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch	Sat Aug  9 02:39:33 2014	(r21709)
+++ dists/trunk/linux/debian/patches/bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch	Sat Aug  9 02:40:27 2014	(r21710)
@@ -1,7 +1,7 @@
 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 
+Origin: https://git.kernel.org/linus/8393c524a25609a30129e4a8975cf3b91f6c16a5
 
 In commit 2c8c53e28f1 (MIPS: Optimize TLB handlers for Octeon CPUs)
 build_r4000_tlb_refill_handler() is modified. But it doesn't compatible