Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch

@@ -1,30 +0,0 @@
-From 758f624a9862b214f39c9106137a61e2d6b14544 Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Fri, 7 Feb 2014 14:56:14 +0100
-Subject: [PATCH] Revert "Read mounted filesystems from /proc/mounts instead of
- /etc/mtab."
-
-This reverts commit c916f644c57b638b3128d0e882c32bf50ea29631.
-
-For some reason, the output of /etc/mtab and /proc/mounts is not
-identical and the root device is missing in /proc/mounts on IPFire.
----
- src/fireinfo/system.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
-index 800032e..40ff7b0 100644
---- a/src/fireinfo/system.py
-+++ b/src/fireinfo/system.py
-@@ -364,7 +364,7 @@ class System(object):
- 		"""
- 			Return the dev node of the root disk.
- 		"""
--		with open("/proc/mounts", "r") as f:
-+		with open("/etc/mtab", "r") as f:
- 			dev, mountpoint, fs, rest = f.readline().split(" ", 3)
- 			if mountpoint == "/" and not fs == "rootfs":
- 				# Cut off /dev
--- 
-1.8.3.1
-

src/patches/grsecurity-haswell-32bit-fix.patch

@@ -1,53 +0,0 @@
-diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
-index 7430027..2124e35 100644
---- a/arch/x86/include/asm/mmu_context.h
-+++ b/arch/x86/include/asm/mmu_context.h
-@@ -80,7 +80,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
- #if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
- 		if (static_cpu_has(X86_FEATURE_PCID)) {
- 			if (static_cpu_has(X86_FEATURE_INVPCID)) {
--				unsigned long descriptor[2];
-+				u64 descriptor[2];
- 				descriptor[0] = PCID_USER;
- 				asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
- 			} else {
-@@ -144,7 +144,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
- #if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
- 		if (static_cpu_has(X86_FEATURE_PCID)) {
- 			if (static_cpu_has(X86_FEATURE_INVPCID)) {
--				unsigned long descriptor[2];
-+				u64 descriptor[2];
- 				descriptor[0] = PCID_USER;
- 				asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
- 			} else {
-diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
-index 45844c0..ada2172 100644
---- a/arch/x86/include/asm/tlbflush.h
-+++ b/arch/x86/include/asm/tlbflush.h
-@@ -18,7 +18,7 @@
- static inline void __native_flush_tlb(void)
- {
- 	if (static_cpu_has(X86_FEATURE_INVPCID)) {
--		unsigned long descriptor[2];
-+		u64 descriptor[2];
- 
- 		descriptor[0] = PCID_KERNEL;
- 		asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_MONGLOBAL) : "memory");
-@@ -42,7 +42,7 @@ static inline void __native_flush_tlb(void)
- static inline void __native_flush_tlb_global_irq_disabled(void)
- {
- 	if (static_cpu_has(X86_FEATURE_INVPCID)) {
--		unsigned long descriptor[2];
-+		u64 descriptor[2];
- 
- 		descriptor[0] = PCID_KERNEL;
- 		asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
-@@ -77,7 +77,7 @@ static inline void __native_flush_tlb_single(unsigned long addr)
- {
- 
- 	if (static_cpu_has(X86_FEATURE_INVPCID)) {
--		unsigned long descriptor[2];
-+		u64 descriptor[2];
- 
- 		descriptor[0] = PCID_KERNEL;
- 		descriptor[1] = addr;