core updated.

2015-05-17 16:28:10 +03:00
parent 14d58aa1d0
commit 8e13c775be
558 changed files with 543408 additions and 27657 deletions
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import kerneltools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import get
+
+NoStrip = ["/lib", "/boot"]
+
+shelltools.export("KBUILD_BUILD_USER", "pisilinux")
+shelltools.export("KBUILD_BUILD_HOST", "buildfarm")
+shelltools.export("PYTHONDONTWRITEBYTECODE", "1")
+
+#cpupower_arch = get.ARCH().replace("i686", "i386")
+
+def setup():
+    kerneltools.configure()
+
+def build():
+    kerneltools.build(debugSymbols=False)
+
+def install():
+    kerneltools.install()
+
+    # Install kernel headers needed for out-of-tree module compilation
+    kerneltools.installHeaders()
+
+    kerneltools.installLibcHeaders()
+
+    # Generate some module lists to use within mkinitramfs
+    shelltools.system("./generate-module-list %s/lib/modules/%s" % (get.installDIR(), kerneltools.__getSuffix()))
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+
+import os
+
+def read_file(path):
+    with open(path) as f:
+        return f.read().strip()
+
+def postInstall(fromVersion, fromRelease, toVersion, toRelease):
+    gcf = "/boot/grub2/grub.cfg"
+    if not os.path.isfile(gcf): return
+
+    if os.path.isfile("/etc/mudur/locale"): os.environ["LANG"] = read_file("/etc/mudur/locale").split("\n")[0]
+    os.environ["PATH"] = "/usr/sbin:/usr/bin:/sbin:/bin"
+    os.system("grub2-mkconfig -o %s" % gcf)
+
+    # Update GRUB entry
+    #if os.path.exists("/boot/grub/grub.conf"):
+    #    call("grub", "Boot.Loader", "updateKernelEntry", (KVER, ""))
+
+def preRemove():
+    pass
@@ -0,0 +1,11 @@
+--- linux-3.16/include/linux/printk.h.old	2014-08-04 18:48:30.686043266 +0200
+++ linux-3.16/include/linux/printk.h	2014-08-04 18:48:47.706218528 +0200
+@@ -37,7 +37,7 @@
+ #define CONSOLE_LOGLEVEL_SILENT  0 /* Mum's the word */
+ #define CONSOLE_LOGLEVEL_MIN	 1 /* Minimum loglevel we let people use */
+ #define CONSOLE_LOGLEVEL_QUIET	 4 /* Shhh ..., when booted with "quiet" */
+-#define CONSOLE_LOGLEVEL_DEFAULT 7 /* anything MORE serious than KERN_DEBUG */
+#define CONSOLE_LOGLEVEL_DEFAULT 4 /* anything MORE serious than KERN_DEBUG */
+ #define CONSOLE_LOGLEVEL_DEBUG	10 /* issue debug messages */
+ #define CONSOLE_LOGLEVEL_MOTORMOUTH 15	/* You can't shut this one up */
+ 
@@ -0,0 +1,21 @@
+diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
+index dd9d6190b08d..181e42bd85d3 100644
+--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
+@@ -85,6 +85,7 @@
+ #include <linux/syscore_ops.h>
+ 
+ #include <asm/microcode.h>
+#include <asm/microcode_intel.h>
+ #include <asm/processor.h>
+ #include <asm/cpu_device_id.h>
+ #include <asm/perf_event.h>
+@@ -465,6 +466,8 @@ static void mc_bp_resume(void)
+ 
+ 	if (uci->valid && uci->mc)
+ 		microcode_ops->apply_microcode(cpu);
+	else if (!uci->mc)
+		load_ucode_intel_ap();
+ }
+ 
+ static struct syscore_ops mc_syscore_ops = {
@@ -0,0 +1,54 @@
+From: Anthony G. Basile <blueness@gentoo.org>
+
+This patch adds support for a restricted user-controlled namespace on
+tmpfs filesystem used to house PaX flags.  The namespace must be of the
+form user.pax.* and its value cannot exceed a size of 8 bytes.
+
+This is needed even on all Gentoo systems so that XATTR_PAX flags
+are preserved for users who might build packages using portage on
+a tmpfs system with a non-hardened kernel and then switch to a
+hardened kernel with XATTR_PAX enabled.
+
+The namespace is added to any user with Extended Attribute support
+enabled for tmpfs.  Users who do not enable xattrs will not have
+the XATTR_PAX flags preserved.
+
+diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
+index e4629b9..6958086 100644
+--- a/include/uapi/linux/xattr.h
+++ b/include/uapi/linux/xattr.h
+@@ -63,5 +63,9 @@
+ #define XATTR_POSIX_ACL_DEFAULT  "posix_acl_default"
+ #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
+ 
+/* User namespace */
+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
+#define XATTR_PAX_FLAGS_SUFFIX "flags"
+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
+ 
+ #endif /* _UAPI_LINUX_XATTR_H */
+diff --git a/mm/shmem.c b/mm/shmem.c
+index 1c44af7..f23bb1b 100644
+--- a/mm/shmem.c
+++ b/mm/shmem.c
+@@ -2201,6 +2201,7 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
+ static int shmem_xattr_validate(const char *name)
+ {
+ 	struct { const char *prefix; size_t len; } arr[] = {
+		{ XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
+ 		{ XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
+ 		{ XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
+ 	};
+@@ -2256,6 +2257,12 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
+ 	if (err)
+ 		return err;
+ 
+	if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
+		if (strcmp(name, XATTR_NAME_PAX_FLAGS))
+			return -EOPNOTSUPP;
+		if (size > 8)
+			return -EINVAL;
+	}
+ 	return simple_xattr_set(&info->xattrs, name, value, size, flags);
+ }
+ 
@@ -0,0 +1,22 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Subject: fs: Enable link security restrictions by default
+Date: Fri, 02 Nov 2012 05:32:06 +0000
+Bug-Debian: https://bugs.debian.org/609455
+Forwarded: not-needed
+
+This reverts commit 561ec64ae67ef25cac8d72bb9c4bfc955edfd415
+('VFS: don't do protected {sym,hard}links by default').
+
+--- a/fs/namei.c
+++ b/fs/namei.c
+@@ -651,8 +651,8 @@ static inline void put_link(struct namei
+ 	path_put(link);
+ }
+ 
+-int sysctl_protected_symlinks __read_mostly = 0;
+-int sysctl_protected_hardlinks __read_mostly = 0;
+int sysctl_protected_symlinks __read_mostly = 1;
+int sysctl_protected_hardlinks __read_mostly = 1;
+ 
+ /**
+  * may_follow_link - Check symlink following for unsafe situations
@@ -0,0 +1,67 @@
+diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
+index cb96296..6c242ed 100644
+--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
+@@ -269,6 +276,61 @@  static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
+ 	},
+ 
+ 	/*
+	 * The following Lenovo models have a broken workaround in the
+	 * acpi_video backlight implementation to meet the Windows 8
+	 * requirement of 101 backlight levels. Reverting to pre-Win8
+	 * behavior fixes the problem.
+	 */
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Lenovo ThinkPad L430",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L430"),
+		},
+	},
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Lenovo ThinkPad T430s",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T430s"),
+		},
+	},
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Lenovo ThinkPad T530",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T530"),
+		},
+	},
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Lenovo ThinkPad W530",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W530"),
+		},
+	},
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Lenovo ThinkPad X1 Carbon",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X1 Carbon"),
+		},
+	},
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Lenovo ThinkPad X230",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X230"),
+		},
+	},
+
+	/*
+ 	 * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.
+ 	 * Linux ignores it, except for the machines enumerated below.
+ 	 */
+
@@ -0,0 +1,30 @@
+--- a/init/do_mounts.c	2014-08-26 08:03:30.000013100 -0400
+++ b/init/do_mounts.c	2014-08-26 08:11:19.720014712 -0400
+@@ -484,7 +484,10 @@ void __init change_floppy(char *fmt, ...
+ 	va_start(args, fmt);
+ 	vsprintf(buf, fmt, args);
+ 	va_end(args);
+-	fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
+	if (saved_root_name[0])
+		fd = sys_open(saved_root_name, O_RDWR | O_NDELAY, 0);
+	else
+		fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
+ 	if (fd >= 0) {
+ 		sys_ioctl(fd, FDEJECT, 0);
+ 		sys_close(fd);
+@@ -527,8 +530,13 @@ void __init mount_root(void)
+ 	}
+ #endif
+ #ifdef CONFIG_BLOCK
+-	create_dev("/dev/root", ROOT_DEV);
+-	mount_block_root("/dev/root", root_mountflags);
+	if (saved_root_name[0]) {
+		create_dev(saved_root_name, ROOT_DEV);
+		mount_block_root(saved_root_name, root_mountflags);
+	} else {
+		create_dev("/dev/root", ROOT_DEV);
+		mount_block_root("/dev/root", root_mountflags);
+	}
+ #endif
+ }
+ 
@@ -0,0 +1,24 @@
+diff --git a/kernel/kmod.c b/kernel/kmod.c
+index fb32636..d968882 100644
+--- a/kernel/kmod.c
+++ b/kernel/kmod.c
+@@ -575,7 +575,8 @@
+ 		call_usermodehelper_freeinfo(sub_info);
+ 		return -EINVAL;
+ 	}
+-	helper_lock();
+	if (!(current->flags & PF_FREEZER_SKIP))
+		helper_lock();
+ 	if (!khelper_wq || usermodehelper_disabled) {
+ 		retval = -EBUSY;
+ 		goto out;
+@@ -611,7 +612,8 @@ wait_done:
+ out:
+ 	call_usermodehelper_freeinfo(sub_info);
+ unlock:
+-	helper_unlock();
+	if (!(current->flags & PF_FREEZER_SKIP))
+		helper_unlock();
+ 	return retval;
+ }
+ EXPORT_SYMBOL(call_usermodehelper_exec);
@@ -0,0 +1,143 @@
+--- a/Kconfig
+++ b/Kconfig
+@@ -8,4 +8,6 @@ config SRCARCH
+ 	string
+ 	option env="SRCARCH"
+ 
+source "distro/Kconfig"
+
+ source "arch/$SRCARCH/Kconfig"
+--- /dev/null
+++ b/distro/Kconfig
+@@ -0,0 +1,131 @@
+menu "Gentoo Linux"
+
+config GENTOO_LINUX
+	bool "Gentoo Linux support"
+
+	default y
+
+	help
+		In order to boot Gentoo Linux a minimal set of config settings needs to
+		be enabled in the kernel; to avoid the users from having to enable them
+		manually as part of a Gentoo Linux installation or a new clean config,
+		we enable these config settings by default for convenience.
+
+		See the settings that become available for more details and fine-tuning.
+
+config GENTOO_LINUX_UDEV
+	bool "Linux dynamic and persistent device naming (userspace devfs) support"
+
+	depends on GENTOO_LINUX
+	default y if GENTOO_LINUX
+
+	select DEVTMPFS
+	select TMPFS
+
+	select MMU
+	select SHMEM
+
+	help
+		In order to boot Gentoo Linux a minimal set of config settings needs to
+		be enabled in the kernel; to avoid the users from having to enable them
+		manually as part of a Gentoo Linux installation or a new clean config,
+		we enable these config settings by default for convenience.
+
+		Currently this only selects TMPFS, DEVTMPFS and their dependencies.
+		TMPFS is enabled to maintain a tmpfs file system at /dev/shm, /run and
+		/sys/fs/cgroup; DEVTMPFS to maintain a devtmpfs file system at /dev.
+
+		Some of these are critical files that need to be available early in the
+		boot process; if not available, it causes sysfs and udev to malfunction.
+
+		To ensure Gentoo Linux boots, it is best to leave this setting enabled;
+		if you run a custom setup, you could consider whether to disable this.
+
+config GENTOO_LINUX_PORTAGE
+	bool "Select options required by Portage features"
+
+	depends on GENTOO_LINUX
+	default y if GENTOO_LINUX
+
+	select CGROUPS
+	select NAMESPACES
+	select IPC_NS
+	select NET_NS
+
+	help
+		This enables options required by various Portage FEATURES.
+		Currently this selects:
+
+		CGROUPS     (required for FEATURES=cgroup)
+		IPC_NS      (required for FEATURES=ipc-sandbox)
+		NET_NS      (required for FEATURES=network-sandbox)
+
+		It is highly recommended that you leave this enabled as these FEATURES
+		are, or will soon be, enabled by default.
+
+menu "Support for init systems, system and service managers"
+	visible if GENTOO_LINUX
+
+config GENTOO_LINUX_INIT_SCRIPT
+	bool "OpenRC, runit and other script based systems and managers"
+
+	default y if GENTOO_LINUX
+
+	depends on GENTOO_LINUX
+
+	select BINFMT_SCRIPT
+
+	help
+		The init system is the first thing that loads after the kernel booted.
+
+		These config settings allow you to select which init systems to support;
+		instead of having to select all the individual settings all over the
+		place, these settings allows you to select all the settings at once.
+
+		This particular setting enables all the known requirements for OpenRC,
+		runit and similar script based systems and managers.
+
+		If you are unsure about this, it is best to leave this setting enabled.
+
+config GENTOO_LINUX_INIT_SYSTEMD
+	bool "systemd"
+
+	default n
+
+	depends on GENTOO_LINUX && GENTOO_LINUX_UDEV
+
+	select AUTOFS4_FS
+	select BLK_DEV_BSG
+	select CGROUPS
+	select DEVPTS_MULTIPLE_INSTANCES
+	select EPOLL
+	select FANOTIFY
+	select FHANDLE
+	select INOTIFY_USER
+	select NET
+	select NET_NS
+	select PROC_FS
+	select SIGNALFD
+	select SYSFS
+	select TIMERFD
+
+	select ANON_INODES
+	select BLOCK
+	select EVENTFD
+	select FSNOTIFY
+	select INET
+	select NLATTR
+
+	help
+		The init system is the first thing that loads after the kernel booted.
+
+		These config settings allow you to select which init systems to support;
+		instead of having to select all the individual settings all over the
+		place, these settings allows you to select all the settings at once.
+
+		This particular setting enables all the known requirements for systemd;
+		it also enables suggested optional settings, as the package suggests to.
+
+endmenu
+
+endmenu
@@ -0,0 +1,104 @@
+From a828d56aebc0735676be23734cccf31e279c0d1b Mon Sep 17 00:00:00 2001
+From: Paolo Valente <paolo.valente@unimore.it>
+Date: Mon, 8 Dec 2014 16:04:25 +0100
+Subject: [PATCH 1/3] block: cgroups, kconfig, build bits for BFQ-v7r7-3.19
+
+Update Kconfig.iosched and do the related Makefile changes to include
+kernel configuration options for BFQ. Also add the bfqio controller
+to the cgroups subsystem.
+
+Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
+Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
+---
+ block/Kconfig.iosched         | 32 ++++++++++++++++++++++++++++++++
+ block/Makefile                |  1 +
+ include/linux/cgroup_subsys.h |  4 ++++
+ 3 files changed, 37 insertions(+)
+
+diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
+index 421bef9..0ee5f0f 100644
+--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
+@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED
+ 	---help---
+ 	  Enable group IO scheduling in CFQ.
+ 
+config IOSCHED_BFQ
+	tristate "BFQ I/O scheduler"
+	default n
+	---help---
+	  The BFQ I/O scheduler tries to distribute bandwidth among
+	  all processes according to their weights.
+	  It aims at distributing the bandwidth as desired, independently of
+	  the disk parameters and with any workload. It also tries to
+	  guarantee low latency to interactive and soft real-time
+	  applications. If compiled built-in (saying Y here), BFQ can
+	  be configured to support hierarchical scheduling.
+
+config CGROUP_BFQIO
+	bool "BFQ hierarchical scheduling support"
+	depends on CGROUPS && IOSCHED_BFQ=y
+	default n
+	---help---
+	  Enable hierarchical scheduling in BFQ, using the cgroups
+	  filesystem interface.  The name of the subsystem will be
+	  bfqio.
+
+ choice
+ 	prompt "Default I/O scheduler"
+ 	default DEFAULT_CFQ
+@@ -52,6 +73,16 @@ choice
+ 	config DEFAULT_CFQ
+ 		bool "CFQ" if IOSCHED_CFQ=y
+ 
+	config DEFAULT_BFQ
+		bool "BFQ" if IOSCHED_BFQ=y
+		help
+		  Selects BFQ as the default I/O scheduler which will be
+		  used by default for all block devices.
+		  The BFQ I/O scheduler aims at distributing the bandwidth
+		  as desired, independently of the disk parameters and with
+		  any workload. It also tries to guarantee low latency to
+		  interactive and soft real-time applications.
+
+ 	config DEFAULT_NOOP
+ 		bool "No-op"
+ 
+@@ -61,6 +92,7 @@ config DEFAULT_IOSCHED
+ 	string
+ 	default "deadline" if DEFAULT_DEADLINE
+ 	default "cfq" if DEFAULT_CFQ
+	default "bfq" if DEFAULT_BFQ
+ 	default "noop" if DEFAULT_NOOP
+ 
+ endmenu
+diff --git a/block/Makefile b/block/Makefile
+index 00ecc97..1ed86d5 100644
+--- a/block/Makefile
+++ b/block/Makefile
+@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING)	+= blk-throttle.o
+ obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
+ obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
+ obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o
+obj-$(CONFIG_IOSCHED_BFQ)	+= bfq-iosched.o
+ 
+ obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
+ obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
+diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
+index 98c4f9b..13b010d 100644
+--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
+@@ -35,6 +35,10 @@ SUBSYS(net_cls)
+ SUBSYS(blkio)
+ #endif
+ 
+#if IS_ENABLED(CONFIG_CGROUP_BFQIO)
+SUBSYS(bfqio)
+#endif
+
+ #if IS_ENABLED(CONFIG_CGROUP_PERF)
+ SUBSYS(perf_event)
+ #endif
+-- 
+2.3.0
+
@@ -0,0 +1,387 @@
+WARNING - this version of the patch works with version 4.9+ of gcc and with
+kernel version 3.15.x+ and should NOT be applied when compiling on older
+versions due to name changes of the flags with the 4.9 release of gcc.
+Use the older version of this patch hosted on the same github for older
+versions of gcc. For example:
+
+corei7 --> nehalem
+corei7-avx --> sandybridge
+core-avx-i --> ivybridge
+core-avx2 --> haswell
+
+For more, see: https://gcc.gnu.org/gcc-4.9/changes.html
+
+It also changes 'atom' to 'bonnell' in accordance with the gcc v4.9 changes.
+Note that upstream is using the deprecated 'match=atom' flags when I believe it
+should use the newer 'march=bonnell' flag for atom processors.
+
+I have made that change to this patch set as well.  See the following kernel
+bug report to see if I'm right: https://bugzilla.kernel.org/show_bug.cgi?id=77461
+
+This patch will expand the number of microarchitectures to include new
+processors including: AMD K10-family, AMD Family 10h (Barcelona), AMD Family
+14h (Bobcat), AMD Family 15h (Bulldozer), AMD Family 15h (Piledriver), AMD
+Family 16h (Jaguar), Intel 1st Gen Core i3/i5/i7 (Nehalem), Intel 1.5 Gen Core
+i3/i5/i7 (Westmere), Intel 2nd Gen Core i3/i5/i7 (Sandybridge), Intel 3rd Gen
+Core i3/i5/i7 (Ivybridge), Intel 4th Gen Core i3/i5/i7 (Haswell), and Intel 5th
+Gen Core i3/i5/i7 (Broadwell). It also offers the compiler the 'native' flag.
+
+Small but real speed increases are measurable using a make endpoint comparing
+a generic kernel to one built with one of the respective microarchs.
+
+See the following experimental evidence supporting this statement:
+https://github.com/graysky2/kernel_gcc_patch
+
+REQUIREMENTS
+linux version >=3.15
+gcc version >=4.9
+
+--- a/arch/x86/include/asm/module.h	2014-08-03 18:25:02.000000000 -0400
+++ b/arch/x86/include/asm/module.h	2014-09-13 09:37:16.721385247 -0400
+@@ -15,6 +15,20 @@
+ #define MODULE_PROC_FAMILY "586MMX "
+ #elif defined CONFIG_MCORE2
+ #define MODULE_PROC_FAMILY "CORE2 "
+#elif defined CONFIG_MNATIVE
+#define MODULE_PROC_FAMILY "NATIVE "
+#elif defined CONFIG_MNEHALEM
+#define MODULE_PROC_FAMILY "NEHALEM "
+#elif defined CONFIG_MWESTMERE
+#define MODULE_PROC_FAMILY "WESTMERE "
+#elif defined CONFIG_MSANDYBRIDGE
+#define MODULE_PROC_FAMILY "SANDYBRIDGE "
+#elif defined CONFIG_MIVYBRIDGE
+#define MODULE_PROC_FAMILY "IVYBRIDGE "
+#elif defined CONFIG_MHASWELL
+#define MODULE_PROC_FAMILY "HASWELL "
+#elif defined CONFIG_MBROADWELL
+#define MODULE_PROC_FAMILY "BROADWELL "
+ #elif defined CONFIG_MATOM
+ #define MODULE_PROC_FAMILY "ATOM "
+ #elif defined CONFIG_M686
+@@ -33,6 +47,20 @@
+ #define MODULE_PROC_FAMILY "K7 "
+ #elif defined CONFIG_MK8
+ #define MODULE_PROC_FAMILY "K8 "
+#elif defined CONFIG_MK8SSE3
+#define MODULE_PROC_FAMILY "K8SSE3 "
+#elif defined CONFIG_MK10
+#define MODULE_PROC_FAMILY "K10 "
+#elif defined CONFIG_MBARCELONA
+#define MODULE_PROC_FAMILY "BARCELONA "
+#elif defined CONFIG_MBOBCAT
+#define MODULE_PROC_FAMILY "BOBCAT "
+#elif defined CONFIG_MBULLDOZER
+#define MODULE_PROC_FAMILY "BULLDOZER "
+#elif defined CONFIG_MPILEDRIVER
+#define MODULE_PROC_FAMILY "PILEDRIVER "
+#elif defined CONFIG_MJAGUAR
+#define MODULE_PROC_FAMILY "JAGUAR "
+ #elif defined CONFIG_MELAN
+ #define MODULE_PROC_FAMILY "ELAN "
+ #elif defined CONFIG_MCRUSOE
+--- a/arch/x86/Kconfig.cpu	2014-08-03 18:25:02.000000000 -0400
+++ b/arch/x86/Kconfig.cpu	2014-09-13 09:37:16.721385247 -0400
+@@ -137,9 +137,8 @@ config MPENTIUM4
+ 		-Paxville
+ 		-Dempsey
+ 
+-
+ config MK6
+-	bool "K6/K6-II/K6-III"
+	bool "AMD K6/K6-II/K6-III"
+ 	depends on X86_32
+ 	---help---
+ 	  Select this for an AMD K6-family processor.  Enables use of
+@@ -147,7 +146,7 @@ config MK6
+ 	  flags to GCC.
+ 
+ config MK7
+-	bool "Athlon/Duron/K7"
+	bool "AMD Athlon/Duron/K7"
+ 	depends on X86_32
+ 	---help---
+ 	  Select this for an AMD Athlon K7-family processor.  Enables use of
+@@ -155,12 +154,62 @@ config MK7
+ 	  flags to GCC.
+ 
+ config MK8
+-	bool "Opteron/Athlon64/Hammer/K8"
+	bool "AMD Opteron/Athlon64/Hammer/K8"
+ 	---help---
+ 	  Select this for an AMD Opteron or Athlon64 Hammer-family processor.
+ 	  Enables use of some extended instructions, and passes appropriate
+ 	  optimization flags to GCC.
+ 
+config MK8SSE3
+	bool "AMD Opteron/Athlon64/Hammer/K8 with SSE3"
+	---help---
+	  Select this for improved AMD Opteron or Athlon64 Hammer-family processors.
+	  Enables use of some extended instructions, and passes appropriate
+	  optimization flags to GCC.
+
+config MK10
+	bool "AMD 61xx/7x50/PhenomX3/X4/II/K10"
+	---help---
+	  Select this for an AMD 61xx Eight-Core Magny-Cours, Athlon X2 7x50,
+		Phenom X3/X4/II, Athlon II X2/X3/X4, or Turion II-family processor.
+	  Enables use of some extended instructions, and passes appropriate
+	  optimization flags to GCC.
+
+config MBARCELONA
+	bool "AMD Barcelona"
+	---help---
+	  Select this for AMD Barcelona and newer processors.
+
+	  Enables -march=barcelona
+
+config MBOBCAT
+	bool "AMD Bobcat"
+	---help---
+	  Select this for AMD Bobcat processors.
+
+	  Enables -march=btver1
+
+config MBULLDOZER
+	bool "AMD Bulldozer"
+	---help---
+	  Select this for AMD Bulldozer processors.
+
+	  Enables -march=bdver1
+
+config MPILEDRIVER
+	bool "AMD Piledriver"
+	---help---
+	  Select this for AMD Piledriver processors.
+
+	  Enables -march=bdver2
+
+config MJAGUAR
+	bool "AMD Jaguar"
+	---help---
+	  Select this for AMD Jaguar processors.
+
+	  Enables -march=btver2
+
+ config MCRUSOE
+ 	bool "Crusoe"
+ 	depends on X86_32
+@@ -251,8 +300,17 @@ config MPSC
+ 	  using the cpu family field
+ 	  in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
+ 
+config MATOM
+	bool "Intel Atom"
+	---help---
+
+	  Select this for the Intel Atom platform. Intel Atom CPUs have an
+	  in-order pipelining architecture and thus can benefit from
+	  accordingly optimized code. Use a recent GCC with specific Atom
+	  support in order to fully benefit from selecting this option.
+
+ config MCORE2
+-	bool "Core 2/newer Xeon"
+	bool "Intel Core 2"
+ 	---help---
+ 
+ 	  Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
+@@ -260,14 +318,55 @@ config MCORE2
+ 	  family in /proc/cpuinfo. Newer ones have 6 and older ones 15
+ 	  (not a typo)
+ 
+-config MATOM
+-	bool "Intel Atom"
+	  Enables -march=core2
+
+config MNEHALEM
+	bool "Intel Nehalem"
+ 	---help---
+ 
+-	  Select this for the Intel Atom platform. Intel Atom CPUs have an
+-	  in-order pipelining architecture and thus can benefit from
+-	  accordingly optimized code. Use a recent GCC with specific Atom
+-	  support in order to fully benefit from selecting this option.
+	  Select this for 1st Gen Core processors in the Nehalem family.
+
+	  Enables -march=nehalem
+
+config MWESTMERE
+	bool "Intel Westmere"
+	---help---
+
+	  Select this for the Intel Westmere formerly Nehalem-C family.
+
+	  Enables -march=westmere
+
+config MSANDYBRIDGE
+	bool "Intel Sandy Bridge"
+	---help---
+
+	  Select this for 2nd Gen Core processors in the Sandy Bridge family.
+
+	  Enables -march=sandybridge
+
+config MIVYBRIDGE
+	bool "Intel Ivy Bridge"
+	---help---
+
+	  Select this for 3rd Gen Core processors in the Ivy Bridge family.
+
+	  Enables -march=ivybridge
+
+config MHASWELL
+	bool "Intel Haswell"
+	---help---
+
+	  Select this for 4th Gen Core processors in the Haswell family.
+
+	  Enables -march=haswell
+
+config MBROADWELL
+	bool "Intel Broadwell"
+	---help---
+
+	  Select this for 5th Gen Core processors in the Broadwell family.
+
+	  Enables -march=broadwell
+ 
+ config GENERIC_CPU
+ 	bool "Generic-x86-64"
+@@ -276,6 +375,19 @@ config GENERIC_CPU
+ 	  Generic x86-64 CPU.
+ 	  Run equally well on all x86-64 CPUs.
+ 
+config MNATIVE
+ bool "Native optimizations autodetected by GCC"
+ ---help---
+
+   GCC 4.2 and above support -march=native, which automatically detects
+   the optimum settings to use based on your processor. -march=native 
+   also detects and applies additional settings beyond -march specific
+   to your CPU, (eg. -msse4). Unless you have a specific reason not to
+   (e.g. distcc cross-compiling), you should probably be using
+   -march=native rather than anything listed below.
+
+   Enables -march=native
+
+ endchoice
+ 
+ config X86_GENERIC
+@@ -300,7 +412,7 @@ config X86_INTERNODE_CACHE_SHIFT
+ config X86_L1_CACHE_SHIFT
+ 	int
+ 	default "7" if MPENTIUM4 || MPSC
+-	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
+	default "6" if MK7 || MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MPENTIUMM || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || BROADWELL || MNATIVE || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
+ 	default "4" if MELAN || M486 || MGEODEGX1
+ 	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
+ 
+@@ -331,11 +443,11 @@ config X86_ALIGNMENT_16
+ 
+ config X86_INTEL_USERCOPY
+ 	def_bool y
+-	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2
+	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK8SSE3 || MK7 || MEFFICEON || MCORE2 || MK10 || MBARCELONA || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE
+ 
+ config X86_USE_PPRO_CHECKSUM
+ 	def_bool y
+-	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM
+	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MK10 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MATOM || MNATIVE
+ 
+ config X86_USE_3DNOW
+ 	def_bool y
+@@ -359,17 +471,17 @@ config X86_P6_NOP
+ 
+ config X86_TSC
+ 	def_bool y
+-	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64
+	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE || MATOM) || X86_64
+ 
+ config X86_CMPXCHG64
+ 	def_bool y
+-	depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM
+	depends on X86_PAE || X86_64 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM || MNATIVE
+ 
+ # this should be set for all -march=.. options where the compiler
+ # generates cmov.
+ config X86_CMOV
+ 	def_bool y
+-	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
+	depends on (MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MK7 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MNATIVE || MATOM || MGEODE_LX)
+ 
+ config X86_MINIMUM_CPU_FAMILY
+ 	int
+--- a/arch/x86/Makefile	2014-08-03 18:25:02.000000000 -0400
+++ b/arch/x86/Makefile	2014-09-13 09:37:16.721385247 -0400
+@@ -92,13 +92,33 @@ else
+ 	KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3)
+ 
+         # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
+        cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
+         cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
+        cflags-$(CONFIG_MK8SSE3) += $(call cc-option,-march=k8-sse3,-mtune=k8)
+        cflags-$(CONFIG_MK10) += $(call cc-option,-march=amdfam10)
+        cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona)
+        cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1)
+        cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1)
+        cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2)
+        cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2)
+         cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
+ 
+         cflags-$(CONFIG_MCORE2) += \
+-                $(call cc-option,-march=core2,$(call cc-option,-mtune=generic))
+-	cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom) \
+-		$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
+                $(call cc-option,-march=core2,$(call cc-option,-mtune=core2))
+        cflags-$(CONFIG_MNEHALEM) += \
+                $(call cc-option,-march=nehalem,$(call cc-option,-mtune=nehalem))
+        cflags-$(CONFIG_MWESTMERE) += \
+                $(call cc-option,-march=westmere,$(call cc-option,-mtune=westmere))
+        cflags-$(CONFIG_MSANDYBRIDGE) += \
+                $(call cc-option,-march=sandybridge,$(call cc-option,-mtune=sandybridge))
+        cflags-$(CONFIG_MIVYBRIDGE) += \
+                $(call cc-option,-march=ivybridge,$(call cc-option,-mtune=ivybridge))
+        cflags-$(CONFIG_MHASWELL) += \
+                $(call cc-option,-march=haswell,$(call cc-option,-mtune=haswell))
+        cflags-$(CONFIG_MBROADWELL) += \
+                $(call cc-option,-march=broadwell,$(call cc-option,-mtune=broadwell))
+        cflags-$(CONFIG_MATOM) += $(call cc-option,-march=bonnell) \
+                $(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
+         cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
+         KBUILD_CFLAGS += $(cflags-y)
+ 
+--- a/arch/x86/Makefile_32.cpu	2014-08-03 18:25:02.000000000 -0400
+++ b/arch/x86/Makefile_32.cpu	2014-09-13 09:37:16.721385247 -0400
+@@ -23,7 +23,15 @@ cflags-$(CONFIG_MK6)		+= -march=k6
+ # Please note, that patches that add -march=athlon-xp and friends are pointless.
+ # They make zero difference whatsosever to performance at this time.
+ cflags-$(CONFIG_MK7)		+= -march=athlon
+cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
+ cflags-$(CONFIG_MK8)		+= $(call cc-option,-march=k8,-march=athlon)
+cflags-$(CONFIG_MK8SSE3)		+= $(call cc-option,-march=k8-sse3,-march=athlon)
+cflags-$(CONFIG_MK10)	+= $(call cc-option,-march=amdfam10,-march=athlon)
+cflags-$(CONFIG_MBARCELONA)	+= $(call cc-option,-march=barcelona,-march=athlon)
+cflags-$(CONFIG_MBOBCAT)	+= $(call cc-option,-march=btver1,-march=athlon)
+cflags-$(CONFIG_MBULLDOZER)	+= $(call cc-option,-march=bdver1,-march=athlon)
+cflags-$(CONFIG_MPILEDRIVER)	+= $(call cc-option,-march=bdver2,-march=athlon)
+cflags-$(CONFIG_MJAGUAR)	+= $(call cc-option,-march=btver2,-march=athlon)
+ cflags-$(CONFIG_MCRUSOE)	+= -march=i686 $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
+ cflags-$(CONFIG_MEFFICEON)	+= -march=i686 $(call tune,pentium3) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
+ cflags-$(CONFIG_MWINCHIPC6)	+= $(call cc-option,-march=winchip-c6,-march=i586)
+@@ -32,8 +40,14 @@ cflags-$(CONFIG_MCYRIXIII)	+= $(call cc-
+ cflags-$(CONFIG_MVIAC3_2)	+= $(call cc-option,-march=c3-2,-march=i686)
+ cflags-$(CONFIG_MVIAC7)		+= -march=i686
+ cflags-$(CONFIG_MCORE2)		+= -march=i686 $(call tune,core2)
+-cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=atom,$(call cc-option,-march=core2,-march=i686)) \
+-	$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
+cflags-$(CONFIG_MNEHALEM)	+= -march=i686 $(call tune,nehalem)
+cflags-$(CONFIG_MWESTMERE)	+= -march=i686 $(call tune,westmere)
+cflags-$(CONFIG_MSANDYBRIDGE)	+= -march=i686 $(call tune,sandybridge)
+cflags-$(CONFIG_MIVYBRIDGE)	+= -march=i686 $(call tune,ivybridge)
+cflags-$(CONFIG_MHASWELL)	+= -march=i686 $(call tune,haswell)
+cflags-$(CONFIG_MBROADWELL)	+= -march=i686 $(call tune,broadwell)
+cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=bonnell,$(call cc-option,-march=core2,-march=i686)) \
+	$(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
+ 
+ # AMD Elan support
+ cflags-$(CONFIG_MELAN)		+= -march=i486
@@ -0,0 +1,181 @@
+
+ 3rdparty/mkbuild.pl        |   92 +++++++++++++++++++++++++++++++++++++++++++++
+ Documentation/3rdparty.txt |   76 +++++++++++++++++++++++++++++++++++++
+ 2 files changed, 168 insertions(+)
+
+diff -Nurp linux-2.6.37/3rdparty/mkbuild.pl linux-2.6.37.3rdparty/3rdparty/mkbuild.pl
+--- linux-2.6.37/3rdparty/mkbuild.pl	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/mkbuild.pl	2004-04-23 14:59:03.000000000 +0300
+@@ -0,0 +1,92 @@
+#!/usr/bin/perl -w
+#
+# Version 1.0
+#
+# Copyright 2001 Jeff Garzik <jgarzik@mandrakesoft.com>
+# Copyright 2002 Juan Quintela <quintela@mandrakesoft.com>
+# Copyright 2003 Nicolas Planel <nplanel@mandrakesoft.com>
+#
+# This software may be used and distributed according to the terms
+# of the GNU General Public License, incorporated herein by reference.
+#
+#
+# Run "mkbuild.pl"
+#
+# This program generates the following files
+#	Makefile
+#	Makefile.drivers
+#	Config.in
+# using the information in the subdirs of this directory.
+#
+# subdirs need to have:
+# 	a Config.in file
+#	a Makefile with a O_TARGET/L_TARGET targets
+#	The config.in should set a CONFIG_<module_dir_name> to m/y.
+
+use strict;
+
+opendir(THISDIR, ".");
+# get dirs without . and .. garbage
+my (@modules) = grep(!/\.\.?$/,grep(-d, readdir(THISDIR)));
+closedir(THISDIR);
+
+generate_kconfig(@modules);
+generate_makefile(@modules);
+exit(0);
+
+##########################################################################
+
+sub generate_makefile {
+    my (@modules) = @_;
+
+    local *F;
+    open F, "> Makefile" or die "Cannot create new Makefile: $!\n";
+    print F <<'EOM';
+#
+# THIS IS AN AUTOMATICALLY GENERATED FILE.  DO NOT EDIT.
+#
+
+EOM
+    printf F "obj- := 3rdparty.o  # Dummy rule to force built-in.o to be made\n";
+    printf F "obj-\$(%s) += %s\n", to_CONFIG($_), $_ . '/' foreach @modules;
+}
+
+sub generate_kconfig {
+    my (@modules) = @_;
+
+    local *F;
+    open F, "> Kconfig" or die "Cannot create Kconfig: $!\n";
+    print F <<"EOM";
+#
+# THIS IS AN AUTOMATICALLY GENERATED FILE.  DO NOT EDIT.
+#
+
+menu "Unofficial 3rd party kernel additions"
+
+EOM
+	
+    foreach (@modules) {
+	die "No Kconfig in $_.\n" if ! -r "$_/Kconfig";
+	print F "source 3rdparty/$_/Kconfig\n";
+    }
+    print F "\n\nendmenu\n";
+}
+
+sub to_CONFIG {
+    local $_ = $_[0];
+    tr/a-z/A-Z/;
+    s/[\-\. ]/_/g;
+    "CONFIG_$_";
+}
+
+sub find_target {
+	my ($module_dir) = @_;
+
+	local *F;
+	open(F, "$module_dir/Makefile") or die "$module_dir/Makefile: $!\n";
+	while (<F>) {
+		chomp;
+		return $1 if (/[LO]_TARGET.*:=\s+(\S+)/);
+	}
+}
+
+diff -Nurp linux-2.6.37/Documentation/3rdparty.txt linux-2.6.37.3rdparty/Documentation/3rdparty.txt
+--- linux-2.6.37/Documentation/3rdparty.txt	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/Documentation/3rdparty.txt	2003-11-22 01:07:26.000000000 +0200
+@@ -0,0 +1,76 @@
+
+Third-Party Kernel Source Module Support, or
+an easy way to add modules to your kernel build.
+
+
+
+Vendors quite often add additional drivers and features to the kernel
+which require nothing more than modifying Kconfig, Makefile, and
+adding one or more files to a sub-directory.  As a single discrete task,
+this is not a problem.  However, using patches to add modules to the
+kernel very often results in patch conflicts, resulting in needless time
+wastage as developers regenerate an otherwise working kernel patch.
+
+This is designed as a solution to these problems.  It is NOT designed as
+a replacement for the kernel build system, but merely as a tool for
+vendors and system administrators to ease the pain of patch management.
+
+The key feature of this system is the distinct lack of patches.  Drivers
+are installed via unpacking a tarball.
+
+
+
+Adding a directory to the build (usually from a tarball)
+--------------------------------------------------------
+If a directory exists inside the 3rdparty sub-directory that contains a
+proper Makefile, it can be added to the build.  It also needs a
+Kconfig file.
+
+	cd /usr/src/linux-2.4.3/3rdparty
+	bzcat /tmp/my-driver2.tar.bz2 | tar xf - # creates "my2" dir
+
+
+Limitations
+-----------
+There are some limitations to this system.  This system is only
+designed to support a very common case.  If you find yourself running
+into limitations (kernel build experts can spot them right off),
+then you should probably be patching the kernel instead of using
+mkbuild.pl for that particular module.
+
+FIXME: actually list the limitations
+
+
+
+Other notes
+-----------
+Link order is controlled by the order of mkbuild.pl executions.
+
+"make mrproper" will erase Makefile.meta, and empty Kconfig, Makefile,
+and Makefile.drivers.
+
+IMPORTANT NOTE: Because this feature modifies the kernel's makefiles and
+configuration system, you MUST complete all mkbuild.pl runs before
+running any "make" command.
+
+Building in the 3rdparty dir
+----------------------------
+
+If you use modules that:
+	- are contained in one subdir with the name of the module
+	- has a Makefile
+	- has a Kconfig file
+
+The system calls the ./mkbuild.pl script.  It will search for
+subdirectories, and will try to build each of them as a module.
+Things to note:
+
+       The dependencies will be done in a module called:
+
+       3rdparty/<module_dir_name>/<module_name>
+
+depending of CONFIG_<module_name_in_uppercase>.
+
+<module_name> is the value of O_TARGET/L_TARGET.
+
+
@@ -0,0 +1,175 @@
+
+Include 3rdparty directory into the main build-system.
+
+Original author is unknown.
+(Was either Juan Quintela or Jeff Garzik)
+
+Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
+Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+ Makefile                 |    2 +-
+ arch/alpha/Kconfig       |    1 +
+ arch/ia64/Kconfig        |    2 ++
+ arch/mips/Kconfig        |    2 ++
+ arch/powerpc/Kconfig     |    2 ++
+ arch/sparc/Kconfig       |    2 ++
+ arch/x86/Kconfig         |    2 ++
+ scripts/kconfig/Makefile |   31 +++++++++++++++++--------------
+ 8 files changed, 29 insertions(+), 15 deletions(-)
+
+diff -Nurp linux-3.18-rc6/arch/alpha/Kconfig linux-3.18-rc6-3rdparty/arch/alpha/Kconfig
+--- linux-3.18-rc6/arch/alpha/Kconfig	2014-10-05 22:23:04.000000000 +0300
+++ linux-3.18-rc6-3rdparty/arch/alpha/Kconfig	2014-11-29 21:42:38.015594440 +0200
+@@ -746,3 +746,4 @@ source "crypto/Kconfig"
+ 
+ source "lib/Kconfig"
+ 
+source "3rdparty/Kconfig"
+diff -Nurp linux-3.18-rc6/arch/ia64/Kconfig linux-3.18-rc6-3rdparty/arch/ia64/Kconfig
+--- linux-3.18-rc6/arch/ia64/Kconfig	2014-10-05 22:23:04.000000000 +0300
+++ linux-3.18-rc6-3rdparty/arch/ia64/Kconfig	2014-11-29 21:42:38.015594440 +0200
+@@ -646,3 +646,5 @@ source "lib/Kconfig"
+ 
+ config IOMMU_HELPER
+ 	def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
+
+source "3rdparty/Kconfig"
+diff -Nurp linux-3.18-rc6/arch/mips/Kconfig linux-3.18-rc6-3rdparty/arch/mips/Kconfig
+--- linux-3.18-rc6/arch/mips/Kconfig	2014-11-29 21:37:34.434802374 +0200
+++ linux-3.18-rc6-3rdparty/arch/mips/Kconfig	2014-11-29 21:42:38.015594440 +0200
+@@ -2709,3 +2709,5 @@ source "crypto/Kconfig"
+ source "lib/Kconfig"
+ 
+ source "arch/mips/kvm/Kconfig"
+
+source "3rdparty/Kconfig"
+diff -Nurp linux-3.18-rc6/arch/powerpc/Kconfig linux-3.18-rc6-3rdparty/arch/powerpc/Kconfig
+--- linux-3.18-rc6/arch/powerpc/Kconfig	2014-11-29 21:37:34.446802445 +0200
+++ linux-3.18-rc6-3rdparty/arch/powerpc/Kconfig	2014-11-29 21:42:38.016594446 +0200
+@@ -1081,3 +1081,5 @@ config PPC_LIB_RHEAP
+ 	bool
+ 
+ source "arch/powerpc/kvm/Kconfig"
+
+source "3rdparty/Kconfig"
+diff -Nurp linux-3.18-rc6/arch/sparc/Kconfig linux-3.18-rc6-3rdparty/arch/sparc/Kconfig
+--- linux-3.18-rc6/arch/sparc/Kconfig	2014-11-29 21:37:34.478802634 +0200
+++ linux-3.18-rc6-3rdparty/arch/sparc/Kconfig	2014-11-29 21:42:38.016594446 +0200
+@@ -562,3 +562,5 @@ source "security/Kconfig"
+ source "crypto/Kconfig"
+ 
+ source "lib/Kconfig"
+
+source "3rdparty/Kconfig"
+diff -Nurp linux-3.18-rc6/arch/x86/Kconfig linux-3.18-rc6-3rdparty/arch/x86/Kconfig
+--- linux-3.18-rc6/arch/x86/Kconfig	2014-11-29 21:37:34.488802693 +0200
+++ linux-3.18-rc6-3rdparty/arch/x86/Kconfig	2014-11-29 21:42:38.016594446 +0200
+@@ -2509,3 +2509,5 @@ source "crypto/Kconfig"
+ source "arch/x86/kvm/Kconfig"
+ 
+ source "lib/Kconfig"
+
+source "3rdparty/Kconfig"
+diff -Nurp linux-3.18-rc6/Makefile linux-3.18-rc6-3rdparty/Makefile
+--- linux-3.18-rc6/Makefile	2014-11-29 21:37:34.352801890 +0200
+++ linux-3.18-rc6-3rdparty/Makefile	2014-11-29 21:42:38.016594446 +0200
+@@ -556,7 +556,7 @@ scripts: scripts_basic include/config/au
+ 
+ # Objects we will link into vmlinux / subdirs we need to visit
+ init-y		:= init/
+-drivers-y	:= drivers/ sound/ firmware/
+drivers-y	:= drivers/ sound/ firmware/ 3rdparty/
+ net-y		:= net/
+ libs-y		:= lib/
+ core-y		:= usr/
+diff -Nurp linux-3.18-rc6/scripts/kconfig/Makefile linux-3.18-rc6-3rdparty/scripts/kconfig/Makefile
+--- linux-3.18-rc6/scripts/kconfig/Makefile	2014-11-29 21:37:35.487808590 +0200
+++ linux-3.18-rc6-3rdparty/scripts/kconfig/Makefile	2014-11-29 21:46:48.227071462 +0200
+@@ -14,29 +14,29 @@ endif
+ # We need this, in case the user has it in its environment
+ unexport CONFIG_
+ 
+-xconfig: $(obj)/qconf
+xconfig: $(obj)/qconf 3rdparty/Makefile
+ 	$< $(Kconfig)
+ 
+-gconfig: $(obj)/gconf
+gconfig: $(obj)/gconf 3rdparty/Makefile
+ 	$< $(Kconfig)
+ 
+-menuconfig: $(obj)/mconf
+menuconfig: $(obj)/mconf 3rdparty/Makefile
+ 	$< $(Kconfig)
+ 
+-config: $(obj)/conf
+config: $(obj)/conf 3rdparty/Makefile
+ 	$< --oldaskconfig $(Kconfig)
+ 
+-nconfig: $(obj)/nconf
+nconfig: $(obj)/nconf 3rdparty/Makefile
+ 	$< $(Kconfig)
+ 
+-oldconfig: $(obj)/conf
+oldconfig: $(obj)/conf 3rdparty/Makefile
+ 	$< --$@ $(Kconfig)
+ 
+-silentoldconfig: $(obj)/conf
+silentoldconfig: $(obj)/conf 3rdparty/Makefile
+ 	$(Q)mkdir -p include/config include/generated
+ 	$< --$@ $(Kconfig)
+ 
+-localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
+localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile
+ 	$(Q)mkdir -p include/config include/generated
+ 	$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
+ 	$(Q)if [ -f .config ]; then 					\
+@@ -76,24 +76,24 @@ update-po-config: $(obj)/kxgettext $(obj
+ 
+ PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
+ 
+-allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
+allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile
+ 	$< --$@ $(Kconfig)
+ 
+ PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
+ 
+-listnewconfig olddefconfig: $(obj)/conf
+listnewconfig olddefconfig: $(obj)/conf 3rdparty/Makefile
+ 	$< --$@ $(Kconfig)
+ 
+ # oldnoconfig is an alias of olddefconfig, because people already are dependent
+ # on its behavior(sets new symbols to their default value but not 'n') with the
+ # counter-intuitive name.
+-oldnoconfig: $(obj)/conf
+oldnoconfig: $(obj)/conf 3rdparty/Makefile
+ 	$< --olddefconfig $(Kconfig)
+ 
+-savedefconfig: $(obj)/conf
+savedefconfig: $(obj)/conf 3rdparty/Makefile
+ 	$< --$@=defconfig $(Kconfig)
+ 
+-defconfig: $(obj)/conf
+defconfig: $(obj)/conf 3rdparty/Makefile
+ ifeq ($(KBUILD_DEFCONFIG),)
+ 	$< --defconfig $(Kconfig)
+ else
+@@ -101,7 +101,7 @@ else
+ 	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+ endif
+ 
+-%_defconfig: $(obj)/conf
+%_defconfig: $(obj)/conf 3rdparty/Makefile
+ 	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
+ 
+ configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(SRCARCH)/configs/$(1).config)
+@@ -178,6 +178,9 @@ gconf-objs	:= gconf.o zconf.tab.o
+ 
+ hostprogs-y := conf nconf mconf kxgettext qconf gconf
+ 
+3rdparty/Makefile:
+	pushd $(srctree)/3rdparty ; $(PERL) ./mkbuild.pl ; popd
+
+ clean-files	:= qconf.moc .tmp_qtcheck .tmp_gtkcheck
+ clean-files	+= zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
+ clean-files     += config.pot linux.pot
@@ -0,0 +1,20 @@
+--- linux-2.6.35/3rdparty/acerhk/acerhk.c.orig	2010-10-03 12:50:33.000000000 +0000
+++ linux-2.6.35/3rdparty/acerhk/acerhk.c	2010-10-03 13:13:22.093868410 +0000
+@@ -2730,7 +2730,7 @@ static void acerhk_proc_cleanup(void)
+ 
+ /* {{{ file operations */
+ 
+-static int acerhk_ioctl( struct inode *inode, struct file *file,
+static long acerhk_ioctl( struct inode *inode, struct file *file,
+                          unsigned int cmd, unsigned long arg )
+ {
+   int retval;
+@@ -2827,7 +2827,7 @@ static int acerhk_release( struct inode
+ 
+ static struct file_operations acerhk_fops = {
+   owner:        THIS_MODULE,
+-  ioctl:        acerhk_ioctl,
+  unlocked_ioctl: acerhk_ioctl,
+   open:         acerhk_open,
+ #ifdef ACERDEBUG
+   write:        acerhk_write,
@@ -0,0 +1,33 @@
+CFLAGS use isn't allowed anymore with 2.6.24, we must use EXTRA_CFLAGS
+in its place
+
+Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com>
+
+--- linux-2.6.23/3rdparty/acerhk/Makefile.orig	2007-11-08 21:32:43.000000000 -0200
+++ linux-2.6.23/3rdparty/acerhk/Makefile	2007-11-08 21:33:28.000000000 -0200
+@@ -14,7 +14,7 @@
+ CONFIG_ACERHK?=m
+ obj-$(CONFIG_ACERHK) += acerhk.o
+ 
+-CFLAGS+=-c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe
+EXTRA_CFLAGS+=-c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe
+ INCLUDE=-I$(KERNELSRC)/include
+ 
+ ifeq ($(KERNELMAJOR), 2.6)
+@@ -41,13 +41,13 @@ acerhk.ko: $(SOURCE) acerhk.h
+ 	$(MAKE) -C $(KERNELSRC) SUBDIRS=$(PWD) modules
+ 
+ acerhk.o: $(SOURCE) acerhk.h
+-	$(CC) $(INCLUDE) $(CFLAGS) -DMODVERSIONS -DMODULE -D__KERNEL__ -o $(TARGET) $(SOURCE)
+	$(CC) $(INCLUDE) $(EXTRA_CFLAGS) -DMODVERSIONS -DMODULE -D__KERNEL__ -o $(TARGET) $(SOURCE)
+ 
+ asm:	$(SOURCE)
+ ifeq ($(KERNELMAJOR), 2.6)
+-	$(CC) $(INCLUDE) $(INCLUDE)/asm-i386/mach-default $(CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE)
+	$(CC) $(INCLUDE) $(INCLUDE)/asm-i386/mach-default $(EXTRA_CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE)
+ else
+-	$(CC) $(INCLUDE) $(CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE)
+	$(CC) $(INCLUDE) $(EXTRA_CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE)
+ endif
+ 
+ clean:
@@ -0,0 +1,22 @@
+Fix acerhk build with FUNCTION_TRACER enabled.
+
+Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+---
+ 3rdparty/acerhk/Makefile |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff -p -up linux-2.6.31/3rdparty/acerhk/Makefile.orig linux-2.6.31/3rdparty/acerhk/Makefile
+--- linux-2.6.31/3rdparty/acerhk/Makefile.orig	2009-10-02 16:39:06.000000000 -0300
+++ linux-2.6.31/3rdparty/acerhk/Makefile	2009-10-02 16:45:13.000000000 -0300
+@@ -14,7 +14,10 @@
+ CONFIG_ACERHK?=m
+ obj-$(CONFIG_ACERHK) += acerhk.o
+ 
+-EXTRA_CFLAGS+=-c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe
+CFLAGS_acerhk.o += -c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe
+ifdef CONFIG_FUNCTION_TRACER
+CFLAGS_REMOVE_acerhk.o = -pg
+endif
+ INCLUDE=-I$(KERNELSRC)/include
+ 
+ ifeq ($(KERNELMAJOR), 2.6)
@@ -0,0 +1,23 @@
+
+AUTOCONF_INCLUDED is not defined anymore in 2.6.38, so old include got exposed.
+
+Fix by removing the offending bits.
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+ 3rdparty/acerhk/acerhk.c |    4 ----
+ 1 file changed, 4 deletions(-)
+
+--- linux-2.6.38/3rdparty/acerhk/acerhk.c.orig	2011-03-20 13:57:32.000000000 +0200
+++ linux-2.6.38/3rdparty/acerhk/acerhk.c	2011-03-20 15:00:45.768659568 +0200
+@@ -35,10 +35,6 @@
+  *
+  */
+ 
+-#ifndef AUTOCONF_INCLUDED
+-#include <linux/config.h>
+-#endif
+-
+ /* This driver is heavily dependent on the architecture, don't let
+  * anyone without an X86 machine use it. On laptops with AMD64
+  * architecture this driver is only useable in 32 bit mode.
@@ -0,0 +1,37 @@
+Fix Makefile and add Kconfig for the acerhk driver
+---
+ 3rdparty/acerhk/Kconfig  |    8 	8 +	0 -	0 !
+ 3rdparty/acerhk/Makefile |    6 	3 +	3 -	0 !
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+Index: linux-2.6.21/3rdparty/acerhk/Makefile
+===================================================================
+--- linux-2.6.21.orig/3rdparty/acerhk/Makefile	2007-05-15 15:34:48.000000000 +0200
+++ linux-2.6.21/3rdparty/acerhk/Makefile	2007-05-15 15:37:17.000000000 +0200
+@@ -1,10 +1,10 @@
+ # change KERNELSRC to the location of your kernel build tree only if
+ # autodetection does not work
+ #KERNELSRC=/usr/src/linux
+-KERNELSRC?=/lib/modules/`uname -r`/build
+#KERNELSRC?=/lib/modules/`uname -r`/build
+ # Starting with 2.6.18, the kernel version is in utsrelease.h instead of version.h, accomodate both cases
+-KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/linux/utsrelease.h))
+-KERNELMAJOR=$(shell echo $(KERNELVERSION)|head -c3)
+#KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/linux/utsrelease.h))
+#KERNELMAJOR=$(shell echo $(KERNELVERSION)|head -c3)
+ 
+ # next line is for kernel 2.6, if you integrate the driver in the kernel tree
+ # /usr/src/linux/drivers/acerhk - or something similar
+Index: linux-2.6.21/3rdparty/acerhk/Kconfig
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.21/3rdparty/acerhk/Kconfig	2007-05-15 15:39:30.000000000 +0200
+@@ -0,0 +1,8 @@
+config ACERHK
+       tristate "Acerhk driver"
+       depends on EXPERIMENTAL && X86
+       ---help---
+               This is an experimental acer keyboard driver for
+               acer laptops. If you have a notebook with a ipw2X00 
+               wireless card, it allows you to turn off the rf_kill
+
@@ -0,0 +1,67 @@
+Updated for owner removal from struct proc_dir_entry (2.6.30)
+
+Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+
+---
+ 3rdparty/acerhk/acerhk.c |    7 -------
+ 1 file changed, 7 deletions(-)
+
+diff -p -up linux-2.6.29/3rdparty/acerhk/acerhk.c.orig linux-2.6.29/3rdparty/acerhk/acerhk.c
+--- linux-2.6.29/3rdparty/acerhk/acerhk.c.orig	2009-05-22 02:42:44.000000000 -0300
+++ linux-2.6.29/3rdparty/acerhk/acerhk.c	2009-05-22 02:43:45.000000000 -0300
+@@ -2626,7 +2626,6 @@ static int acerhk_proc_init(void)
+     printk(KERN_INFO"acerhk: could not create /proc/driver/acerhk\n");
+   }
+   else {
+-    proc_acer_dir->owner = THIS_MODULE;
+     /* now create several files, first general info ... */
+     entry = create_proc_read_entry("info",
+                                    0444, proc_acer_dir, acerhk_proc_info, NULL);
+@@ -2635,7 +2634,6 @@ static int acerhk_proc_init(void)
+       remove_proc_entry("driver/acerhk", NULL);
+       retval = 0;
+     } else {
+-      entry->owner = THIS_MODULE;
+       /* ... last pressed key ... */
+       entry = create_proc_read_entry("key",
+                                      0444, proc_acer_dir, acerhk_proc_key, NULL);
+@@ -2645,7 +2643,6 @@ static int acerhk_proc_init(void)
+         remove_proc_entry("driver/acerhk", NULL);
+         retval = 0;
+       } else {
+-        entry->owner = THIS_MODULE;
+         /* ... and led control file */
+         entry = create_proc_entry("led", 0222, proc_acer_dir);
+         if (entry == NULL) {
+@@ -2657,7 +2654,6 @@ static int acerhk_proc_init(void)
+         }
+         else {
+           entry->write_proc = acerhk_proc_led;
+-          entry->owner = THIS_MODULE;
+           /* ... and wireless led controll file */
+           entry = create_proc_entry("wirelessled", 0222, proc_acer_dir);
+           if (entry == NULL) {
+@@ -2670,7 +2666,6 @@ static int acerhk_proc_init(void)
+           }
+           else {
+             entry->write_proc = acerhk_proc_wirelessled;
+-            entry->owner = THIS_MODULE;
+             /* ... and bluetooth led controll file */
+             entry = create_proc_entry("blueled", 0222, proc_acer_dir);
+             if (entry == NULL) {
+@@ -2683,7 +2678,6 @@ static int acerhk_proc_init(void)
+               retval = 0;
+             } else {
+               entry->write_proc = acerhk_proc_blueled;
+-              entry->owner = THIS_MODULE;
+               retval = 1;
+ #ifdef ACERDEBUG
+               /* add extra file for debugging purposes */
+@@ -2700,7 +2694,6 @@ static int acerhk_proc_init(void)
+               }
+               else {
+                 entry->write_proc = acerhk_proc_debug;
+-                entry->owner = THIS_MODULE;
+                 retval = 1;
+               }
+ #endif
@@ -0,0 +1,47 @@
+Fix Makefile and add Kconfig for the aes2501 driver.
+
+Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com>
+
+---
+ linux-2.6.23/3rdparty/aes2501/Kconfig  |   10 ++++++++++
+ linux-2.6.23/3rdparty/aes2501/Makefile |   19 +------------------
+ 2 files changed, 11 insertions(+), 18 deletions(-)
+
+diff -p -up linux-2.6.23/3rdparty/aes2501/Kconfig.orig linux-2.6.23/3rdparty/aes2501/Kconfig
+--- linux-2.6.23/3rdparty/aes2501/Kconfig.orig	2008-01-13 23:14:47.000000000 -0200
+++ linux-2.6.23/3rdparty/aes2501/Kconfig	2008-01-13 23:35:21.000000000 -0200
+@@ -0,0 +1,10 @@
+config AES2501
+	tristate "AuthenTec AES2501 Fingerprint Sensor Driver"
+	depends on USB
+	default m
+	---help---
+	  Say Y here if you have a AuthenTec AES2501 Fingerprint
+	  Sensor device.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called aes2501.
+diff -p -up linux-2.6.23/3rdparty/aes2501/Makefile.orig linux-2.6.23/3rdparty/aes2501/Makefile
+--- linux-2.6.23/3rdparty/aes2501/Makefile.orig	2008-01-13 23:14:36.000000000 -0200
+++ linux-2.6.23/3rdparty/aes2501/Makefile	2008-01-13 23:21:33.000000000 -0200
+@@ -1,19 +1,2 @@
+-
+-obj-m := aes2501.o
+-
+-KERNELDIR	?= /lib/modules/$(shell uname -r)/build
+-
+-PWD			:= $(shell pwd)
+-
+-all: usertest
+-	$(MAKE) -C $(KERNELDIR) M=$(PWD)
+-
+-usertest:
+-	gcc -I. -o usertest usertest.c
+-
+-clean:
+-	rm -f *.o *~ aes2501.ko aes2501.mod.c Module.symvers usertest
+-	rm -rf .tmp_versions
+-	rm -f .*.cmd
+-
+obj-$(CONFIG_AES2501) := aes2501.o
+ 
@@ -0,0 +1,21 @@
+Prevent oops on module removal when we don't have the device available.
+
+Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com>
+
+---
+ linux-2.6.23/3rdparty/aes2501/aes2501.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff -p -up linux-2.6.23/3rdparty/aes2501/aes2501.c.orig linux-2.6.23/3rdparty/aes2501/aes2501.c
+--- linux-2.6.23/3rdparty/aes2501/aes2501.c.orig	2008-01-13 23:37:38.000000000 -0200
+++ linux-2.6.23/3rdparty/aes2501/aes2501.c	2008-01-13 23:38:26.000000000 -0200
+@@ -1616,7 +1616,8 @@ static int __init aes2501_init(void)
+ 
+ static void __exit aes2501_exit(void)
+ {
+-	_dev->stop_scan = 1;
+	if (_dev)
+		_dev->stop_scan = 1;
+ 	destroy_workqueue(comm_queue);
+ 	usb_deregister(&aes2501_driver);
+ }
@@ -0,0 +1,7 @@
+--- linux-2.6.24.orig/3rdparty/ndiswrapper/Kconfig	1969-12-31 21:00:00.000000000 -0300
+++ linux-2.6.24/3rdparty/ndiswrapper/Kconfig	2007-11-26 15:11:31.000000000 -0200
+@@ -0,0 +1,4 @@
+
+config NDISWRAPPER
+       tristate "NDIS driver wrapper support"
+       depends on PCI && USB && !X86_64_XEN
@@ -0,0 +1,45 @@
+--- linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile.orig	2013-11-28 21:42:10.000000000 +0200
+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile	2013-11-30 21:41:19.550504380 +0200
+@@ -9,24 +9,10 @@ DISTFILES = \
+ 	winnt_types.h workqueue.c wrapmem.c wrapmem.h wrapndis.c wrapndis.h \
+ 	wrapper.c wrapper.h
+ 
+-# By default, we try to compile the modules for the currently running
+-# kernel.  But it's the first approximation, as we will re-read the
+-# version from the kernel sources.
+-KVERS_UNAME ?= $(shell uname -r)
+-
+ # KBUILD is the path to the Linux kernel build tree.  It is usually the
+ # same as the kernel source tree, except when the kernel was compiled in
+ # a separate directory.
+-KBUILD ?= $(shell readlink -f /lib/modules/$(KVERS_UNAME)/build)
+-
+-ifeq (,$(KBUILD))
+-$(error Kernel build tree not found - please set KBUILD to configured kernel)
+-endif
+-
+-KCONFIG := $(KBUILD)/.config
+-ifeq (,$(wildcard $(KCONFIG)))
+-$(error No .config found in $(KBUILD), please set KBUILD to configured kernel)
+-endif
+KBUILD ?= $(srctree)
+ 
+ ifneq (,$(wildcard $(KBUILD)/include/linux/version.h))
+ ifneq (,$(wildcard $(KBUILD)/include/generated/uapi/linux/version.h))
+@@ -43,16 +29,9 @@ endif
+ ifeq (,$(wildcard $(VERSION_H)))
+ VERSION_H := $(KBUILD)/include/linux/version.h
+ endif
+-ifeq (,$(wildcard $(VERSION_H)))
+-$(error Please run 'make modules_prepare' in $(KBUILD))
+-endif
+ 
+ KVERS := $(shell sed -ne 's/"//g;s/^\#define UTS_RELEASE //p' $(VERSION_H))
+ 
+-ifeq (,$(KVERS))
+-$(error Cannot find UTS_RELEASE in $(VERSION_H), please report)
+-endif
+-
+ INST_DIR = /lib/modules/$(KVERS)/misc
+ 
+ SRC_DIR=$(shell pwd)
@@ -0,0 +1,33 @@
+
+Fix build with kernel-3.14
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+ 3rdparty/ndiswrapper/crt.c        |    2 +-
+ 3rdparty/ndiswrapper/ntoskernel.h |    3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+--- linux/3rdparty/ndiswrapper/crt.c.orig	2014-04-26 19:10:55.000000000 +0300
+++ linux/3rdparty/ndiswrapper/crt.c	2014-04-26 19:25:27.766116082 +0300
+@@ -467,7 +467,7 @@ noregparm int WIN_FUNC(_win_memcmp,3)
+ noregparm void WIN_FUNC(_win_srand,1)
+ 	(UINT seed)
+ {
+-	net_srandom(seed);
+	prandom_seed((__force u32) seed);
+ }
+ 
+ noregparm int WIN_FUNC(rand,0)
+--- linux/3rdparty/ndiswrapper/ntoskernel.h.orig	2014-04-26 19:42:32.000000000 +0300
+++ linux/3rdparty/ndiswrapper/ntoskernel.h	2014-04-26 19:59:13.662522942 +0300
+@@ -798,9 +798,8 @@ do {									\
+ #define nt_spin_unlock_irqrestore(lock, flags)				\
+ do {									\
+ 	nt_spin_unlock(lock);						\
+-	preempt_enable_no_resched();					\
+	preempt_enable();						\
+ 	local_irq_restore(flags);					\
+-	preempt_check_resched();					\
+ } while (0)
+ 
+ static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length)
@@ -0,0 +1,978 @@
+ 3rdparty/rfswitch/FILES    |    6 
+ 3rdparty/rfswitch/ISSUES   |   28 +++
+ 3rdparty/rfswitch/Kconfig  |   22 ++
+ 3rdparty/rfswitch/LICENSE  |  339 +++++++++++++++++++++++++++++++++++++++++++++
+ 3rdparty/rfswitch/Makefile |  119 +++++++++++++++
+ 3rdparty/rfswitch/README   |   44 +++++
+ 3rdparty/rfswitch/av5100.c |  174 +++++++++++++++++++++++
+ 3rdparty/rfswitch/pbe5.c   |  205 +++++++++++++++++++++++++++
+ 8 files changed, 937 insertions(+)
+diff -Nurp linux-2.6.37/3rdparty/rfswitch/av5100.c linux-2.6.37.3rdparty/3rdparty/rfswitch/av5100.c
+--- linux-2.6.37/3rdparty/rfswitch/av5100.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/av5100.c	2008-03-28 05:25:28.000000000 +0200
+@@ -0,0 +1,174 @@
+/*******************************************************************************
+  
+  Copyright(c) 2003 - 2004 Intel Corporation. All rights reserved.
+  
+  This program is free software; you can redistribute it and/or modify it 
+  under the terms of version 2 of the GNU General Public License as 
+  published by the Free Software Foundation.
+  
+  This program is distributed in the hope that it will be useful, but WITHOUT 
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+  more details.
+  
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59 
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+#include <linux/compiler.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/netdevice.h>
+#include <linux/version.h>
+#include <linux/proc_fs.h>
+#include <linux/ioport.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+
+
+#define DRV_NAME		"av5100"
+#define DRV_VERSION		"1.3"
+#define DRV_DESCRIPTION		"SW RF kill switch for Averatec 5100P"
+#define DRV_COPYRIGHT		"Copyright(c) 2003-2004 Intel Corporation"
+
+static int radio = 1;
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+
+MODULE_PARM(radio, "i");
+
+#else /* LINUX_VERSION_CODE < 2.6.0 */
+
+#include <linux/moduleparam.h>
+module_param(radio, int, 1);
+
+#endif /* LINUX_VERSION_CODE < 2.6.0 */
+
+MODULE_PARM_DESC(radio, "controls state of radio (1=on, 0=off)");
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_AUTHOR(DRV_COPYRIGHT);
+MODULE_LICENSE("GPL");
+
+#define AV5100_RADIO_ON (0xe0)
+#define AV5100_RADIO_OFF (0xe1)
+
+static int av5100_radio = AV5100_RADIO_OFF;
+
+static void av5100_set_radio(int state)
+{
+	printk(KERN_INFO DRV_NAME ": Radio being turned %s\n",
+	       (state  == AV5100_RADIO_ON) ? "ON" : "OFF");
+	outl(0x80020800, 0xcf8);
+	outb(0x6f, 0x0072);
+	outl(0x1800ffff, 0x1184); 
+	outb(state, 0x00b2);
+	av5100_radio = state;
+}
+
+
+/*
+ * proc stuff
+ */
+static struct proc_dir_entry *dir_base = NULL;
+
+static int proc_set_radio(struct file *file, const char *buffer, 
+			  unsigned long count, void *data)
+{
+	av5100_set_radio(buffer[0] == '0' ? AV5100_RADIO_OFF : AV5100_RADIO_ON);
+	
+	return count;
+}
+
+static int proc_get_radio(char *page, char **start, off_t offset,
+			  int count, int *eof, void *data)
+{
+	int len = 0;
+	
+	len += snprintf(page, count, DRV_NAME ": %d\n", 
+			av5100_radio == AV5100_RADIO_OFF ? 0 : 1);
+	
+	*eof = 1;
+	return len;
+}
+
+
+static void av5100_proc_cleanup(void)
+{
+	if (dir_base) {
+		remove_proc_entry("radio", dir_base);
+		remove_proc_entry(DRV_NAME, &proc_root);
+		dir_base = NULL;
+	}
+}
+
+
+static int av5100_proc_init(void)
+{
+	struct proc_dir_entry *ent;
+	int err = 0;
+
+	dir_base = create_proc_entry(DRV_NAME, S_IFDIR, &proc_root);
+	if (dir_base == NULL) {
+		printk(KERN_ERR DRV_NAME ": Unable to initialise /proc/" 
+		       DRV_NAME "\n");
+		err = -ENOMEM;
+		goto fail;
+	}
+
+
+	ent = create_proc_entry("radio", S_IFREG | S_IRUGO | S_IWUSR, 
+				dir_base);
+	if (ent) {
+		ent->read_proc = proc_get_radio;
+		ent->write_proc = proc_set_radio;
+	} else {
+		printk(KERN_ERR
+		       "Unable to initialize /proc/" DRV_NAME "/radio\n");
+		err = -ENOMEM;
+		goto fail;
+	}
+
+	return 0;
+
+ fail:
+	av5100_proc_cleanup();
+	return err;
+}
+
+/*
+ * module stuff
+ */
+static int __init av5100_init(void)
+{
+	av5100_proc_init();
+
+	av5100_set_radio((radio == 1) ? AV5100_RADIO_ON : AV5100_RADIO_OFF);
+	
+	return 0;
+}
+
+static void __exit av5100_exit(void)
+{
+	av5100_set_radio(AV5100_RADIO_OFF);
+
+	av5100_proc_cleanup();
+}
+
+module_init(av5100_init);
+module_exit(av5100_exit);
+
+/*
+         1         2         3         4         5         6         7
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+*/
+diff -Nurp linux-2.6.37/3rdparty/rfswitch/FILES linux-2.6.37.3rdparty/3rdparty/rfswitch/FILES
+--- linux-2.6.37/3rdparty/rfswitch/FILES	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/FILES	2004-07-09 07:44:19.000000000 +0300
+@@ -0,0 +1,6 @@
+Makefile		Used for building on 2.4, 2.6, internally and exteranlly
+
+FILES			This file
+
+av5100.c                Averatec 5100P SW Switch Module
+pbe5.c                  Packard Bell Easynote SW Switch Module
+diff -Nurp linux-2.6.37/3rdparty/rfswitch/ISSUES linux-2.6.37.3rdparty/3rdparty/rfswitch/ISSUES
+--- linux-2.6.37/3rdparty/rfswitch/ISSUES	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/ISSUES	2004-07-09 07:43:22.000000000 +0300
+@@ -0,0 +1,28 @@
+
+ISSUES
+------------ -----   -----       ----       ---       --         -     
+
+No packets! - RF kill switch
+
+If the module loads, but no packets are transferred you may have a SW based
+radio kill switch.  All laptops have some capability to disable the radio
+via a button or switch.  On some laptops that switch is physically tied to the
+IPW2100; simply toggling the switch should enable the radio.
+
+On other laptops, the switch is a button that when pressed requires some
+software driver to send some hardware command to some other piece of hardware
+on the laptop, that then controls the radio.  The driver currently has support
+for the Averatec 5100P laptop's SW switch.  Support will be added for other
+laptop vendors as we become aware of them and figure out how to enable the
+radio.
+
+To know if the radio is being disabled via the RF switch, perform the following:
+
+% cat /proc/net/ipw2100/eth1/state
+Radio is disabled by RF switch
+
+If it says that, then your RF switch is currently disabling the radio.  The 
+driver doesn't currently support switching back to the on state if you have a
+physical RF switch (the radio may turn on and packets will work, but the proc
+entry won't be updated)
+
+diff -Nurp linux-2.6.37/3rdparty/rfswitch/Kconfig linux-2.6.37.3rdparty/3rdparty/rfswitch/Kconfig
+--- linux-2.6.37/3rdparty/rfswitch/Kconfig	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/Kconfig	2008-05-27 23:39:10.000000000 +0300
+@@ -0,0 +1,22 @@
+menu "RF Switch"
+       depends on EXPERIMENTAL
+
+config RFSWITCH
+       tristate "RF Switch"
+       depends on EXPERIMENTAL
+
+config AVERATEC_5100P
+       tristate "averatec 5100P driver"
+       depends on RFSWITCH
+       ---help---
+               This is an experimental driver for the wireless switch
+               of some laptops (usefull with some ipw2x00 cards)
+
+config PACKARDBELL_E5
+       tristate "pbe5 driver"
+       depends on RFSWITCH
+       ---help---
+               This is an experimental driver for the wireless switch
+               of some laptops (usefull with some ipw2x00 cards)
+
+endmenu
+diff -Nurp linux-2.6.37/3rdparty/rfswitch/LICENSE linux-2.6.37.3rdparty/3rdparty/rfswitch/LICENSE
+--- linux-2.6.37/3rdparty/rfswitch/LICENSE	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/LICENSE	2004-07-09 07:43:22.000000000 +0300
+@@ -0,0 +1,339 @@
+
+"This software program is licensed subject to the GNU General Public License 
+(GPL). Version 2, June 1991, available at 
+<http://www.fsf.org/copyleft/gpl.html>"
+
+GNU General Public License 
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to 
+share and change it. By contrast, the GNU General Public License is intended
+to guarantee your freedom to share and change free software--to make sure 
+the software is free for all its users. This General Public License applies 
+to most of the Free Software Foundation's software and to any other program 
+whose authors commit to using it. (Some other Free Software Foundation 
+software is covered by the GNU Library General Public License instead.) You 
+can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom 
+to distribute copies of free software (and charge for this service if you 
+wish), that you receive source code or can get it if you want it, that you 
+can change the software or use pieces of it in new free programs; and that 
+you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to 
+deny you these rights or to ask you to surrender the rights. These 
+restrictions translate to certain responsibilities for you if you distribute
+copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or 
+for a fee, you must give the recipients all the rights that you have. You 
+must make sure that they, too, receive or can get the source code. And you 
+must show them these terms so they know their rights.
+ 
+We protect your rights with two steps: (1) copyright the software, and (2) 
+offer you this license which gives you legal permission to copy, distribute 
+and/or modify the software. 
+
+Also, for each author's protection and ours, we want to make certain that 
+everyone understands that there is no warranty for this free software. If 
+the software is modified by someone else and passed on, we want its 
+recipients to know that what they have is not the original, so that any 
+problems introduced by others will not reflect on the original authors' 
+reputations. 
+
+Finally, any free program is threatened constantly by software patents. We 
+wish to avoid the danger that redistributors of a free program will 
+individually obtain patent licenses, in effect making the program 
+proprietary. To prevent this, we have made it clear that any patent must be 
+licensed for everyone's free use or not licensed at all. 
+
+The precise terms and conditions for copying, distribution and modification 
+follow. 
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+   placed by the copyright holder saying it may be distributed under the 
+   terms of this General Public License. The "Program", below, refers to any
+   such program or work, and a "work based on the Program" means either the 
+   Program or any derivative work under copyright law: that is to say, a 
+   work containing the Program or a portion of it, either verbatim or with 
+   modifications and/or translated into another language. (Hereinafter, 
+   translation is included without limitation in the term "modification".) 
+   Each licensee is addressed as "you". 
+
+   Activities other than copying, distribution and modification are not 
+   covered by this License; they are outside its scope. The act of running 
+   the Program is not restricted, and the output from the Program is covered 
+   only if its contents constitute a work based on the Program (independent 
+   of having been made by running the Program). Whether that is true depends
+   on what the Program does. 
+
+1. You may copy and distribute verbatim copies of the Program's source code 
+   as you receive it, in any medium, provided that you conspicuously and 
+   appropriately publish on each copy an appropriate copyright notice and 
+   disclaimer of warranty; keep intact all the notices that refer to this 
+   License and to the absence of any warranty; and give any other recipients 
+   of the Program a copy of this License along with the Program. 
+
+   You may charge a fee for the physical act of transferring a copy, and you 
+   may at your option offer warranty protection in exchange for a fee. 
+
+2. You may modify your copy or copies of the Program or any portion of it, 
+   thus forming a work based on the Program, and copy and distribute such 
+   modifications or work under the terms of Section 1 above, provided that 
+   you also meet all of these conditions: 
+
+   * a) You must cause the modified files to carry prominent notices stating 
+        that you changed the files and the date of any change. 
+
+   * b) You must cause any work that you distribute or publish, that in 
+        whole or in part contains or is derived from the Program or any part 
+        thereof, to be licensed as a whole at no charge to all third parties
+        under the terms of this License. 
+
+   * c) If the modified program normally reads commands interactively when 
+        run, you must cause it, when started running for such interactive 
+        use in the most ordinary way, to print or display an announcement 
+        including an appropriate copyright notice and a notice that there is
+        no warranty (or else, saying that you provide a warranty) and that 
+        users may redistribute the program under these conditions, and 
+        telling the user how to view a copy of this License. (Exception: if 
+        the Program itself is interactive but does not normally print such 
+        an announcement, your work based on the Program is not required to 
+        print an announcement.) 
+
+   These requirements apply to the modified work as a whole. If identifiable 
+   sections of that work are not derived from the Program, and can be 
+   reasonably considered independent and separate works in themselves, then 
+   this License, and its terms, do not apply to those sections when you 
+   distribute them as separate works. But when you distribute the same 
+   sections as part of a whole which is a work based on the Program, the 
+   distribution of the whole must be on the terms of this License, whose 
+   permissions for other licensees extend to the entire whole, and thus to 
+   each and every part regardless of who wrote it. 
+
+   Thus, it is not the intent of this section to claim rights or contest 
+   your rights to work written entirely by you; rather, the intent is to 
+   exercise the right to control the distribution of derivative or 
+   collective works based on the Program. 
+
+   In addition, mere aggregation of another work not based on the Program 
+   with the Program (or with a work based on the Program) on a volume of a 
+   storage or distribution medium does not bring the other work under the 
+   scope of this License. 
+
+3. You may copy and distribute the Program (or a work based on it, under 
+   Section 2) in object code or executable form under the terms of Sections 
+   1 and 2 above provided that you also do one of the following: 
+
+   * a) Accompany it with the complete corresponding machine-readable source 
+        code, which must be distributed under the terms of Sections 1 and 2 
+        above on a medium customarily used for software interchange; or, 
+
+   * b) Accompany it with a written offer, valid for at least three years, 
+        to give any third party, for a charge no more than your cost of 
+        physically performing source distribution, a complete machine-
+        readable copy of the corresponding source code, to be distributed 
+        under the terms of Sections 1 and 2 above on a medium customarily 
+        used for software interchange; or, 
+
+   * c) Accompany it with the information you received as to the offer to 
+        distribute corresponding source code. (This alternative is allowed 
+        only for noncommercial distribution and only if you received the 
+        program in object code or executable form with such an offer, in 
+        accord with Subsection b above.) 
+
+   The source code for a work means the preferred form of the work for 
+   making modifications to it. For an executable work, complete source code 
+   means all the source code for all modules it contains, plus any 
+   associated interface definition files, plus the scripts used to control 
+   compilation and installation of the executable. However, as a special 
+   exception, the source code distributed need not include anything that is 
+   normally distributed (in either source or binary form) with the major 
+   components (compiler, kernel, and so on) of the operating system on which
+   the executable runs, unless that component itself accompanies the 
+   executable. 
+
+   If distribution of executable or object code is made by offering access 
+   to copy from a designated place, then offering equivalent access to copy 
+   the source code from the same place counts as distribution of the source 
+   code, even though third parties are not compelled to copy the source 
+   along with the object code. 
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+   expressly provided under this License. Any attempt otherwise to copy, 
+   modify, sublicense or distribute the Program is void, and will 
+   automatically terminate your rights under this License. However, parties 
+   who have received copies, or rights, from you under this License will not
+   have their licenses terminated so long as such parties remain in full 
+   compliance. 
+
+5. You are not required to accept this License, since you have not signed 
+   it. However, nothing else grants you permission to modify or distribute 
+   the Program or its derivative works. These actions are prohibited by law 
+   if you do not accept this License. Therefore, by modifying or 
+   distributing the Program (or any work based on the Program), you 
+   indicate your acceptance of this License to do so, and all its terms and
+   conditions for copying, distributing or modifying the Program or works 
+   based on it. 
+
+6. Each time you redistribute the Program (or any work based on the 
+   Program), the recipient automatically receives a license from the 
+   original licensor to copy, distribute or modify the Program subject to 
+   these terms and conditions. You may not impose any further restrictions 
+   on the recipients' exercise of the rights granted herein. You are not 
+   responsible for enforcing compliance by third parties to this License. 
+
+7. If, as a consequence of a court judgment or allegation of patent 
+   infringement or for any other reason (not limited to patent issues), 
+   conditions are imposed on you (whether by court order, agreement or 
+   otherwise) that contradict the conditions of this License, they do not 
+   excuse you from the conditions of this License. If you cannot distribute 
+   so as to satisfy simultaneously your obligations under this License and 
+   any other pertinent obligations, then as a consequence you may not 
+   distribute the Program at all. For example, if a patent license would 
+   not permit royalty-free redistribution of the Program by all those who 
+   receive copies directly or indirectly through you, then the only way you 
+   could satisfy both it and this License would be to refrain entirely from 
+   distribution of the Program. 
+
+   If any portion of this section is held invalid or unenforceable under any
+   particular circumstance, the balance of the section is intended to apply
+   and the section as a whole is intended to apply in other circumstances. 
+
+   It is not the purpose of this section to induce you to infringe any 
+   patents or other property right claims or to contest validity of any 
+   such claims; this section has the sole purpose of protecting the 
+   integrity of the free software distribution system, which is implemented 
+   by public license practices. Many people have made generous contributions
+   to the wide range of software distributed through that system in 
+   reliance on consistent application of that system; it is up to the 
+   author/donor to decide if he or she is willing to distribute software 
+   through any other system and a licensee cannot impose that choice. 
+
+   This section is intended to make thoroughly clear what is believed to be 
+   a consequence of the rest of this License. 
+
+8. If the distribution and/or use of the Program is restricted in certain 
+   countries either by patents or by copyrighted interfaces, the original 
+   copyright holder who places the Program under this License may add an 
+   explicit geographical distribution limitation excluding those countries, 
+   so that distribution is permitted only in or among countries not thus 
+   excluded. In such case, this License incorporates the limitation as if 
+   written in the body of this License. 
+
+9. The Free Software Foundation may publish revised and/or new versions of 
+   the General Public License from time to time. Such new versions will be 
+   similar in spirit to the present version, but may differ in detail to 
+   address new problems or concerns. 
+
+   Each version is given a distinguishing version number. If the Program 
+   specifies a version number of this License which applies to it and "any 
+   later version", you have the option of following the terms and 
+   conditions either of that version or of any later version published by 
+   the Free Software Foundation. If the Program does not specify a version 
+   number of this License, you may choose any version ever published by the 
+   Free Software Foundation. 
+
+10. If you wish to incorporate parts of the Program into other free programs
+    whose distribution conditions are different, write to the author to ask 
+    for permission. For software which is copyrighted by the Free Software 
+    Foundation, write to the Free Software Foundation; we sometimes make 
+    exceptions for this. Our decision will be guided by the two goals of 
+    preserving the free status of all derivatives of our free software and 
+    of promoting the sharing and reuse of software generally. 
+
+   NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 
+    FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 
+    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 
+    PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
+    EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE 
+    ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH 
+    YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL 
+    NECESSARY SERVICING, REPAIR OR CORRECTION. 
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 
+    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 
+    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR 
+    DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL 
+    DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM 
+    (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED 
+    INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF 
+    THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR 
+    OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest 
+possible use to the public, the best way to achieve this is to make it free 
+software which everyone can redistribute and change under these terms. 
+
+To do so, attach the following notices to the program. It is safest to 
+attach them to the start of each source file to most effectively convey the
+exclusion of warranty; and each file should have at least the "copyright" 
+line and a pointer to where the full notice is found. 
+
+one line to give the program's name and an idea of what it does.
+Copyright (C) yyyy  name of author
+
+This program is free software; you can redistribute it and/or modify it 
+under the terms of the GNU General Public License as published by the Free 
+Software Foundation; either version 2 of the License, or (at your option) 
+any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT 
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 
+Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+Also add information on how to contact you by electronic and paper mail. 
+
+If the program is interactive, make it output a short notice like this when 
+it starts in an interactive mode: 
+
+Gnomovision version 69, Copyright (C) year name of author Gnomovision comes 
+with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free 
+software, and you are welcome to redistribute it under certain conditions; 
+type 'show c' for details.
+
+The hypothetical commands 'show w' and 'show c' should show the appropriate 
+parts of the General Public License. Of course, the commands you use may be 
+called something other than 'show w' and 'show c'; they could even be 
+mouse-clicks or menu items--whatever suits your program. 
+
+You should also get your employer (if you work as a programmer) or your 
+school, if any, to sign a "copyright disclaimer" for the program, if 
+necessary. Here is a sample; alter the names: 
+
+Yoyodyne, Inc., hereby disclaims all copyright interest in the program 
+'Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+signature of Ty Coon, 1 April 1989
+Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into 
+proprietary programs. If your program is a subroutine library, you may 
+consider it more useful to permit linking proprietary applications with the 
+library. If this is what you want to do, use the GNU Library General Public 
+License instead of this License.
+diff -Nurp linux-2.6.37/3rdparty/rfswitch/Makefile linux-2.6.37.3rdparty/3rdparty/rfswitch/Makefile
+--- linux-2.6.37/3rdparty/rfswitch/Makefile	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/Makefile	2008-03-28 05:17:16.000000000 +0200
+@@ -0,0 +1,119 @@
+#
+# Makefile for the SW RF Switch kernel modules
+#
+# NOTE: This make file can serve as both an external Makefile (launched
+#       directly by the user), or as the sub-dir Makefile used by the kernel
+# 	build system.
+
+
+CONFIG_AVERATEC_5100P=m
+CONFIG_PACKARDBELL_E5=m
+
+
+
+list-m :=
+list-$(CONFIG_AVERATEC_5100P) += av5100
+list-$(CONFIG_PACKARDBELL_E5) += pbe5
+
+
+obj-$(CONFIG_AVERATEC_5100P) += av5100.o
+obj-$(CONFIG_PACKARDBELL_E5) += pbe5.o
+
+#
+# Begin dual Makefile mode here.  First we provide support for when we
+# are being invoked by the kernel build system
+#
+ifneq ($(KERNELRELEASE),)
+
+ifneq ($(PATCHLEVEL),6) # If we are not on a 2.6, then do 2.4 specific things
+
+O_TARGET := rfswitch.o
+
+include $(TOPDIR)/Rules.make
+
+endif # End if 2.4 specific settings
+
+else 
+# Here we begin the portion that is executed if the user invoked this Makefile
+# directly.
+
+# KSRC should be set to the path to your sources
+# modules are installed into KMISC
+KVER  := $(shell uname -r)
+KSRC := /lib/modules/$(KVER)/build
+KMISC := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
+
+# KSRC_OUTPUT should be overridden if you are using a 2.6 kernel that
+# has it's output sent elsewhere via KBUILD_OUTPUT= or O=
+KSRC_OUTPUT := $(KSRC)
+
+# If we find Rules.make, we can assume we're using the old 2.4 style building
+OLDMAKE=$(wildcard $(KSRC)/Rules.make)
+PWD=$(shell pwd)
+
+VERFILE := $(KSRC_OUTPUT)/include/linux/version.h
+KERNELRELEASE := $(shell \
+	if [ -r $(VERFILE) ]; then \
+		(cat $(VERFILE); echo UTS_RELEASE) | \
+		$(CC) -I$(KSRC_OUTPUT) $(CFLAGS) -E - | \
+		tail -n 1 | \
+		xargs echo; \
+        else \
+		uname -r; \
+	fi)
+
+MODPATH := $(DESTDIR)/lib/modules/$(KERNELRELEASE)
+
+all: modules
+
+clean:
+	rm -f *.mod.c *.mod *.o *.ko .*.cmd .*.flags Modules.symvers
+	rm -rf $(PWD)/tmp
+
+
+ifeq ($(OLDMAKE),)
+
+TMP=$(PWD)/tmp
+MODVERDIR=$(TMP)/.tmp_versions
+
+modules:
+ifdef ($(KSRC_OUTPUT)/.tmp_versions)
+	mkdir -p $(MODVERDIR)
+	-cp $(KSRC_OUTPUT)/.tmp_versions/*.mod $(MODVERDIR)
+endif
+ifeq ($(KSRC),$(KSRC_OUTPUT)) # We're not outputting elsewhere
+ifdef ($(KSRC)/.tmp_versions)
+	-cp $(KSRC)/.tmp_versions/*.mod $(MODVERDIR)
+endif
+	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) MODVERDIR=$(MODVERDIR) modules
+else # We've got a kernel with seperate output, copy the config, and use O=
+	mkdir -p $(TMP)
+	cp $(KSRC_OUTPUT)/.config $(TMP)
+	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) MODVERDIR=$(MODVERDIR) O=$(PWD)/tmp modules
+endif
+
+install: modules
+	install -d $(KMISC)
+	install -m 644 -c $(addsuffix .ko,$(list-m)) $(KMISC)
+	/sbin/depmod -a
+
+
+else # We're on 2.4, and things are slightly different
+
+modules:
+	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) BUILD_DIR=$(PWD) modules
+
+install: modules
+	install -d $(KMISC)
+	install -m 644 -c $(addsuffix .o,$(list-m)) $(KMISC)
+	/sbin/depmod -a
+
+endif
+
+uninstall:
+	cd $(KMISC)
+	rm -rf $(addsuffix .ko,$(list-m))
+	cd -
+	/sbin/depmod -a
+
+endif
+diff -Nurp linux-2.6.37/3rdparty/rfswitch/pbe5.c linux-2.6.37.3rdparty/3rdparty/rfswitch/pbe5.c
+--- linux-2.6.37/3rdparty/rfswitch/pbe5.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/pbe5.c	2008-03-28 05:25:16.000000000 +0200
+@@ -0,0 +1,205 @@
+/*******************************************************************************
+  
+  This program is free software; you can redistribute it and/or modify it 
+  under the terms of version 2 of the GNU General Public License as 
+  published by the Free Software Foundation.
+  
+  This program is distributed in the hope that it will be useful, but WITHOUT 
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+  more details.
+  
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59 
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+  
+  Author:
+  Pedro Ramalhais <pmr09313@students.fct.unl.pt>
+  
+  Based on:
+  av5100.c from http://ipw2100.sourceforge.net/
+
+*******************************************************************************/
+
+#include <linux/compiler.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/netdevice.h>
+#include <linux/version.h>
+#include <linux/proc_fs.h>
+#include <linux/ioport.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+
+#define DRV_NAME		"pbe5"
+#define DRV_VERSION		"1.3"
+#define DRV_DESCRIPTION		"SW RF kill switch for Packard Bell EasyNote E5"
+#define DRV_AUTHOR		"Pedro Ramalhais"
+#define DRV_LICENSE		"GPL"
+
+static int radio = 1;
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+
+MODULE_PARM(radio, "i");
+
+#else /* LINUX_VERSION_CODE < 2.6.0 */
+
+#include <linux/moduleparam.h>
+module_param(radio, int, 1);
+
+#endif /* LINUX_VERSION_CODE < 2.6.0 */
+
+MODULE_PARM_DESC(radio, "controls state of radio (1=on, 0=off)");
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_AUTHOR(DRV_AUTHOR);
+MODULE_LICENSE(DRV_LICENSE);
+
+/*
+ * NOTE: These values were obtained from disassembling the Icon.exe program
+ * installed in the Packard Bell EasyNote E5 laptop. The names were guessed,
+ * so don't rely on them.
+ */
+#define PBE5_PORT_TOGGLE	0x0b3
+#define PBE5_VALUE_TOGGLE_ON	0x01
+#define PBE5_VALUE_TOGGLE_OFF	0x00
+#define PBE5_PORT_APPLY		0x0b2
+#define PBE5_VALUE_APPLY	0xef
+
+// Some "booleans" =;-)
+#define PBE5_RADIO_OFF	0
+#define PBE5_RADIO_ON	1
+
+static int pbe5_radio_status = PBE5_RADIO_ON;
+
+unsigned char pbe5_get_radio(void)
+{
+	unsigned char val = 0x00;
+	
+	val = inb(PBE5_PORT_TOGGLE);
+	
+	return val;
+}
+
+static void pbe5_set_radio(int state_set)
+{
+	pbe5_radio_status = pbe5_get_radio();
+
+	if (pbe5_radio_status != state_set) {
+		// Set the radio toggle register
+		outb(PBE5_VALUE_TOGGLE_ON, PBE5_PORT_TOGGLE);
+		// Commit the radio toggle register value
+		outb(PBE5_VALUE_APPLY, PBE5_PORT_APPLY);
+		// Update the radio status
+		pbe5_radio_status = pbe5_get_radio();
+
+		printk(KERN_INFO DRV_NAME ": Radio turned %s\n",
+			(state_set  == PBE5_RADIO_ON) ? "ON" : "OFF");
+	} else {
+		printk(KERN_INFO DRV_NAME ": Radio already %s\n",
+			(state_set  == PBE5_RADIO_ON) ? "ON" : "OFF");
+	}
+}
+
+
+/*
+ * proc stuff
+ */
+static struct proc_dir_entry *dir_base = NULL;
+
+static int proc_set_radio(struct file *file, const char *buffer, 
+			  unsigned long count, void *data)
+{
+	pbe5_set_radio(buffer[0] == '0' ? PBE5_RADIO_OFF : PBE5_RADIO_ON);
+	
+	return count;
+}
+
+static int proc_get_radio(char *page, char **start, off_t offset,
+			  int count, int *eof, void *data)
+{
+	int len = 0;
+	
+	len += snprintf(page, count, DRV_NAME ": %d\n", 
+			pbe5_radio_status == PBE5_RADIO_OFF ? 0 : 1);
+	
+	*eof = 1;
+	return len;
+}
+
+
+static void pbe5_proc_cleanup(void)
+{
+	if (dir_base) {
+		remove_proc_entry("radio", dir_base);
+		remove_proc_entry(DRV_NAME, &proc_root);
+		dir_base = NULL;
+	}
+}
+
+
+static int pbe5_proc_init(void)
+{
+	struct proc_dir_entry *ent;
+	int err = 0;
+
+	dir_base = create_proc_entry(DRV_NAME, S_IFDIR, &proc_root);
+	if (dir_base == NULL) {
+		printk(KERN_ERR DRV_NAME ": Unable to initialise /proc/" 
+		       DRV_NAME "\n");
+		err = -ENOMEM;
+		goto fail;
+	}
+
+
+	ent = create_proc_entry("radio", S_IFREG | S_IRUGO | S_IWUSR, 
+				dir_base);
+	if (ent) {
+		ent->read_proc = proc_get_radio;
+		ent->write_proc = proc_set_radio;
+	} else {
+		printk(KERN_ERR
+		       "Unable to initialize /proc/" DRV_NAME "/radio\n");
+		err = -ENOMEM;
+		goto fail;
+	}
+
+	return 0;
+
+ fail:
+	pbe5_proc_cleanup();
+	return err;
+}
+
+/*
+ * module stuff
+ */
+static int __init pbe5_init(void)
+{
+	pbe5_proc_init();
+
+	pbe5_set_radio((radio == 1) ? PBE5_RADIO_ON : PBE5_RADIO_OFF);
+	
+	return 0;
+}
+
+static void __exit pbe5_exit(void)
+{
+	pbe5_set_radio(PBE5_RADIO_OFF);
+
+	pbe5_proc_cleanup();
+}
+
+module_init(pbe5_init);
+module_exit(pbe5_exit);
+
+/*
+         1         2         3         4         5         6         7
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
+*/
+diff -Nurp linux-2.6.37/3rdparty/rfswitch/README linux-2.6.37.3rdparty/3rdparty/rfswitch/README
+--- linux-2.6.37/3rdparty/rfswitch/README	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/rfswitch/README	2004-07-09 17:26:20.000000000 +0300
+@@ -0,0 +1,44 @@
+Radio Kill Switch
+------------ -----   -----       ----       ---       --         -
+Most laptops provide the ability for the user to physically disable the radio.
+Some vendors have implemented this as a physical switch that requires no
+software to turn the radio off and on.  On other laptops, however, the switch
+is controlled through a button being pressed and a software driver then making
+calls to turn the radio off and on.  This is referred to as a "software based
+RF kill switch"
+
+Currently this project provides modules for controlling the software RF kill
+switch on the Averatec 5100P and Packard Bell EasyNote E5.  The code may work
+on other laptops, but these are the only models on which it has been tested.
+
+To determine if you have a system that might be compatible with one of the
+provided SW RF Kill switch modules, you can run:
+
+
+        To check for the Packard Bell (to use module pbe) --
+
+        % dd if=/dev/mem bs=1 skip=983040 count=65535 2>/dev/null | strings | egrep "NEW-PC|Insyde Software MobilePRO BIOS"
+
+        To check for the Averatec (to use module av5100) --
+
+        % dd if=/dev/mem bs=1 skip=983040 count=65535 2>/dev/null | strings | egrep "AVERATEC"
+
+If you have one of those laptop models you can imply loading the av5100/pbe5
+module and the radio will be toggled on and off.  In addition, you can turn
+the driver on and off by writing either a 1 or 0 to /proc/av5100/radio or
+/proc/pbe5/radio.  If you automatically load the av5100/pbe5 module when your
+system boots, you may wish to use the radio module parameter to control the
+state of the radio upon loading:
+
+        modprobe av5100 radio=0
+        modprobe pbe5 radio=0
+
+results in the module loading with the radio turned off.  You can then turn the
+radio on by:
+
+        echo 1 > /proc/av5100/radio
+        echo 1 > /proc/pbe5/radio
+
+If you have a SW RF kill switch and can not use one of the above modules,
+please join us on IRC (irc.freenode.net) on channel #ipw2100 and someone may
+be able to help.
@@ -0,0 +1,19 @@
+
+fix build with 3.0
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+ 3rdparty/rfswitch/Makefile |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/3rdparty/rfswitch/Makefile.orig	2011-07-15 02:37:27.000000000 +0300
+++ a/3rdparty/rfswitch/Makefile	2011-07-15 13:47:10.463914526 +0300
+@@ -29,8 +29,6 @@ ifneq ($(PATCHLEVEL),6) # If we are not
+ 
+ O_TARGET := rfswitch.o
+ 
+-include $(TOPDIR)/Rules.make
+-
+ endif # End if 2.4 specific settings
+ 
+ else 
@@ -0,0 +1,51 @@
+Remove 'proc_root' usage
+
+Commit c74c120a21d87b0b6925ada5830d8cac21e852d9 (Linus's tree) removed
+the export of 'proc_root' variable, because you can create on the proc's
+root directory by passing NULL where you would pass 'proc_root'.
+
+Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
+Index: linux-2.6.25/3rdparty/rfswitch/av5100.c
+===================================================================
+--- linux-2.6.25.orig/3rdparty/rfswitch/av5100.c
+++ linux-2.6.25/3rdparty/rfswitch/av5100.c
+@@ -107,7 +107,7 @@ static void av5100_proc_cleanup(void)
+ {
+ 	if (dir_base) {
+ 		remove_proc_entry("radio", dir_base);
+-		remove_proc_entry(DRV_NAME, &proc_root);
+		remove_proc_entry(DRV_NAME, NULL);
+ 		dir_base = NULL;
+ 	}
+ }
+@@ -118,7 +118,7 @@ static int av5100_proc_init(void)
+ 	struct proc_dir_entry *ent;
+ 	int err = 0;
+ 
+-	dir_base = create_proc_entry(DRV_NAME, S_IFDIR, &proc_root);
+	dir_base = create_proc_entry(DRV_NAME, S_IFDIR, NULL);
+ 	if (dir_base == NULL) {
+ 		printk(KERN_ERR DRV_NAME ": Unable to initialise /proc/" 
+ 		       DRV_NAME "\n");
+Index: linux-2.6.25/3rdparty/rfswitch/pbe5.c
+===================================================================
+--- linux-2.6.25.orig/3rdparty/rfswitch/pbe5.c
+++ linux-2.6.25/3rdparty/rfswitch/pbe5.c
+@@ -138,7 +138,7 @@ static void pbe5_proc_cleanup(void)
+ {
+ 	if (dir_base) {
+ 		remove_proc_entry("radio", dir_base);
+-		remove_proc_entry(DRV_NAME, &proc_root);
+		remove_proc_entry(DRV_NAME, NULL);
+ 		dir_base = NULL;
+ 	}
+ }
+@@ -149,7 +149,7 @@ static int pbe5_proc_init(void)
+ 	struct proc_dir_entry *ent;
+ 	int err = 0;
+ 
+-	dir_base = create_proc_entry(DRV_NAME, S_IFDIR, &proc_root);
+	dir_base = create_proc_entry(DRV_NAME, S_IFDIR, NULL);
+ 	if (dir_base == NULL) {
+ 		printk(KERN_ERR DRV_NAME ": Unable to initialise /proc/" 
+ 		       DRV_NAME "\n");
@@ -0,0 +1,23 @@
+From 842e61cb85813b1ed8a1646cbe6739950c0c9822 Mon Sep 17 00:00:00 2001
+From: Larry Finger <Larry.Finger@lwfinger.net>
+Date: Thu, 7 May 2015 19:08:17 +0000
+Subject: [PATCH] rtl8723bs: Fix Makefile to allow warnings
+
+Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git linux.old/3rdparty/rtl8723bs/Makefile linux/3rdparty/rtl8723bs/Makefile
+index a4d9f45..4da73fa 100644
+--- linux.old/3rdparty/rtl8723bs/Makefile
+++ linux/3rdparty/rtl8723bs/Makefile
+@@ -3,7 +3,7 @@ EXTRA_CFLAGS += -O1
+ #EXTRA_CFLAGS += -O3
+ #EXTRA_CFLAGS += -Wall
+ #EXTRA_CFLAGS += -Wextra
+-EXTRA_CFLAGS += -Werror
+#EXTRA_CFLAGS += -Werror
+ #EXTRA_CFLAGS += -pedantic
+ #EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes
+ 
@@ -0,0 +1,73 @@
+
+This reverts the parts of:
+
+commit 86fe2db84ba7b9a83b60323cd805198ff43136ec
+Author: Bastien Nocera <hadess@hadess.net>
+Date:   Fri Mar 20 18:28:08 2015 +0100
+
+    cfg80211: Update for newest mac80211 API
+
+
+that breaks building with 3.19 series kernels.
+
+
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+
+diff -Nurp linux/3rdparty/rtl8723bs.rev/include/ioctl_cfg80211.h linux/3rdparty/rtl8723bs/include/ioctl_cfg80211.h
+--- linux/3rdparty/rtl8723bs.rev/include/ioctl_cfg80211.h	2015-05-07 17:46:55.000000000 +0300
+++ linux/3rdparty/rtl8723bs/include/ioctl_cfg80211.h	2015-05-10 14:55:44.744038033 +0300
+@@ -22,10 +22,6 @@
+ 
+ #include <linux/version.h>
+ 
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0))
+-#error This driver only works with kernel 4.0
+-#endif
+-
+ struct rtw_wdev_invit_info {
+ 	u8 state; /* 0: req, 1:rep */
+ 	u8 peer_mac[ETH_ALEN];
+diff -Nurp linux/3rdparty/rtl8723bs.rev/os_dep/ioctl_cfg80211.c linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c
+--- linux/3rdparty/rtl8723bs.rev/os_dep/ioctl_cfg80211.c	2015-05-10 14:54:53.241616597 +0300
+++ linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c	2015-05-10 14:49:42.766354711 +0300
+@@ -1289,16 +1289,16 @@ static int cfg80211_rtw_get_station(stru
+ 			goto exit;
+ 		}
+ 
+-		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
+		sinfo->filled |= STATION_INFO_SIGNAL;
+ 		sinfo->signal = translate_percentage_to_dbm(padapter->recvpriv.signal_strength);
+ 
+-		sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
+		sinfo->filled |= STATION_INFO_TX_BITRATE;
+ 		sinfo->txrate.legacy = rtw_get_cur_max_rate(padapter);
+ 
+-		sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS);
+		sinfo->filled |= STATION_INFO_RX_PACKETS;
+ 		sinfo->rx_packets = sta_rx_data_pkts(psta);
+ 
+-		sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS);
+		sinfo->filled |= STATION_INFO_TX_PACKETS;
+ 		sinfo->tx_packets = psta->sta_stats.tx_pkts;
+ 
+ 	}
+@@ -2473,6 +2473,7 @@ void rtw_cfg80211_indicate_sta_assoc(_ad
+ 			ie_offset = _REASOCREQ_IE_OFFSET_;
+ 	
+ 		sinfo.filled = 0;
+		sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
+ 		sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset;
+ 		sinfo.assoc_req_ies_len = frame_len - WLAN_HDR_A3_LEN - ie_offset;
+ 		cfg80211_new_sta(ndev, GetAddr2Ptr(pmgmt_frame), &sinfo, GFP_ATOMIC);
+@@ -3078,7 +3079,8 @@ static int	cfg80211_rtw_dump_station(str
+ 		goto exit;
+ 	}
+ 	memcpy(mac, psta->hwaddr, ETH_ALEN);
+-	sinfo->filled = BIT(NL80211_STA_INFO_SIGNAL);
+	sinfo->filled = 0;
+	sinfo->filled |= STATION_INFO_SIGNAL;
+ 	sinfo->signal = psta->rssi;
+ 	
+ exit:
@@ -0,0 +1,189 @@
+ 3rdparty/viahss/Kconfig     |   14 +++++++
+ 3rdparty/viahss/Makefile    |    3 +
+ 3rdparty/viahss/README.html |   68 ++++++++++++++++++++++++++++++++++++
+ 3rdparty/viahss/viahss.c    |   83 ++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 168 insertions(+)
+diff -Nurp linux-2.6.37/3rdparty/viahss/Kconfig linux-2.6.37.3rdparty/3rdparty/viahss/Kconfig
+--- linux-2.6.37/3rdparty/viahss/Kconfig	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/viahss/Kconfig	2003-12-01 01:53:51.000000000 +0200
+@@ -0,0 +1,14 @@
+config VIAHSS
+	tristate "VIA High Speed Serial"
+	depends on SERIAL_CORE && m
+	---help---
+	  VIA High Speed Serial is a little kernel module (1 KB) which enables
+	  high speed serial port modes of VIA VT82C686A or VT82C686B
+	  southbridge-equipped motherboards. With this module, you can use the
+	  serial port at 230400 bit/s so that you can get the full 128000 bit/s
+	  from ISDN-TA. The module has been tested with both 686A and 686B
+	  chipsets.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called viahss.
+
+diff -Nurp linux-2.6.37/3rdparty/viahss/Makefile linux-2.6.37.3rdparty/3rdparty/viahss/Makefile
+--- linux-2.6.37/3rdparty/viahss/Makefile	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/viahss/Makefile	2003-12-01 01:43:23.000000000 +0200
+@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_VIAHSS) += viahss.o
+    
+diff -Nurp linux-2.6.37/3rdparty/viahss/README.html linux-2.6.37.3rdparty/3rdparty/viahss/README.html
+--- linux-2.6.37/3rdparty/viahss/README.html	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/viahss/README.html	2003-12-01 01:58:23.000000000 +0200
+@@ -0,0 +1,68 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+  <title>High speed serial port for VIA VT82C686 chipsets for linux</title>
+</head>
+<body>
+<H3>Setting the serial port speed over 115,200bps</H3>
+<br>
+If you have motherboard which has VIA VT82C686A or VT82C686B chipset 
+you can set serial ports in high speed mode with this kernel module. 
+I use module with external ISDN-TA and haven't had any problems 
+so far but I cannot guarantee that you won't have buffer overflows if 
+you use full 230K or 460K speed all the time (FIFO's are still 16550A size). 
+ISDN with two channels maxes out at 128 Kb which means that it doesn't
+really stress serial ports at 230400. Unlike SHSMOD-patches you don't have 
+to patch serial driver and module takes only 1KB of memory when it's 
+loaded which should leave enough room for other programs. It should
+be also possible to make this work from userspace but accessing
+pci devices is so much easier from kernel. 
+
+<H3>How to use module</H3>
+Get the <A href=http://www.kati.fi/viahss/viahss-0.92.tar.gz>package</A> 
+and compile it using included makefiles. 
+<H3>For 2.4</H3>
+If you have kernel in some other location than /usr/src/linux edit Makefile 
+before compiling.  You can also install module with "make install".  After 
+you have loaded module in kernel (use modprobe or insmod) you can set serial 
+ports to use high speed modes with setserial.<br>
+<H3>For 2.5/2.6</H3>
+Copy Makefile-2.6 on top of Makefile and do make. After loading module set
+serial speed with setserial. (NOTE: This gives a warning on depracated
+method). 
+
+<br>
+# setserial /dev/ttyS0 spd_cust divisor 0x8002
+<br><br>
+which sets COM1: speed to 230400. With 0x8001 you should get 460800
+but I haven't tested it. If you want to use COM2: use ttyS1 instead of ttyS0.
+
+After this you should set program which you are using to use 38400 bps
+speed which is now actually 230K or 460K. For more information check
+setserial man page (spd_cust).
+
+You can use serial port work as normal if you do<br>
+<br>
+# setserial /dev/ttyS0 spd_normal <br><br>
+After this you can also remove viahss module with rmmod if you need to.  Module doesn't intefere with normal serial port usage so you can leave
+it loaded if you don't need that extra 1KB which module uses.
+<H3>Download</H3>
+<A href=http://www.kati.fi/viahss/viahss-0.92.tar.gz>viahss-0.92.tar.gz</A> 
+
+<H3>Acknowledgments</H3>
+
+Thanks to Kimmo Rintala for help with divisor settings.<br>
+I also like to thank Jeff Garzik for help with VIA datasheets.<br>
+Port to 2.5/2.6 by Kingsly John with the help of <A href=http://lwn.net>LWN</A>
+
+<H3>Version History</H3>
+0.90	First release<br>
+0.91	Fixed Makefile <br>
+0.92 	Fixed for 2.5/2.6<br>
+
+<H3>Contact</H3>
+
+You can reach me by email: <A href=mailto:jrauti@iki.fi>jrauti@iki.fi</A>
+</body>
+</html>
+diff -Nurp linux-2.6.37/3rdparty/viahss/viahss.c linux-2.6.37.3rdparty/3rdparty/viahss/viahss.c
+--- linux-2.6.37/3rdparty/viahss/viahss.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-2.6.37.3rdparty/3rdparty/viahss/viahss.c	2003-07-17 09:49:59.000000000 +0300
+@@ -0,0 +1,83 @@
+/*
+ * VIA VT 82c686[AB] high speed serial port enabler
+ * Version 0.92
+ * Copyright (c) 2000-2001 Juhani Rautiainen <jrauti@iki.fi>
+ *
+ * 0.92:
+ *	Ported to 2.5/2.6 by Kingsly John
+ *	- Corrected locking (no more cli() and sti())
+ *	- New makefile
+ *	
+ * Can be freely distributed and used under the terms of the GNU GPL.
+*/
+
+#include <linux/module.h>
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+
+const unsigned short confindex=0x3F0,confdata=0x3F1;
+const unsigned char spcidx=0xEE;
+
+spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
+
+static int __init viahss_init(void)
+{
+        struct pci_dev *pcidev = NULL;
+        unsigned char confval,val;
+        pcidev = pci_find_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
+        if (pcidev) {
+                spin_lock_irq(&driver_lock);
+                /* start config */
+                pci_read_config_byte(pcidev,0x85,&confval);
+                confval |= 0x2;
+                pci_write_config_byte (pcidev, 0x85,confval);
+                /* activate high speed bits */
+                outb(spcidx,confindex); /* set index */
+                val = (unsigned char) inb(confdata);
+                val |= 0xC0;        /* both ports on high speed*/
+                outb (spcidx,confindex);
+                outb (val,confdata);
+                /*stop config*/
+                confval &= ~0x2;
+                pci_write_config_byte(pcidev, 0x85, confval);
+                spin_unlock_irq(&driver_lock);
+                printk (KERN_INFO "VIA VT82C686[AB] serial port high speed enabled\n");
+        }
+        else {
+                printk (KERN_INFO "Couldn't locate VIA chipset\n");
+                return -ENODEV;
+        }
+        return 0;
+}
+
+static void __exit viahss_exit(void)
+{
+        struct pci_dev *pcidev = NULL;
+        unsigned char confval,val;
+        pcidev = pci_find_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
+        if (pcidev) {
+                spin_lock_irq(&driver_lock);
+                /* start config */
+                pci_read_config_byte(pcidev,0x85,&confval);
+                confval |= 0x2;
+                pci_write_config_byte (pcidev, 0x85,confval);
+                /* activate high speed bits */
+                outb(spcidx,confindex); /* set index */
+                val = (unsigned char) inb(confdata);
+                val &= ~0xC0;        /* both ports off high speed*/
+                outb (spcidx,confindex);
+                outb (val,confdata);
+                /*stop config*/
+                confval &= ~0x2;
+                pci_write_config_byte(pcidev, 0x85, confval);
+                spin_unlock_irq(&driver_lock);
+				printk (KERN_INFO "VIA VT82C686[AB] serial port high speed disabled\n");
+        }
+}
+
+module_init(viahss_init);
+module_exit(viahss_exit);
+MODULE_DESCRIPTION("VIA VT82C686[AB] high speed serial port enabler");
+MODULE_AUTHOR("Juhani Rautiainen <jrauti@iki.fi>");
@@ -0,0 +1,20 @@
+--- linux-2.6.35-rc6-git-mnb0.1/3rdparty/viahss/viahss.c.orig	2010-07-30 21:17:30.000000000 +0300
+++ linux-2.6.35-rc6-git-mnb0.1/3rdparty/viahss/viahss.c	2010-07-30 23:10:21.324978822 +0300
+@@ -25,7 +25,7 @@ static int __init viahss_init(void)
+ {
+         struct pci_dev *pcidev = NULL;
+         unsigned char confval,val;
+-        pcidev = pci_find_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
+        pcidev = pci_get_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
+         if (pcidev) {
+                 spin_lock_irq(&driver_lock);
+                 /* start config */
+@@ -55,7 +55,7 @@ static void __exit viahss_exit(void)
+ {
+         struct pci_dev *pcidev = NULL;
+         unsigned char confval,val;
+-        pcidev = pci_find_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
+        pcidev = pci_get_device (PCI_VENDOR_ID_VIA,PCI_DEVICE_ID_VIA_82C686,NULL);
+         if (pcidev) {
+                 spin_lock_irq(&driver_lock);
+                 /* start config */
@@ -0,0 +1,19 @@
+
+fix build with 3.0
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+ 3rdparty/viahss/viahss.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/3rdparty/viahss/viahss.c.orig	2011-07-15 02:37:27.000000000 +0300
+++ a/3rdparty/viahss/viahss.c	2011-07-15 13:48:13.204291256 +0300
+@@ -19,7 +19,7 @@
+ const unsigned short confindex=0x3F0,confdata=0x3F1;
+ const unsigned char spcidx=0xEE;
+ 
+-spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(driver_lock);
+ 
+ static int __init viahss_init(void)
+ {
@@ -0,0 +1,18 @@
+linux/config.h is gone in 2.6.21
+
+---
+ 3rdparty/viahss/viahss.c |    1 	0 +	1 -	0 !
+ 1 files changed, 1 deletion(-)
+
+Index: linux-2.6.21/3rdparty/viahss/viahss.c
+===================================================================
+--- linux-2.6.21.orig/3rdparty/viahss/viahss.c	2003-07-17 08:49:59.000000000 +0200
+++ linux-2.6.21/3rdparty/viahss/viahss.c	2007-05-14 17:06:56.000000000 +0200
+@@ -12,7 +12,6 @@
+ */
+ 
+ #include <linux/module.h>
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/init.h>
+ #include <linux/pci.h>
@@ -0,0 +1,7 @@
+--- linux-2.6.25/3rdparty/viahss/viahss.c.orig	2008-06-28 22:50:05.000000000 +0300
+++ linux-2.6.25/3rdparty/viahss/viahss.c	2008-06-29 14:26:55.000000000 +0300
+@@ -80,3 +80,4 @@ module_init(viahss_init);
+ module_exit(viahss_exit);
+ MODULE_DESCRIPTION("VIA VT82C686[AB] high speed serial port enabler");
+ MODULE_AUTHOR("Juhani Rautiainen <jrauti@iki.fi>");
+MODULE_LICENSE("GPL");
@@ -0,0 +1,3 @@
+# Mageia SVN does not like binaries in /packages tree
+# it can still be used for out ov svn builds
+
@@ -0,0 +1,128 @@
+From 4ec212f003d2430b0b2748b8a3008255f39cfe13 Mon Sep 17 00:00:00 2001
+From: Mathias Gottschlag <mgottschlag@gmail.com>
+Date: Sat, 7 Mar 2015 13:31:45 -0800
+Subject: [PATCH 3/4] Input: psmouse - disable changing resolution/rate/scale
+ for FocalTech
+
+These PS/2 commands make some touchpads stop responding, so this commit
+adds some dummy functions to replace the generic implementation. Because
+scale changes were not encapsulated in a method of struct psmouse yet, this
+commit adds a method set_scale to psmouse.
+
+Signed-off-by: Mathias Gottschlag <mgottschlag@gmail.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+---
+ drivers/input/mouse/focaltech.c    | 25 +++++++++++++++++++++++++
+ drivers/input/mouse/psmouse-base.c | 14 +++++++++++++-
+ drivers/input/mouse/psmouse.h      |  6 ++++++
+ 3 files changed, 44 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
+index c66e0e0..891a271 100644
+--- a/drivers/input/mouse/focaltech.c
+++ b/drivers/input/mouse/focaltech.c
+@@ -386,6 +386,23 @@ static int focaltech_read_size(struct psmouse *psmouse)
+ 
+ 	return 0;
+ }
+
+void focaltech_set_resolution(struct psmouse *psmouse, unsigned int resolution)
+{
+	/* not supported yet */
+}
+
+static void focaltech_set_rate(struct psmouse *psmouse, unsigned int rate)
+{
+	/* not supported yet */
+}
+
+static void focaltech_set_scale(struct psmouse *psmouse,
+				enum psmouse_scale scale)
+{
+	/* not supported yet */
+}
+
+ int focaltech_init(struct psmouse *psmouse)
+ {
+ 	struct focaltech_data *priv;
+@@ -420,6 +437,14 @@ int focaltech_init(struct psmouse *psmouse)
+ 	psmouse->cleanup = focaltech_reset;
+ 	/* resync is not supported yet */
+ 	psmouse->resync_time = 0;
+	/*
+	 * rate/resolution/scale changes are not supported yet, and
+	 * the generic implementations of these functions seem to
+	 * confuse some touchpads
+	 */
+	psmouse->set_resolution = focaltech_set_resolution;
+	psmouse->set_rate = focaltech_set_rate;
+	psmouse->set_scale = focaltech_set_scale;
+ 
+ 	return 0;
+ 
+diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
+index 4ccd01d..8bc6123 100644
+--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
+@@ -454,6 +454,17 @@ static void psmouse_set_rate(struct psmouse *psmouse, unsigned int rate)
+ }
+ 
+ /*
+ * Here we set the mouse scaling.
+ */
+
+static void psmouse_set_scale(struct psmouse *psmouse, enum psmouse_scale scale)
+{
+	ps2_command(&psmouse->ps2dev, NULL,
+		    scale == PSMOUSE_SCALE21 ? PSMOUSE_CMD_SETSCALE21 :
+					       PSMOUSE_CMD_SETSCALE11);
+}
+
+/*
+  * psmouse_poll() - default poll handler. Everyone except for ALPS uses it.
+  */
+ 
+@@ -689,6 +700,7 @@ static void psmouse_apply_defaults(struct psmouse *psmouse)
+ 
+ 	psmouse->set_rate = psmouse_set_rate;
+ 	psmouse->set_resolution = psmouse_set_resolution;
+	psmouse->set_scale = psmouse_set_scale;
+ 	psmouse->poll = psmouse_poll;
+ 	psmouse->protocol_handler = psmouse_process_byte;
+ 	psmouse->pktsize = 3;
+@@ -1160,7 +1172,7 @@ static void psmouse_initialize(struct psmouse *psmouse)
+ 	if (psmouse_max_proto != PSMOUSE_PS2) {
+ 		psmouse->set_rate(psmouse, psmouse->rate);
+ 		psmouse->set_resolution(psmouse, psmouse->resolution);
+-		ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSCALE11);
+		psmouse->set_scale(psmouse, PSMOUSE_SCALE11);
+ 	}
+ }
+ 
+diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
+index c2ff137..d02e1bd 100644
+--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
+@@ -36,6 +36,11 @@ typedef enum {
+ 	PSMOUSE_FULL_PACKET
+ } psmouse_ret_t;
+ 
+enum psmouse_scale {
+	PSMOUSE_SCALE11,
+	PSMOUSE_SCALE21
+};
+
+ struct psmouse {
+ 	void *private;
+ 	struct input_dev *dev;
+@@ -67,6 +72,7 @@ struct psmouse {
+ 	psmouse_ret_t (*protocol_handler)(struct psmouse *psmouse);
+ 	void (*set_rate)(struct psmouse *psmouse, unsigned int rate);
+ 	void (*set_resolution)(struct psmouse *psmouse, unsigned int resolution);
+	void (*set_scale)(struct psmouse *psmouse, enum psmouse_scale scale);
+ 
+ 	int (*reconnect)(struct psmouse *psmouse);
+ 	void (*disconnect)(struct psmouse *psmouse);
+-- 
+2.3.1
+
@@ -0,0 +1,41 @@
+From 4eb8d6e7e5aa14572bc389e554aad9869188cdcd Mon Sep 17 00:00:00 2001
+From: Mathias Gottschlag <mgottschlag@gmail.com>
+Date: Sat, 7 Mar 2015 13:38:27 -0800
+Subject: [PATCH 4/4] Input: psmouse - disable "palm detection" in the
+ focaltech driver
+
+Apparently, the threshold for large contact area seems to be rather low on
+some devices, causing the touchpad to frequently freeze during normal
+usage. Because we do now know how we are supposed to use the value in
+question, this commit just drops the related code completely.
+
+Signed-off-by: Mathias Gottschlag <mgottschlag@gmail.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+---
+ drivers/input/mouse/focaltech.c | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
+index 891a271..23d2594 100644
+--- a/drivers/input/mouse/focaltech.c
+++ b/drivers/input/mouse/focaltech.c
+@@ -185,16 +185,6 @@ static void focaltech_process_abs_packet(struct psmouse *psmouse,
+ 
+ 	state->pressed = (packet[0] >> 4) & 1;
+ 
+-	/*
+-	 * packet[5] contains some kind of tool size in the most
+-	 * significant nibble. 0xff is a special value (latching) that
+-	 * signals a large contact area.
+-	 */
+-	if (packet[5] == 0xff) {
+-		state->fingers[finger].valid = false;
+-		return;
+-	}
+-
+ 	state->fingers[finger].x = ((packet[1] & 0xf) << 8) | packet[2];
+ 	state->fingers[finger].y = (packet[3] << 8) | packet[4];
+ 	state->fingers[finger].valid = true;
+-- 
+2.3.1
+
@@ -0,0 +1,44 @@
+From 679d83ea9390636ded518f533af0cefbade317c7 Mon Sep 17 00:00:00 2001
+From: Mathias Gottschlag <mgottschlag@gmail.com>
+Date: Sat, 7 Mar 2015 13:26:43 -0800
+Subject: [PATCH 2/4] Input: psmouse - ensure that focaltech reports consistent
+ coordinates
+
+We don't know whether x_max or y_max really hold the maximum possible
+coordinates, and we don't know for sure whether we correctly interpret the
+coordinates sent by the touchpad, so we clamp the reported values to
+prevent confusion in userspace code.
+
+Signed-off-by: Mathias Gottschlag <mgottschlag@gmail.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+---
+ drivers/input/mouse/focaltech.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
+index e8fafe8..c66e0e0 100644
+--- a/drivers/input/mouse/focaltech.c
+++ b/drivers/input/mouse/focaltech.c
+@@ -126,9 +126,17 @@ static void focaltech_report_state(struct psmouse *psmouse)
+ 		input_mt_slot(dev, i);
+ 		input_mt_report_slot_state(dev, MT_TOOL_FINGER, active);
+ 		if (active) {
+-			input_report_abs(dev, ABS_MT_POSITION_X, finger->x);
+			unsigned int clamped_x, clamped_y;
+			/*
+			 * The touchpad might report invalid data, so we clamp
+			 * the resulting values so that we do not confuse
+			 * userspace.
+			 */
+			clamped_x = clamp(finger->x, 0U, priv->x_max);
+			clamped_y = clamp(finger->y, 0U, priv->y_max);
+			input_report_abs(dev, ABS_MT_POSITION_X, clamped_x);
+ 			input_report_abs(dev, ABS_MT_POSITION_Y,
+-					 priv->y_max - finger->y);
+					 priv->y_max - clamped_y);
+ 		}
+ 	}
+ 	input_mt_report_pointer_emulation(dev, true);
+-- 
+2.3.1
+
@@ -0,0 +1,41 @@
+From 3e9845251926723319fb60c9e546fe42d3d11687 Mon Sep 17 00:00:00 2001
+From: Mathias Gottschlag <mgottschlag@gmail.com>
+Date: Sat, 7 Mar 2015 13:26:06 -0800
+Subject: [PATCH 1/4] Input: psmouse - remove hardcoded touchpad size from the
+ focaltech driver
+
+The size has in most cases already been fetched from the touchpad, the
+hardcoded values should have been removed.
+
+Signed-off-by: Mathias Gottschlag <mgottschlag@gmail.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+---
+ drivers/input/mouse/focaltech.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
+index 757f78a..e8fafe8 100644
+--- a/drivers/input/mouse/focaltech.c
+++ b/drivers/input/mouse/focaltech.c
+@@ -67,9 +67,6 @@ static void focaltech_reset(struct psmouse *psmouse)
+ 
+ #define FOC_MAX_FINGERS 5
+ 
+-#define FOC_MAX_X 2431
+-#define FOC_MAX_Y 1663
+-
+ /*
+  * Current state of a single finger on the touchpad.
+  */
+@@ -131,7 +128,7 @@ static void focaltech_report_state(struct psmouse *psmouse)
+ 		if (active) {
+ 			input_report_abs(dev, ABS_MT_POSITION_X, finger->x);
+ 			input_report_abs(dev, ABS_MT_POSITION_Y,
+-					 FOC_MAX_Y - finger->y);
+					 priv->y_max - finger->y);
+ 		}
+ 	}
+ 	input_mt_report_pointer_emulation(dev, true);
+-- 
+2.3.1
+
@@ -0,0 +1,585 @@
+From 05be1d079ec0b3691783e4384b1ada82149ff7d2 Mon Sep 17 00:00:00 2001
+From: Mathias Gottschlag <mgottschlag@gmail.com>
+Date: Mon, 29 Dec 2014 09:26:10 -0800
+Subject: [PATCH] Input: psmouse - support for the FocalTech PS/2 protocol
+ extensions
+
+Most of the protocol for these touchpads has been reverse engineered. This
+commit adds a basic multitouch-capable driver.
+
+A lot of the protocol is still unknown. Especially, we don't know how to
+identify the device yet apart from the PNP ID.
+
+The previous workaround for these devices has been left in place in case
+the driver is not compiled into the kernel or in case some other device
+with the same PNP ID is not recognized by the driver yet still has the same
+problems with the device probing code.
+
+Signed-off-by: Mathias Gottschlag <mgottschlag@gmail.com>
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+---
+ drivers/input/mouse/Kconfig        |  10 +
+ drivers/input/mouse/focaltech.c    | 408 ++++++++++++++++++++++++++++++++++++-
+ drivers/input/mouse/focaltech.h    |   2 +
+ drivers/input/mouse/psmouse-base.c |  32 ++-
+ drivers/input/mouse/psmouse.h      |   1 +
+ 5 files changed, 436 insertions(+), 17 deletions(-)
+
+diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
+index d8b46b0..2541bfa 100644
+--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
+@@ -146,6 +146,16 @@ config MOUSE_PS2_OLPC
+ 
+ 	  If unsure, say N.
+ 
+config MOUSE_PS2_FOCALTECH
+	bool "FocalTech PS/2 mouse protocol extension" if EXPERT
+	default y
+	depends on MOUSE_PS2
+	help
+	  Say Y here if you have a FocalTech PS/2 TouchPad connected to
+	  your system.
+
+	  If unsure, say Y.
+
+ config MOUSE_SERIAL
+ 	tristate "Serial mouse"
+ 	select SERIO
+diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
+index f4d657e..fca38ba 100644
+--- a/drivers/input/mouse/focaltech.c
+++ b/drivers/input/mouse/focaltech.c
+@@ -2,6 +2,7 @@
+  * Focaltech TouchPad PS/2 mouse driver
+  *
+  * Copyright (c) 2014 Red Hat Inc.
+ * Copyright (c) 2014 Mathias Gottschlag <mgottschlag@gmail.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -13,15 +14,14 @@
+  * Hans de Goede <hdegoede@redhat.com>
+  */
+ 
+-/*
+- * The Focaltech PS/2 touchpad protocol is unknown. This drivers deals with
+- * detection only, to avoid further detection attempts confusing the touchpad
+- * this way it at least works in PS/2 mouse compatibility mode.
+- */
+ 
+ #include <linux/device.h>
+ #include <linux/libps2.h>
+#include <linux/input/mt.h>
+#include <linux/serio.h>
+#include <linux/slab.h>
+ #include "psmouse.h"
+#include "focaltech.h"
+ 
+ static const char * const focaltech_pnp_ids[] = {
+ 	"FLT0101",
+@@ -30,6 +30,12 @@ static const char * const focaltech_pnp_ids[] = {
+ 	NULL
+ };
+ 
+/*
+ * Even if the kernel is built without support for Focaltech PS/2 touchpads (or
+ * when the real driver fails to recognize the device), we still have to detect
+ * them in order to avoid further detection attempts confusing the touchpad.
+ * This way it at least works in PS/2 mouse compatibility mode.
+ */
+ int focaltech_detect(struct psmouse *psmouse, bool set_properties)
+ {
+ 	if (!psmouse_matches_pnp_id(psmouse, focaltech_pnp_ids))
+@@ -37,16 +43,404 @@ int focaltech_detect(struct psmouse *psmouse, bool set_properties)
+ 
+ 	if (set_properties) {
+ 		psmouse->vendor = "FocalTech";
+-		psmouse->name = "FocalTech Touchpad in mouse emulation mode";
+		psmouse->name = "FocalTech Touchpad";
+ 	}
+ 
+ 	return 0;
+ }
+ 
+-int focaltech_init(struct psmouse *psmouse)
+static void focaltech_reset(struct psmouse *psmouse)
+ {
+ 	ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);
+ 	psmouse_reset(psmouse);
+}
+
+#ifdef CONFIG_MOUSE_PS2_FOCALTECH
+
+/*
+ * Packet types - the numbers are not consecutive, so we might be missing
+ * something here.
+ */
+#define FOC_TOUCH 0x3 /* bitmap of active fingers */
+#define FOC_ABS 0x6 /* absolute position of one finger */
+#define FOC_REL 0x9 /* relative position of 1-2 fingers */
+
+#define FOC_MAX_FINGERS 5
+
+#define FOC_MAX_X 2431
+#define FOC_MAX_Y 1663
+
+/*
+ * Current state of a single finger on the touchpad.
+ */
+struct focaltech_finger_state {
+	/* The touchpad has generated a touch event for the finger */
+	bool active;
+
+	/*
+	 * The touchpad has sent position data for the finger. The
+	 * flag is 0 when the finger is not active, and there is a
+	 * time between the first touch event for the finger and the
+	 * following absolute position packet for the finger where the
+	 * touchpad has declared the finger to be valid, but we do not
+	 * have any valid position yet.
+	 */
+	bool valid;
+
+	/*
+	 * Absolute position (from the bottom left corner) of the
+	 * finger.
+	 */
+	unsigned int x;
+	unsigned int y;
+};
+
+/*
+ * Description of the current state of the touchpad hardware.
+ */
+struct focaltech_hw_state {
+	/*
+	 * The touchpad tracks the positions of the fingers for us,
+	 * the array indices correspond to the finger indices returned
+	 * in the report packages.
+	 */
+	struct focaltech_finger_state fingers[FOC_MAX_FINGERS];
+
+	/* True if the clickpad has been pressed. */
+	bool pressed;
+};
+
+struct focaltech_data {
+	unsigned int x_max, y_max;
+	struct focaltech_hw_state state;
+};
+
+static void focaltech_report_state(struct psmouse *psmouse)
+{
+	struct focaltech_data *priv = psmouse->private;
+	struct focaltech_hw_state *state = &priv->state;
+	struct input_dev *dev = psmouse->dev;
+	int i;
+
+	for (i = 0; i < FOC_MAX_FINGERS; i++) {
+		struct focaltech_finger_state *finger = &state->fingers[i];
+		bool active = finger->active && finger->valid;
+
+		input_mt_slot(dev, i);
+		input_mt_report_slot_state(dev, MT_TOOL_FINGER, active);
+		if (active) {
+			input_report_abs(dev, ABS_MT_POSITION_X, finger->x);
+			input_report_abs(dev, ABS_MT_POSITION_Y,
+					 FOC_MAX_Y - finger->y);
+		}
+	}
+	input_mt_report_pointer_emulation(dev, true);
+
+	input_report_key(psmouse->dev, BTN_LEFT, state->pressed);
+	input_sync(psmouse->dev);
+}
+
+static void focaltech_process_touch_packet(struct psmouse *psmouse,
+					   unsigned char *packet)
+{
+	struct focaltech_data *priv = psmouse->private;
+	struct focaltech_hw_state *state = &priv->state;
+	unsigned char fingers = packet[1];
+	int i;
+
+	state->pressed = (packet[0] >> 4) & 1;
+
+	/* the second byte contains a bitmap of all fingers touching the pad */
+	for (i = 0; i < FOC_MAX_FINGERS; i++) {
+		state->fingers[i].active = fingers & 0x1;
+		if (!state->fingers[i].active) {
+			/*
+			 * Even when the finger becomes active again, we still
+			 * will have to wait for the first valid position.
+			 */
+			state->fingers[i].valid = false;
+		}
+		fingers >>= 1;
+	}
+}
+
+static void focaltech_process_abs_packet(struct psmouse *psmouse,
+					 unsigned char *packet)
+{
+	struct focaltech_data *priv = psmouse->private;
+	struct focaltech_hw_state *state = &priv->state;
+	unsigned int finger;
+
+	finger = (packet[1] >> 4) - 1;
+	if (finger >= FOC_MAX_FINGERS) {
+		psmouse_err(psmouse, "Invalid finger in abs packet: %d\n",
+			    finger);
+		return;
+	}
+
+	state->pressed = (packet[0] >> 4) & 1;
+
+	/*
+	 * packet[5] contains some kind of tool size in the most
+	 * significant nibble. 0xff is a special value (latching) that
+	 * signals a large contact area.
+	 */
+	if (packet[5] == 0xff) {
+		state->fingers[finger].valid = false;
+		return;
+	}
+
+	state->fingers[finger].x = ((packet[1] & 0xf) << 8) | packet[2];
+	state->fingers[finger].y = (packet[3] << 8) | packet[4];
+	state->fingers[finger].valid = true;
+}
+
+static void focaltech_process_rel_packet(struct psmouse *psmouse,
+					 unsigned char *packet)
+{
+	struct focaltech_data *priv = psmouse->private;
+	struct focaltech_hw_state *state = &priv->state;
+	int finger1, finger2;
+
+	state->pressed = packet[0] >> 7;
+	finger1 = ((packet[0] >> 4) & 0x7) - 1;
+	if (finger1 < FOC_MAX_FINGERS) {
+		state->fingers[finger1].x += (char)packet[1];
+		state->fingers[finger1].y += (char)packet[2];
+	} else {
+		psmouse_err(psmouse, "First finger in rel packet invalid: %d\n",
+			    finger1);
+	}
+
+	/*
+	 * If there is an odd number of fingers, the last relative
+	 * packet only contains one finger. In this case, the second
+	 * finger index in the packet is 0 (we subtract 1 in the lines
+	 * above to create array indices, so the finger will overflow
+	 * and be above FOC_MAX_FINGERS).
+	 */
+	finger2 = ((packet[3] >> 4) & 0x7) - 1;
+	if (finger2 < FOC_MAX_FINGERS) {
+		state->fingers[finger2].x += (char)packet[4];
+		state->fingers[finger2].y += (char)packet[5];
+	}
+}
+
+static void focaltech_process_packet(struct psmouse *psmouse)
+{
+	unsigned char *packet = psmouse->packet;
+
+	switch (packet[0] & 0xf) {
+	case FOC_TOUCH:
+		focaltech_process_touch_packet(psmouse, packet);
+		break;
+
+	case FOC_ABS:
+		focaltech_process_abs_packet(psmouse, packet);
+		break;
+
+	case FOC_REL:
+		focaltech_process_rel_packet(psmouse, packet);
+		break;
+
+	default:
+		psmouse_err(psmouse, "Unknown packet type: %02x\n", packet[0]);
+		break;
+	}
+
+	focaltech_report_state(psmouse);
+}
+
+static psmouse_ret_t focaltech_process_byte(struct psmouse *psmouse)
+{
+	if (psmouse->pktcnt >= 6) { /* Full packet received */
+		focaltech_process_packet(psmouse);
+		return PSMOUSE_FULL_PACKET;
+	}
+
+	/*
+	 * We might want to do some validation of the data here, but
+	 * we do not know the protocol well enough
+	 */
+	return PSMOUSE_GOOD_DATA;
+}
+
+static int focaltech_switch_protocol(struct psmouse *psmouse)
+{
+	struct ps2dev *ps2dev = &psmouse->ps2dev;
+	unsigned char param[3];
+
+	param[0] = 0;
+	if (ps2_command(ps2dev, param, 0x10f8))
+		return -EIO;
+
+	if (ps2_command(ps2dev, param, 0x10f8))
+		return -EIO;
+
+	if (ps2_command(ps2dev, param, 0x10f8))
+		return -EIO;
+
+	param[0] = 1;
+	if (ps2_command(ps2dev, param, 0x10f8))
+		return -EIO;
+
+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETSCALE11))
+		return -EIO;
+
+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_ENABLE))
+		return -EIO;
+
+	return 0;
+}
+
+static void focaltech_disconnect(struct psmouse *psmouse)
+{
+	focaltech_reset(psmouse);
+	kfree(psmouse->private);
+	psmouse->private = NULL;
+}
+
+static int focaltech_reconnect(struct psmouse *psmouse)
+{
+	int error;
+
+	focaltech_reset(psmouse);
+
+	error = focaltech_switch_protocol(psmouse);
+	if (error) {
+		psmouse_err(psmouse, "Unable to initialize the device\n");
+		return error;
+	}
+
+	return 0;
+}
+
+static void focaltech_set_input_params(struct psmouse *psmouse)
+{
+	struct input_dev *dev = psmouse->dev;
+	struct focaltech_data *priv = psmouse->private;
+
+	/*
+	 * Undo part of setup done for us by psmouse core since touchpad
+	 * is not a relative device.
+	 */
+	__clear_bit(EV_REL, dev->evbit);
+	__clear_bit(REL_X, dev->relbit);
+	__clear_bit(REL_Y, dev->relbit);
+	__clear_bit(BTN_RIGHT, dev->keybit);
+	__clear_bit(BTN_MIDDLE, dev->keybit);
+
+	/*
+	 * Now set up our capabilities.
+	 */
+	__set_bit(EV_ABS, dev->evbit);
+	input_set_abs_params(dev, ABS_MT_POSITION_X, 0, priv->x_max, 0, 0);
+	input_set_abs_params(dev, ABS_MT_POSITION_Y, 0, priv->y_max, 0, 0);
+	input_mt_init_slots(dev, 5, INPUT_MT_POINTER);
+	__set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
+}
+
+static int focaltech_read_register(struct ps2dev *ps2dev, int reg,
+				   unsigned char *param)
+{
+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETSCALE11))
+		return -EIO;
+
+	param[0] = 0;
+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES))
+		return -EIO;
+
+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES))
+		return -EIO;
+
+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES))
+		return -EIO;
+
+	param[0] = reg;
+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES))
+		return -EIO;
+
+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))
+		return -EIO;
+
+	return 0;
+}
+
+static int focaltech_read_size(struct psmouse *psmouse)
+{
+	struct ps2dev *ps2dev = &psmouse->ps2dev;
+	struct focaltech_data *priv = psmouse->private;
+	char param[3];
+
+	if (focaltech_read_register(ps2dev, 2, param))
+		return -EIO;
+
+	/* not sure whether this is 100% correct */
+	priv->x_max = (unsigned char)param[1] * 128;
+	priv->y_max = (unsigned char)param[2] * 128;
+
+	return 0;
+}
+int focaltech_init(struct psmouse *psmouse)
+{
+	struct focaltech_data *priv;
+	int error;
+
+	psmouse->private = priv = kzalloc(sizeof(struct focaltech_data),
+					  GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
+
+	focaltech_reset(psmouse);
+
+	error = focaltech_read_size(psmouse);
+	if (error) {
+		psmouse_err(psmouse,
+			    "Unable to read the size of the touchpad\n");
+		goto fail;
+	}
+
+	error = focaltech_switch_protocol(psmouse);
+	if (error) {
+		psmouse_err(psmouse, "Unable to initialize the device\n");
+		goto fail;
+	}
+
+	focaltech_set_input_params(psmouse);
+
+	psmouse->protocol_handler = focaltech_process_byte;
+	psmouse->pktsize = 6;
+	psmouse->disconnect = focaltech_disconnect;
+	psmouse->reconnect = focaltech_reconnect;
+	psmouse->cleanup = focaltech_reset;
+	/* resync is not supported yet */
+	psmouse->resync_time = 0;
+ 
+ 	return 0;
+
+fail:
+	focaltech_reset(psmouse);
+	kfree(priv);
+	return error;
+ }
+
+bool focaltech_supported(void)
+{
+	return true;
+}
+
+#else /* CONFIG_MOUSE_PS2_FOCALTECH */
+
+int focaltech_init(struct psmouse *psmouse)
+{
+	focaltech_reset(psmouse);
+
+	return 0;
+}
+
+bool focaltech_supported(void)
+{
+	return false;
+}
+
+#endif /* CONFIG_MOUSE_PS2_FOCALTECH */
+diff --git a/drivers/input/mouse/focaltech.h b/drivers/input/mouse/focaltech.h
+index 498650c..71870a9 100644
+--- a/drivers/input/mouse/focaltech.h
+++ b/drivers/input/mouse/focaltech.h
+@@ -2,6 +2,7 @@
+  * Focaltech TouchPad PS/2 mouse driver
+  *
+  * Copyright (c) 2014 Red Hat Inc.
+ * Copyright (c) 2014 Mathias Gottschlag <mgottschlag@gmail.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -18,5 +19,6 @@
+ 
+ int focaltech_detect(struct psmouse *psmouse, bool set_properties);
+ int focaltech_init(struct psmouse *psmouse);
+bool focaltech_supported(void);
+ 
+ #endif
+diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
+index 26994f6..4a9de33 100644
+--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
+@@ -725,16 +725,19 @@ static int psmouse_extensions(struct psmouse *psmouse,
+ 
+ /* Always check for focaltech, this is safe as it uses pnp-id matching */
+ 	if (psmouse_do_detect(focaltech_detect, psmouse, set_properties) == 0) {
+-		if (!set_properties || focaltech_init(psmouse) == 0) {
+-			/*
+-			 * Not supported yet, use bare protocol.
+-			 * Note that we need to also restrict
+-			 * psmouse_max_proto so that psmouse_initialize()
+-			 * does not try to reset rate and resolution,
+-			 * because even that upsets the device.
+-			 */
+-			psmouse_max_proto = PSMOUSE_PS2;
+-			return PSMOUSE_PS2;
+		if (max_proto > PSMOUSE_IMEX) {
+			if (!set_properties || focaltech_init(psmouse) == 0) {
+				if (focaltech_supported())
+					return PSMOUSE_FOCALTECH;
+				/*
+				 * Note that we need to also restrict
+				 * psmouse_max_proto so that psmouse_initialize()
+				 * does not try to reset rate and resolution,
+				 * because even that upsets the device.
+				 */
+				psmouse_max_proto = PSMOUSE_PS2;
+				return PSMOUSE_PS2;
+			}
+ 		}
+ 	}
+ 
+@@ -1063,6 +1066,15 @@ static const struct psmouse_protocol psmouse_protocols[] = {
+ 		.alias		= "cortps",
+ 		.detect		= cortron_detect,
+ 	},
+#ifdef CONFIG_MOUSE_PS2_FOCALTECH
+	{
+		.type		= PSMOUSE_FOCALTECH,
+		.name		= "FocalTechPS/2",
+		.alias		= "focaltech",
+		.detect		= focaltech_detect,
+		.init		= focaltech_init,
+	},
+#endif
+ 	{
+ 		.type		= PSMOUSE_AUTO,
+ 		.name		= "auto",
+diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
+index f4cf664..c2ff137 100644
+--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
+@@ -96,6 +96,7 @@ enum psmouse_type {
+ 	PSMOUSE_FSP,
+ 	PSMOUSE_SYNAPTICS_RELATIVE,
+ 	PSMOUSE_CYPRESS,
+	PSMOUSE_FOCALTECH,
+ 	PSMOUSE_AUTO		/* This one should always be last */
+ };
+ 
+-- 
+2.3.1
+
@@ -0,0 +1,28 @@
+From 6557bada461afeaa920a189fae2cff7c8fdce39f Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 9 Feb 2015 14:24:47 -0500
+Subject: [PATCH] KVM: ia64: drop kvm.h from installed user headers
+
+The header was deleted, so stop trying to install it.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+---
+ arch/ia64/include/uapi/asm/Kbuild | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild
+index 1b3f5eb..891002b 100644
+--- a/arch/ia64/include/uapi/asm/Kbuild
+++ b/arch/ia64/include/uapi/asm/Kbuild
+@@ -18,7 +18,6 @@ header-y += intrinsics.h
+ header-y += ioctl.h
+ header-y += ioctls.h
+ header-y += ipcbuf.h
+-header-y += kvm.h
+ header-y += kvm_para.h
+ header-y += mman.h
+ header-y += msgbuf.h
+-- 
+2.3.0
+
@@ -0,0 +1,32 @@
+From 88299efb05387c2c94120fdc9661aab2ec3a1ad8 Mon Sep 17 00:00:00 2001
+From: Thomas Backlund <tmb@mageia.org>
+Date: Fri, 3 Apr 2015 00:10:34 +0259
+Subject: [PATCH] Revert "cpufreq: pcc: Enable autoload of pcc-cpufreq for ACPI
+ processors"
+
+This reverts commit 7e7e8fe69820c6fa31395dbbd8e348e3c69cd2a9.
+---
+ drivers/cpufreq/pcc-cpufreq.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c
+index 2a0d589..4d2c8e8 100644
+--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
+@@ -603,13 +603,6 @@ static void __exit pcc_cpufreq_exit(void)
+ 	free_percpu(pcc_cpu_info);
+ }
+ 
+-static const struct acpi_device_id processor_device_ids[] = {
+-	{ACPI_PROCESSOR_OBJECT_HID, },
+-	{ACPI_PROCESSOR_DEVICE_HID, },
+-	{},
+-};
+-MODULE_DEVICE_TABLE(acpi, processor_device_ids);
+-
+ MODULE_AUTHOR("Matthew Garrett, Naga Chumbalkar");
+ MODULE_VERSION(PCC_VERSION);
+ MODULE_DESCRIPTION("Processor Clocking Control interface driver");
+-- 
+2.3.1
+
@@ -0,0 +1,45 @@
+From 796888e942b34cbbd738d9e5478b7d103ee38061 Mon Sep 17 00:00:00 2001
+From: Bob Moore <robert.moore@intel.com>
+Date: Mon, 13 Apr 2015 11:50:37 +0800
+Subject: [PATCH] ACPICA: Add "Windows 2015" string to _OSI support.
+
+ACPICA commit b293f602a67da478ae0bec129e68bd99787d9908
+
+This change adds this string for Windows 10.
+
+Link: https://github.com/acpica/acpica/commit/b293f602
+Signed-off-by: Bob Moore <robert.moore@intel.com>
+Signed-off-by: Lv Zheng <lv.zheng@intel.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+ drivers/acpi/acpica/utosi.c | 1 +
+ include/acpi/actypes.h      | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c
+index 574cd31..44035ab 100644
+--- a/drivers/acpi/acpica/utosi.c
+++ b/drivers/acpi/acpica/utosi.c
+@@ -100,6 +100,7 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = {
+ 	{"Windows 2009", NULL, 0, ACPI_OSI_WIN_7},	/* Windows 7 and Server 2008 R2 - Added 09/2009 */
+ 	{"Windows 2012", NULL, 0, ACPI_OSI_WIN_8},	/* Windows 8 and Server 2012 - Added 08/2012 */
+ 	{"Windows 2013", NULL, 0, ACPI_OSI_WIN_8},	/* Windows 8.1 and Server 2012 R2 - Added 01/2014 */
+	{"Windows 2015", NULL, 0, ACPI_OSI_WIN_10},	/* Windows 10 - Added 03/2015 */
+ 
+ 	/* Feature Group Strings */
+ 
+diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
+index f18b7a8..ace520f 100644
+--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
+@@ -1274,6 +1274,7 @@ struct acpi_memory_list {
+ #define ACPI_OSI_WIN_VISTA_SP2          0x0A
+ #define ACPI_OSI_WIN_7                  0x0B
+ #define ACPI_OSI_WIN_8                  0x0C
+#define ACPI_OSI_WIN_10                 0x0D
+ 
+ /* Definitions of file IO */
+ 
+-- 
+2.3.2
+
@@ -0,0 +1,28 @@
+Subject: CLEVO M360S acpi irq workaround
+
+Some Hardware vendor use CLEVO M360S Laptop OEM.
+This acpi IRQ routing is not correct. we use normal IRQ routing for default.
+
+Signed-off-by: Go Taniguchi <go@turbolinux.co.jp>
+
+---
+ arch/x86/kernel/acpi/boot.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
+@@ -1615,6 +1615,14 @@ static struct dmi_system_id __initdata a
+ 		     },
+ 	 },
+ 	{
+	 .callback = disable_acpi_irq,
+	 .ident = "CLEVO M360S",
+	 .matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "CLEVO Co."),
+		     DMI_MATCH(DMI_PRODUCT_NAME, "M360S"),
+		     },
+	 },
+	{
+ 		/*
+ 		 * Latest BIOS for IBM 600E (1.16) has bad pcinum
+ 		 * for LPC bridge, which is needed for the PCI
@@ -0,0 +1,42 @@
+From 622532bb2fad8fe342fb685727ae0be566f6be5d Mon Sep 17 00:00:00 2001
+From: Witold Szczeponik <Witold.Szczeponik@gmx.net>
+Date: Fri, 1 May 2015 19:05:20 +0200
+Subject: [PATCH] ACPI / PNP: add two IDs to list for PNPACPI device
+ enumeration
+
+Commit eec15edbb0e1 (ACPI / PNP: use device ID list for PNPACPI device
+enumeration) changed the way how ACPI devices are enumerated and when
+they are added to the PNP bus.
+
+However, it broke the sound card support on (at least) a vintage
+IBM ThinkPad 600E: with said commit applied, two of the necessary
+"CSC01xx" devices are not added to the PNP bus and hence can not be
+found during the initialization of the "snd-cs4236" module.  As a
+consequence, loading "snd-cs4236" causes null pointer exceptions.
+The attached patch fixes the problem end re-enables sound on the
+IBM ThinkPad 600E.
+
+Fixes: eec15edbb0e1 (ACPI / PNP: use device ID list for PNPACPI device enumeration)
+Signed-off-by: Witold Szczeponik <Witold.Szczeponik@gmx.net>
+Cc: 3.16+ <stable@vger.kernel.org> # 3.16+
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+ drivers/acpi/acpi_pnp.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c
+index b193f84..ff6d8ad 100644
+--- a/drivers/acpi/acpi_pnp.c
+++ b/drivers/acpi/acpi_pnp.c
+@@ -304,6 +304,8 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {
+ 	{"PNPb006"},
+ 	/* cs423x-pnpbios */
+ 	{"CSC0100"},
+	{"CSC0103"},
+	{"CSC0110"},
+ 	{"CSC0000"},
+ 	{"GIM0100"},		/* Guillemot Turtlebeach something appears to be cs4232 compatible */
+ 	/* es18xx-pnpbios */
+-- 
+2.3.2
+
@@ -0,0 +1,85 @@
+From 3349fb64b2927407017d970dd5c4daf3c5ad69f8 Mon Sep 17 00:00:00 2001
+From: Chris Bainbridge <chris.bainbridge@gmail.com>
+Date: Wed, 29 Apr 2015 21:21:40 +0100
+Subject: [PATCH] ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook
+
+Commit 7bc5a2bad0b8 'ACPI: Support _OSI("Darwin") correctly' caused
+the MacBook firmware to expose the SBS, resulting in intermittent
+hangs of several minutes on boot, and failure to detect or report
+the battery.  Fix this by adding a 5 us delay to the start of each
+SMBUS transaction.  This timing is the result of experimentation -
+hangs were observed with 3 us but never with 5 us.
+
+Fixes: 7bc5a2bad0b8 'ACPI: Support _OSI("Darwin") correctly'
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=94651
+Signed-off-by: Chris Bainbridge <chris.bainbridge@gmail.com>
+Cc: 3.18+ <stable@vger.kernel.org> # 3.18+
+[ rjw: Subject and changelog ]
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+ drivers/acpi/sbshc.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
+index 26e5b50..bf034f8 100644
+--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
+@@ -14,6 +14,7 @@
+ #include <linux/delay.h>
+ #include <linux/module.h>
+ #include <linux/interrupt.h>
+#include <linux/dmi.h>
+ #include "sbshc.h"
+ 
+ #define PREFIX "ACPI: "
+@@ -87,6 +88,8 @@ enum acpi_smb_offset {
+ 	ACPI_SMB_ALARM_DATA = 0x26,	/* 2 bytes alarm data */
+ };
+ 
+static bool macbook;
+
+ static inline int smb_hc_read(struct acpi_smb_hc *hc, u8 address, u8 *data)
+ {
+ 	return ec_read(hc->offset + address, data);
+@@ -132,6 +135,8 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
+ 	}
+ 
+ 	mutex_lock(&hc->lock);
+	if (macbook)
+		udelay(5);
+ 	if (smb_hc_read(hc, ACPI_SMB_PROTOCOL, &temp))
+ 		goto end;
+ 	if (temp) {
+@@ -257,12 +262,29 @@ extern int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
+ 			      acpi_handle handle, acpi_ec_query_func func,
+ 			      void *data);
+ 
+static int macbook_dmi_match(const struct dmi_system_id *d)
+{
+	pr_debug("Detected MacBook, enabling workaround\n");
+	macbook = true;
+	return 0;
+}
+
+static struct dmi_system_id acpi_smbus_dmi_table[] = {
+	{ macbook_dmi_match, "Apple MacBook", {
+	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBook") },
+	},
+	{ },
+};
+
+ static int acpi_smbus_hc_add(struct acpi_device *device)
+ {
+ 	int status;
+ 	unsigned long long val;
+ 	struct acpi_smb_hc *hc;
+ 
+	dmi_check_system(acpi_smbus_dmi_table);
+
+ 	if (!device)
+ 		return -EINVAL;
+ 
+-- 
+2.3.2
+
@@ -0,0 +1,56 @@
+From b9a5e5e18fbf223502c0b2264c15024e393da928 Mon Sep 17 00:00:00 2001
+From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
+Date: Thu, 7 May 2015 21:19:39 +0200
+Subject: ACPI / init: Fix the ordering of acpi_reserve_resources()
+
+Since acpi_reserve_resources() is defined as a device_initcall(),
+there's no guarantee that it will be executed in the right order
+with respect to the rest of the ACPI initialization code.  On some
+systems this leads to breakage if, for example, the address range
+that should be reserved for the ACPI fixed registers is given to
+the PCI host bridge instead if the race is won by the wrong code
+path.
+
+Fix this by turning acpi_reserve_resources() into a void function
+and calling it directly from within the ACPI initialization sequence.
+
+Reported-and-tested-by: George McCollister <george.mccollister@gmail.com>
+Link: http://marc.info/?t=143092384600002&r=1&w=2
+Cc: All applicable <stable@vger.kernel.org>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+
+diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
+index 39748bb..7ccba39 100644
+--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
+@@ -182,7 +182,7 @@ static void __init acpi_request_region (struct acpi_generic_address *gas,
+ 		request_mem_region(addr, length, desc);
+ }
+ 
+-static int __init acpi_reserve_resources(void)
+static void __init acpi_reserve_resources(void)
+ {
+ 	acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block, acpi_gbl_FADT.pm1_event_length,
+ 		"ACPI PM1a_EVT_BLK");
+@@ -211,10 +211,7 @@ static int __init acpi_reserve_resources(void)
+ 	if (!(acpi_gbl_FADT.gpe1_block_length & 0x1))
+ 		acpi_request_region(&acpi_gbl_FADT.xgpe1_block,
+ 			       acpi_gbl_FADT.gpe1_block_length, "ACPI GPE1_BLK");
+-
+-	return 0;
+ }
+-device_initcall(acpi_reserve_resources);
+ 
+ void acpi_os_printf(const char *fmt, ...)
+ {
+@@ -1845,6 +1842,7 @@ acpi_status __init acpi_os_initialize(void)
+ 
+ acpi_status __init acpi_os_initialize1(void)
+ {
+	acpi_reserve_resources();
+ 	kacpid_wq = alloc_workqueue("kacpid", 0, 1);
+ 	kacpi_notify_wq = alloc_workqueue("kacpi_notify", 0, 1);
+ 	kacpi_hotplug_wq = alloc_ordered_workqueue("kacpi_hotplug", 0);
+-- 
+cgit v0.10.2
+
@@ -0,0 +1,21 @@
+Limit Clevo M720SR to C2, going to C3 makes the machine freeze. This
+needs more investigation, sis chipset/bios problem may be?
+
+Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com>
+
+---
+ drivers/acpi/processor_idle.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- linux-2.6.33-rc8-git4-t2/drivers/acpi/processor_idle.c.orig	2010-02-20 12:45:35.000000000 +0200
+++ linux-2.6.33-rc8-git4-t2/drivers/acpi/processor_idle.c	2010-02-20 12:53:39.679099592 +0200
+@@ -110,6 +110,9 @@ static struct dmi_system_id __cpuinitdat
+ 	  DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
+ 	  DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")},
+ 	 (void *)2},
+ 	{ set_max_cstate, "Clevo M720SR", {
+ 	  DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
+ 	  DMI_MATCH(DMI_PRODUCT_NAME,"M720SR")}, (void *)2},
+ 	{ set_max_cstate, "Pavilion zv5000", {
+ 	  DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+ 	  DMI_MATCH(DMI_PRODUCT_NAME,"Pavilion zv5000 (DS502A#ABA)")},
@@ -0,0 +1,34 @@
+From 61f8ff693923e4b19748b0e8287b99778f2661c7 Mon Sep 17 00:00:00 2001
+From: Chris Bainbridge <chris.bainbridge@gmail.com>
+Date: Wed, 22 Apr 2015 16:40:21 +0100
+Subject: ACPI / SBS: Enable battery manager when present
+
+From: Chris Bainbridge <chris.bainbridge@gmail.com>
+
+commit 61f8ff693923e4b19748b0e8287b99778f2661c7 upstream.
+
+Commit 9faf6136ff46 (ACPI / SBS: Disable smart battery manager on
+Apple) introduced a regression disabling the SBS battery manager.
+The battery manager should be marked as present when
+acpi_manager_get_info() returns 0.
+
+Fixes: 9faf6136ff46 (ACPI / SBS: Disable smart battery manager on Apple)
+Signed-off-by: Chris Bainbridge <chris.bainbridge@gmail.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/acpi/sbs.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
+@@ -670,7 +670,7 @@ static int acpi_sbs_add(struct acpi_devi
+ 	if (!sbs_manager_broken) {
+ 		result = acpi_manager_get_info(sbs);
+ 		if (!result) {
+-			sbs->manager_present = 0;
+			sbs->manager_present = 1;
+ 			for (id = 0; id < MAX_SBS_BAT; ++id)
+ 				if ((sbs->batteries_supported & (1 << id)))
+ 					acpi_battery_add(sbs, id);
@@ -0,0 +1,106 @@
+From 07f438df22886432ff50772446768f65fbbf3ee0 Mon Sep 17 00:00:00 2001
+From: Hanjun Guo <hanjun.guo@linaro.org>
+Date: Tue, 24 Mar 2015 14:02:34 +0000
+Subject: [PATCH] ACPI / table: Use pr_debug() instead of pr_info() for MADT
+ table scanning
+
+For a normal 8 cpu sockets system, it will up to 240 cpu threads (Xeon E7
+v2 family for now), and we need 240 entries for local apic or local x2apic
+in MADT table, so it will be much verbose information printed with a slow
+uart console when system booted, this will be even worse with large system
+with 16/32 cpu sockets.
+
+This patch just use pr_debug() instead of pr_info() for ioapic/iosapic,
+local apic/x2apic/sapic structures when scanning the MADT table to remove
+those verbose information, but leave other structures unchanged.
+
+CC: Rafael J Wysocki <rjw@rjwysocki.net>
+Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Acked-by: Olof Johansson <olof@lixom.net>
+Acked-by: Grant Likely <grant.likely@linaro.org>
+Tested-by: Timur Tabi <timur@codeaurora.org>
+Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
+Signed-off-by: Will Deacon <will.deacon@arm.com>
+---
+ drivers/acpi/tables.c | 30 ++++++++++++++++--------------
+ 1 file changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
+index 93b8152..f4e5b88 100644
+--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
+@@ -23,6 +23,8 @@
+  *
+  */
+ 
+/* Uncomment next line to get verbose printout */
+/* #define DEBUG */
+ #define pr_fmt(fmt) "ACPI: " fmt
+ 
+ #include <linux/init.h>
+@@ -61,9 +63,9 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
+ 		{
+ 			struct acpi_madt_local_apic *p =
+ 			    (struct acpi_madt_local_apic *)header;
+-			pr_info("LAPIC (acpi_id[0x%02x] lapic_id[0x%02x] %s)\n",
+-				p->processor_id, p->id,
+-				(p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled");
+			pr_debug("LAPIC (acpi_id[0x%02x] lapic_id[0x%02x] %s)\n",
+				 p->processor_id, p->id,
+				 (p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled");
+ 		}
+ 		break;
+ 
+@@ -71,9 +73,9 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
+ 		{
+ 			struct acpi_madt_local_x2apic *p =
+ 			    (struct acpi_madt_local_x2apic *)header;
+-			pr_info("X2APIC (apic_id[0x%02x] uid[0x%02x] %s)\n",
+-				p->local_apic_id, p->uid,
+-				(p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled");
+			pr_debug("X2APIC (apic_id[0x%02x] uid[0x%02x] %s)\n",
+				 p->local_apic_id, p->uid,
+				 (p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled");
+ 		}
+ 		break;
+ 
+@@ -81,8 +83,8 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
+ 		{
+ 			struct acpi_madt_io_apic *p =
+ 			    (struct acpi_madt_io_apic *)header;
+-			pr_info("IOAPIC (id[0x%02x] address[0x%08x] gsi_base[%d])\n",
+-				p->id, p->address, p->global_irq_base);
+			pr_debug("IOAPIC (id[0x%02x] address[0x%08x] gsi_base[%d])\n",
+				 p->id, p->address, p->global_irq_base);
+ 		}
+ 		break;
+ 
+@@ -155,9 +157,9 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
+ 		{
+ 			struct acpi_madt_io_sapic *p =
+ 			    (struct acpi_madt_io_sapic *)header;
+-			pr_info("IOSAPIC (id[0x%x] address[%p] gsi_base[%d])\n",
+-				p->id, (void *)(unsigned long)p->address,
+-				p->global_irq_base);
+			pr_debug("IOSAPIC (id[0x%x] address[%p] gsi_base[%d])\n",
+				 p->id, (void *)(unsigned long)p->address,
+				 p->global_irq_base);
+ 		}
+ 		break;
+ 
+@@ -165,9 +167,9 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
+ 		{
+ 			struct acpi_madt_local_sapic *p =
+ 			    (struct acpi_madt_local_sapic *)header;
+-			pr_info("LSAPIC (acpi_id[0x%02x] lsapic_id[0x%02x] lsapic_eid[0x%02x] %s)\n",
+-				p->processor_id, p->id, p->eid,
+-				(p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled");
+			pr_debug("LSAPIC (acpi_id[0x%02x] lsapic_id[0x%02x] lsapic_eid[0x%02x] %s)\n",
+				 p->processor_id, p->id, p->eid,
+				 (p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled");
+ 		}
+ 		break;
+ 
+-- 
+2.3.2
+
@@ -0,0 +1,77 @@
+From ff92cfe7cbc05c6c62f5b06c7d9090f4c853cd51 Mon Sep 17 00:00:00 2001
+From: Aaron Lu <aaron.lu@intel.com>
+Date: Wed, 11 Mar 2015 22:09:57 +0100
+Subject: [PATCH] ACPI / video: Allow forcing native backlight on non win8
+ machines
+
+The native backlight behavior (so not registering both the acpi-video
+and the vendor backlight driver) can be useful on some non win8 machines
+too, so change the behavior of the video.use_native_backlight=1 or 0
+kernel cmdline option to be: if user has set video.use_native_backlight=1
+or 0, use that no matter if it is a win8 system or not. Also, we will
+put some known systems into the DMI table to make them either use native
+backlight interface or not, and the use_native_backlight_dmi is used to
+reflect that.
+
+Original-by: Hans de Goede <hdegoede@redhat.com>
+Acked-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Aaron Lu <aaron.lu@intel.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+ drivers/acpi/video.c | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
+index 26eb70c..2f45dca 100644
+--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
+@@ -82,9 +82,15 @@ module_param(allow_duplicates, bool, 0644);
+  * For Windows 8 systems: used to decide if video module
+  * should skip registering backlight interface of its own.
+  */
+-static int use_native_backlight_param = -1;
+enum {
+	NATIVE_BACKLIGHT_NOT_SET = -1,
+	NATIVE_BACKLIGHT_OFF,
+	NATIVE_BACKLIGHT_ON,
+};
+
+static int use_native_backlight_param = NATIVE_BACKLIGHT_NOT_SET;
+ module_param_named(use_native_backlight, use_native_backlight_param, int, 0444);
+-static bool use_native_backlight_dmi = true;
+static int use_native_backlight_dmi = NATIVE_BACKLIGHT_NOT_SET;
+ 
+ static int register_count;
+ static struct mutex video_list_lock;
+@@ -237,15 +243,16 @@ static void acpi_video_switch_brightness(struct work_struct *work);
+ 
+ static bool acpi_video_use_native_backlight(void)
+ {
+-	if (use_native_backlight_param != -1)
+	if (use_native_backlight_param != NATIVE_BACKLIGHT_NOT_SET)
+ 		return use_native_backlight_param;
+-	else
+	else if (use_native_backlight_dmi != NATIVE_BACKLIGHT_NOT_SET)
+ 		return use_native_backlight_dmi;
+	return acpi_osi_is_win8();
+ }
+ 
+ bool acpi_video_verify_backlight_support(void)
+ {
+-	if (acpi_osi_is_win8() && acpi_video_use_native_backlight() &&
+	if (acpi_video_use_native_backlight() &&
+ 	    backlight_device_registered(BACKLIGHT_RAW))
+ 		return false;
+ 	return acpi_video_backlight_support();
+@@ -414,7 +421,7 @@ static int __init video_set_bqc_offset(const struct dmi_system_id *d)
+ 
+ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
+ {
+-	use_native_backlight_dmi = false;
+	use_native_backlight_dmi = NATIVE_BACKLIGHT_OFF;
+ 	return 0;
+ }
+ 
+-- 
+2.3.2
+
@@ -0,0 +1,205 @@
+From 7241ea558c6715501e777396b5fc312c372e11d9 Mon Sep 17 00:00:00 2001
+From: Peter Zubaj <pzubaj@marticonet.sk>
+Date: Tue, 28 Apr 2015 21:57:29 +0200
+Subject: ALSA: emu10k1: Emu10k2 32 bit DMA mode
+
+From: Peter Zubaj <pzubaj@marticonet.sk>
+
+commit 7241ea558c6715501e777396b5fc312c372e11d9 upstream.
+
+Looks like audigy emu10k2 (probably emu10k1 - sb live too) support two
+modes for DMA. Second mode is useful for 64 bit os with more then 2 GB
+of ram (fixes problems with big soundfont loading)
+
+1) 32MB from 2 GB address space using 8192 pages (used now as default)
+2) 16MB from 4 GB address space using 4096 pages
+
+Mode is set using HCFG_EXPANDED_MEM flag in HCFG register.
+Also format of emu10k2 page table is then different.
+
+Signed-off-by: Peter Zubaj <pzubaj@marticonet.sk>
+Tested-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/sound/emu10k1.h              |   14 +++++++++-----
+ sound/pci/emu10k1/emu10k1_callback.c |    4 ++--
+ sound/pci/emu10k1/emu10k1_main.c     |   17 ++++++++++++-----
+ sound/pci/emu10k1/emupcm.c           |    2 +-
+ sound/pci/emu10k1/memory.c           |   11 ++++++-----
+ 5 files changed, 30 insertions(+), 18 deletions(-)
+
+--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
+@@ -41,7 +41,8 @@
+ 
+ #define EMUPAGESIZE     4096
+ #define MAXREQVOICES    8
+-#define MAXPAGES        8192
+#define MAXPAGES0       4096	/* 32 bit mode */
+#define MAXPAGES1       8192	/* 31 bit mode */
+ #define RESERVED        0
+ #define NUM_MIDI        16
+ #define NUM_G           64              /* use all channels */
+@@ -50,8 +51,7 @@
+ 
+ /* FIXME? - according to the OSS driver the EMU10K1 needs a 29 bit DMA mask */
+ #define EMU10K1_DMA_MASK	0x7fffffffUL	/* 31bit */
+-#define AUDIGY_DMA_MASK		0x7fffffffUL	/* 31bit FIXME - 32 should work? */
+-						/* See ALSA bug #1276 - rlrevell */
+#define AUDIGY_DMA_MASK		0xffffffffUL	/* 32bit mode */
+ 
+ #define TMEMSIZE        256*1024
+ #define TMEMSIZEREG     4
+@@ -466,8 +466,11 @@
+ 
+ #define MAPB			0x0d		/* Cache map B						*/
+ 
+-#define MAP_PTE_MASK		0xffffe000	/* The 19 MSBs of the PTE indexed by the PTI		*/
+-#define MAP_PTI_MASK		0x00001fff	/* The 13 bit index to one of the 8192 PTE dwords      	*/
+#define MAP_PTE_MASK0		0xfffff000	/* The 20 MSBs of the PTE indexed by the PTI		*/
+#define MAP_PTI_MASK0		0x00000fff	/* The 12 bit index to one of the 4096 PTE dwords      	*/
+
+#define MAP_PTE_MASK1		0xffffe000	/* The 19 MSBs of the PTE indexed by the PTI		*/
+#define MAP_PTI_MASK1		0x00001fff	/* The 13 bit index to one of the 8192 PTE dwords      	*/
+ 
+ /* 0x0e, 0x0f: Not used */
+ 
+@@ -1704,6 +1707,7 @@ struct snd_emu10k1 {
+ 	unsigned short model;			/* subsystem id */
+ 	unsigned int card_type;			/* EMU10K1_CARD_* */
+ 	unsigned int ecard_ctrl;		/* ecard control bits */
+	unsigned int address_mode;		/* address mode */
+ 	unsigned long dma_mask;			/* PCI DMA mask */
+ 	unsigned int delay_pcm_irq;		/* in samples */
+ 	int max_cache_pages;			/* max memory size / PAGE_SIZE */
+--- a/sound/pci/emu10k1/emu10k1_callback.c
+++ b/sound/pci/emu10k1/emu10k1_callback.c
+@@ -415,7 +415,7 @@ start_voice(struct snd_emux_voice *vp)
+ 	snd_emu10k1_ptr_write(hw, Z2, ch, 0);
+ 
+ 	/* invalidate maps */
+-	temp = (hw->silent_page.addr << 1) | MAP_PTI_MASK;
+	temp = (hw->silent_page.addr << hw->address_mode) | (hw->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
+ 	snd_emu10k1_ptr_write(hw, MAPA, ch, temp);
+ 	snd_emu10k1_ptr_write(hw, MAPB, ch, temp);
+ #if 0
+@@ -436,7 +436,7 @@ start_voice(struct snd_emux_voice *vp)
+ 		snd_emu10k1_ptr_write(hw, CDF, ch, sample);
+ 
+ 		/* invalidate maps */
+-		temp = ((unsigned int)hw->silent_page.addr << 1) | MAP_PTI_MASK;
+		temp = ((unsigned int)hw->silent_page.addr << hw_address_mode) | (hw->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
+ 		snd_emu10k1_ptr_write(hw, MAPA, ch, temp);
+ 		snd_emu10k1_ptr_write(hw, MAPB, ch, temp);
+ 		
+--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
+@@ -282,7 +282,7 @@ static int snd_emu10k1_init(struct snd_e
+ 	snd_emu10k1_ptr_write(emu, TCB, 0, 0);	/* taken from original driver */
+ 	snd_emu10k1_ptr_write(emu, TCBS, 0, 4);	/* taken from original driver */
+ 
+-	silent_page = (emu->silent_page.addr << 1) | MAP_PTI_MASK;
+	silent_page = (emu->silent_page.addr << emu->address_mode) | (emu->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
+ 	for (ch = 0; ch < NUM_G; ch++) {
+ 		snd_emu10k1_ptr_write(emu, MAPA, ch, silent_page);
+ 		snd_emu10k1_ptr_write(emu, MAPB, ch, silent_page);
+@@ -348,6 +348,11 @@ static int snd_emu10k1_init(struct snd_e
+ 		outl(reg | A_IOCFG_GPOUT0, emu->port + A_IOCFG);
+ 	}
+ 
+	if (emu->address_mode == 0) {
+		/* use 16M in 4G */
+		outl(inl(emu->port + HCFG) | HCFG_EXPANDED_MEM, emu->port + HCFG);
+	}
+
+ 	return 0;
+ }
+ 
+@@ -1877,8 +1882,10 @@ int snd_emu10k1_create(struct snd_card *
+ 
+ 	is_audigy = emu->audigy = c->emu10k2_chip;
+ 
+	/* set addressing mode */
+	emu->address_mode = is_audigy ? 0 : 1;
+ 	/* set the DMA transfer mask */
+-	emu->dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK;
+	emu->dma_mask = emu->address_mode ? EMU10K1_DMA_MASK : AUDIGY_DMA_MASK;
+ 	if (pci_set_dma_mask(pci, emu->dma_mask) < 0 ||
+ 	    pci_set_consistent_dma_mask(pci, emu->dma_mask) < 0) {
+ 		dev_err(card->dev,
+@@ -1903,7 +1910,7 @@ int snd_emu10k1_create(struct snd_card *
+ 
+ 	emu->max_cache_pages = max_cache_bytes >> PAGE_SHIFT;
+ 	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
+-				32 * 1024, &emu->ptb_pages) < 0) {
+				(emu->address_mode ? 32 : 16) * 1024, &emu->ptb_pages) < 0) {
+ 		err = -ENOMEM;
+ 		goto error;
+ 	}
+@@ -2002,8 +2009,8 @@ int snd_emu10k1_create(struct snd_card *
+ 
+ 	/* Clear silent pages and set up pointers */
+ 	memset(emu->silent_page.area, 0, PAGE_SIZE);
+-	silent_page = emu->silent_page.addr << 1;
+-	for (idx = 0; idx < MAXPAGES; idx++)
+	silent_page = emu->silent_page.addr << emu->address_mode;
+	for (idx = 0; idx < (emu->address_mode ? MAXPAGES1 : MAXPAGES0); idx++)
+ 		((u32 *)emu->ptb_pages.area)[idx] = cpu_to_le32(silent_page | idx);
+ 
+ 	/* set up voice indices */
+--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
+@@ -380,7 +380,7 @@ static void snd_emu10k1_pcm_init_voice(s
+ 	snd_emu10k1_ptr_write(emu, Z1, voice, 0);
+ 	snd_emu10k1_ptr_write(emu, Z2, voice, 0);
+ 	/* invalidate maps */
+-	silent_page = ((unsigned int)emu->silent_page.addr << 1) | MAP_PTI_MASK;
+	silent_page = ((unsigned int)emu->silent_page.addr << emu->address_mode) | (emu->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
+ 	snd_emu10k1_ptr_write(emu, MAPA, voice, silent_page);
+ 	snd_emu10k1_ptr_write(emu, MAPB, voice, silent_page);
+ 	/* modulation envelope */
+--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
+@@ -34,10 +34,11 @@
+  * aligned pages in others
+  */
+ #define __set_ptb_entry(emu,page,addr) \
+-	(((u32 *)(emu)->ptb_pages.area)[page] = cpu_to_le32(((addr) << 1) | (page)))
+	(((u32 *)(emu)->ptb_pages.area)[page] = cpu_to_le32(((addr) << (emu->address_mode)) | (page)))
+ 
+ #define UNIT_PAGES		(PAGE_SIZE / EMUPAGESIZE)
+-#define MAX_ALIGN_PAGES		(MAXPAGES / UNIT_PAGES)
+#define MAX_ALIGN_PAGES0		(MAXPAGES0 / UNIT_PAGES)
+#define MAX_ALIGN_PAGES1		(MAXPAGES1 / UNIT_PAGES)
+ /* get aligned page from offset address */
+ #define get_aligned_page(offset)	((offset) >> PAGE_SHIFT)
+ /* get offset address from aligned page */
+@@ -124,7 +125,7 @@ static int search_empty_map_area(struct
+ 		}
+ 		page = blk->mapped_page + blk->pages;
+ 	}
+-	size = MAX_ALIGN_PAGES - page;
+	size = (emu->address_mode ? MAX_ALIGN_PAGES1 : MAX_ALIGN_PAGES0) - page;
+ 	if (size >= max_size) {
+ 		*nextp = pos;
+ 		return page;
+@@ -181,7 +182,7 @@ static int unmap_memblk(struct snd_emu10
+ 		q = get_emu10k1_memblk(p, mapped_link);
+ 		end_page = q->mapped_page;
+ 	} else
+-		end_page = MAX_ALIGN_PAGES;
+		end_page = (emu->address_mode ? MAX_ALIGN_PAGES1 : MAX_ALIGN_PAGES0);
+ 
+ 	/* remove links */
+ 	list_del(&blk->mapped_link);
+@@ -307,7 +308,7 @@ snd_emu10k1_alloc_pages(struct snd_emu10
+ 	if (snd_BUG_ON(!emu))
+ 		return NULL;
+ 	if (snd_BUG_ON(runtime->dma_bytes <= 0 ||
+-		       runtime->dma_bytes >= MAXPAGES * EMUPAGESIZE))
+		       runtime->dma_bytes >= (emu->address_mode ? MAXPAGES1 : MAXPAGES0) * EMUPAGESIZE))
+ 		return NULL;
+ 	hdr = emu->memhdr;
+ 	if (snd_BUG_ON(!hdr))
@@ -0,0 +1,62 @@
+From d02260824e2cad626fb2a9d62e27006d34b6dedc Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 27 Apr 2015 13:00:09 +0200
+Subject: ALSA: emu10k1: Fix card shortname string buffer overflow
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit d02260824e2cad626fb2a9d62e27006d34b6dedc upstream.
+
+Some models provide too long string for the shortname that has 32bytes
+including the terminator, and it results in a non-terminated string
+exposed to the user-space.  This isn't too critical, though, as the
+string is stopped at the succeeding longname string.
+
+This patch fixes such entries by dropping "SB" prefix (it's enough to
+fit within 32 bytes, so far).  Meanwhile, it also changes strcpy()
+with strlcpy() to make sure that this kind of problem won't happen in
+future, too.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/emu10k1/emu10k1.c      |    6 ++++--
+ sound/pci/emu10k1/emu10k1_main.c |    4 ++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
+@@ -183,8 +183,10 @@ static int snd_card_emu10k1_probe(struct
+ 	}
+ #endif
+  
+-	strcpy(card->driver, emu->card_capabilities->driver);
+-	strcpy(card->shortname, emu->card_capabilities->name);
+	strlcpy(card->driver, emu->card_capabilities->driver,
+		sizeof(card->driver));
+	strlcpy(card->shortname, emu->card_capabilities->name,
+		sizeof(card->shortname));
+ 	snprintf(card->longname, sizeof(card->longname),
+ 		 "%s (rev.%d, serial:0x%x) at 0x%lx, irq %i",
+ 		 card->shortname, emu->revision, emu->serial, emu->port, emu->irq);
+--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
+@@ -1421,7 +1421,7 @@ static struct snd_emu_chip_details emu_c
+ 	 *
+ 	 */
+ 	{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102,
+-	 .driver = "Audigy2", .name = "SB Audigy 2 ZS Notebook [SB0530]",
+	 .driver = "Audigy2", .name = "Audigy 2 ZS Notebook [SB0530]",
+ 	 .id = "Audigy2",
+ 	 .emu10k2_chip = 1,
+ 	 .ca0108_chip = 1,
+@@ -1571,7 +1571,7 @@ static struct snd_emu_chip_details emu_c
+ 	 .adc_1361t = 1,  /* 24 bit capture instead of 16bit */
+ 	 .ac97_chip = 1} ,
+ 	{.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102,
+-	 .driver = "Audigy2", .name = "SB Audigy 2 Platinum EX [SB0280]",
+	 .driver = "Audigy2", .name = "Audigy 2 Platinum EX [SB0280]",
+ 	 .id = "Audigy2",
+ 	 .emu10k2_chip = 1,
+ 	 .ca0102_chip = 1,
@@ -0,0 +1,29 @@
+
+Fix broken async_suspend
+
+https://bugzilla.kernel.org/show_bug.cgi?id=81551
+
+--- a/drivers/pci/quirks.c	
+++ a/drivers/pci/quirks.c	
+@@ -29,6 +29,21 @@
+ #include "pci.h"
+ 
+ /*
+ * For JMicron chips, we need to disable the async_suspend method, otherwise
+ * they will hit the power-on issue when doing device resume, add one quick
+ * solution to disable the async_suspend method.
+ */
+static void pci_async_suspend_fixup(struct pci_dev *pdev)
+{
+        /*
+         * disabling the async_suspend method for JMicron chips to
+         * avoid device resuming issue.
+         */
+        device_disable_async_suspend(&pdev->dev);
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, pci_async_suspend_fixup);
+
+/*
+  * Decoding should be disabled for a PCI device during BAR sizing to avoid
+  * conflict. But doing so may cause problems on host bridge and perhaps other
+  * key system devices. For devices that need to have mmio decoding always-on,
@@ -0,0 +1,33 @@
+>From 9f04e51293b130474504216a477bb2a73cbf59e1 Mon Sep 17 00:00:00 2001
+From: Anssi Hannula <anssi.hannula@iki.fi>
+Date: Thu, 22 Mar 2012 22:29:11 +0200
+Subject: [PATCH] ata: prefer ata drivers over ide drivers when both are built
+
+Currently the old IDE drivers are preferred over ATA drivers when both
+are built, since ide/ is listed first in drivers/Makefile and therefore
+the IDE drivers end up before ATA drivers in modules.order which is used
+by depmod/modprobe for module ordering.
+
+Change it so that ATA drivers are preferred over IDE driver by moving
+the ide/ entry under ata/ in drivers/Makefile.
+
+Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
+---
+ drivers/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/Makefile b/drivers/Makefile
+index 932e8bf..e8df3d0 100644
+--- a/drivers/Makefile
+++ b/drivers/Makefile
+@@ -64,9 +64,9 @@ obj-y				+= base/ block/ misc/ mfd/ nfc/
+ obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
+ obj-$(CONFIG_NUBUS)		+= nubus/
+ obj-y				+= macintosh/
+-obj-$(CONFIG_IDE)		+= ide/
+ obj-$(CONFIG_SCSI)		+= scsi/
+ obj-$(CONFIG_ATA)		+= ata/
+obj-$(CONFIG_IDE)		+= ide/
+ obj-$(CONFIG_TARGET_CORE)	+= target/
+ obj-$(CONFIG_MTD)		+= mtd/
+ obj-$(CONFIG_SPI)		+= spi/
@@ -0,0 +1,68 @@
+
+This patch reverts:
+
+From e6b7e41cdd8cae0591e04d9519b65470110e2d44 Mon Sep 17 00:00:00 2001
+From: Chuansheng Liu <chuansheng.liu@intel.com>
+Date: Mon, 1 Sep 2014 08:38:03 +0800
+Subject: [PATCH] ata: Disabling the async PM for JMicron chip 363/361
+
+
+in favour of the pci quirks based patch:
+https://bugzilla.kernel.org/show_bug.cgi?id=81551
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+---
+ drivers/ata/ahci.c         | 12 ------------
+ drivers/ata/pata_jmicron.c | 12 ------------
+ 2 files changed, 24 deletions(-)
+
+diff --git b/drivers/ata/ahci.c a/drivers/ata/ahci.c
+index f7da21b..bca3d64 100644
+--- b/drivers/ata/ahci.c
+++ a/drivers/ata/ahci.c
+@@ -1337,18 +1337,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+ 	else if (pdev->vendor == 0x1c44 && pdev->device == 0x8000)
+ 		ahci_pci_bar = AHCI_PCI_BAR_ENMOTUS;
+ 
+-	/*
+-	 * The JMicron chip 361/363 contains one SATA controller and one
+-	 * PATA controller,for powering on these both controllers, we must
+-	 * follow the sequence one by one, otherwise one of them can not be
+-	 * powered on successfully, so here we disable the async suspend
+-	 * method for these chips.
+-	 */
+-	if (pdev->vendor == PCI_VENDOR_ID_JMICRON &&
+-		(pdev->device == PCI_DEVICE_ID_JMICRON_JMB363 ||
+-		pdev->device == PCI_DEVICE_ID_JMICRON_JMB361))
+-		device_disable_async_suspend(&pdev->dev);
+-
+ 	/* acquire resources */
+ 	rc = pcim_enable_device(pdev);
+ 	if (rc)
+diff --git b/drivers/ata/pata_jmicron.c a/drivers/ata/pata_jmicron.c
+index 47e418b..4d1a5d2 100644
+--- b/drivers/ata/pata_jmicron.c
+++ a/drivers/ata/pata_jmicron.c
+@@ -143,18 +143,6 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i
+ 	};
+ 	const struct ata_port_info *ppi[] = { &info, NULL };
+ 
+-	/*
+-	 * The JMicron chip 361/363 contains one SATA controller and one
+-	 * PATA controller,for powering on these both controllers, we must
+-	 * follow the sequence one by one, otherwise one of them can not be
+-	 * powered on successfully, so here we disable the async suspend
+-	 * method for these chips.
+-	 */
+-	if (pdev->vendor == PCI_VENDOR_ID_JMICRON &&
+-		(pdev->device == PCI_DEVICE_ID_JMICRON_JMB363 ||
+-		pdev->device == PCI_DEVICE_ID_JMICRON_JMB361))
+-		device_disable_async_suspend(&pdev->dev);
+-
+ 	return ata_pci_bmdma_init_one(pdev, ppi, &jmicron_sht, NULL, 0);
+ }
+ 
+-- 
+1.8.5.6
+
@@ -0,0 +1,49 @@
+From 9ba52e5812e53f20f23600d79449a3ec05a0254f Mon Sep 17 00:00:00 2001
+From: Shaohua Li <shli@fb.com>
+Date: Mon, 4 May 2015 14:32:48 -0600
+Subject: [PATCH] blk-mq: don't lose requests if a stopped queue restarts
+
+Normally if driver is busy to dispatch a request the logic is like below:
+block layer:					driver:
+	__blk_mq_run_hw_queue
+a.						blk_mq_stop_hw_queue
+b.	rq add to ctx->dispatch
+
+later:
+1.						blk_mq_start_hw_queue
+2.	__blk_mq_run_hw_queue
+
+But it's possible step 1-2 runs between a and b. And since rq isn't in
+ctx->dispatch yet, step 2 will not run rq. The rq might get lost if
+there are no subsequent requests kick in.
+
+Signed-off-by: Shaohua Li <shli@fb.com>
+Signed-off-by: Jens Axboe <axboe@fb.com>
+---
+ block/blk-mq.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/block/blk-mq.c b/block/blk-mq.c
+index 76f460e..e68b71b 100644
+--- a/block/blk-mq.c
+++ b/block/blk-mq.c
+@@ -858,6 +858,16 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)
+ 		spin_lock(&hctx->lock);
+ 		list_splice(&rq_list, &hctx->dispatch);
+ 		spin_unlock(&hctx->lock);
+		/*
+		 * the queue is expected stopped with BLK_MQ_RQ_QUEUE_BUSY, but
+		 * it's possible the queue is stopped and restarted again
+		 * before this. Queue restart will dispatch requests. And since
+		 * requests in rq_list aren't added into hctx->dispatch yet,
+		 * the requests in rq_list might get lost.
+		 *
+		 * blk_mq_run_hw_queue() already checks the STOPPED bit
+		 **/
+		blk_mq_run_hw_queue(hctx, true);
+ 	}
+ }
+ 
+-- 
+2.3.2
+
@@ -0,0 +1,97 @@
+From 2a34c0872adf252f23a6fef2d051a169ac796cef Mon Sep 17 00:00:00 2001
+From: Ming Lei <ming.lei@canonical.com>
+Date: Tue, 21 Apr 2015 10:00:20 +0800
+Subject: [PATCH] blk-mq: fix CPU hotplug handling
+
+hctx->tags has to be set as NULL in case that it is to be unmapped
+no matter if set->tags[hctx->queue_num] is NULL or not in blk_mq_map_swqueue()
+because shared tags can be freed already from another request queue.
+
+The same situation has to be considered during handling CPU online too.
+Unmapped hw queue can be remapped after CPU topo is changed, so we need
+to allocate tags for the hw queue in blk_mq_map_swqueue(). Then tags
+allocation for hw queue can be removed in hctx cpu online notifier, and it
+is reasonable to do that after mapping is updated.
+
+Cc: <stable@vger.kernel.org>
+Reported-by: Dongsu Park <dongsu.park@profitbricks.com>
+Tested-by: Dongsu Park <dongsu.park@profitbricks.com>
+Signed-off-by: Ming Lei <ming.lei@canonical.com>
+Signed-off-by: Jens Axboe <axboe@fb.com>
+---
+ block/blk-mq.c | 34 +++++++++++++---------------------
+ 1 file changed, 13 insertions(+), 21 deletions(-)
+
+diff --git a/block/blk-mq.c b/block/blk-mq.c
+index 1fccb98..76f460e 100644
+--- a/block/blk-mq.c
+++ b/block/blk-mq.c
+@@ -1574,22 +1574,6 @@ static int blk_mq_hctx_cpu_offline(struc
+ 	return NOTIFY_OK;
+ }
+ 
+-static int blk_mq_hctx_cpu_online(struct blk_mq_hw_ctx *hctx, int cpu)
+-{
+-	struct request_queue *q = hctx->queue;
+-	struct blk_mq_tag_set *set = q->tag_set;
+-
+-	if (set->tags[hctx->queue_num])
+-		return NOTIFY_OK;
+-
+-	set->tags[hctx->queue_num] = blk_mq_init_rq_map(set, hctx->queue_num);
+-	if (!set->tags[hctx->queue_num])
+-		return NOTIFY_STOP;
+-
+-	hctx->tags = set->tags[hctx->queue_num];
+-	return NOTIFY_OK;
+-}
+-
+ static int blk_mq_hctx_notify(void *data, unsigned long action,
+ 			      unsigned int cpu)
+ {
+@@ -1597,8 +1581,11 @@ static int blk_mq_hctx_notify(void *data
+ 
+ 	if (action == CPU_DEAD || action == CPU_DEAD_FROZEN)
+ 		return blk_mq_hctx_cpu_offline(hctx, cpu);
+-	else if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN)
+-		return blk_mq_hctx_cpu_online(hctx, cpu);
+
+	/*
+	 * In case of CPU online, tags may be reallocated
+	 * in blk_mq_map_swqueue() after mapping is updated.
+	 */
+ 
+ 	return NOTIFY_OK;
+ }
+@@ -1780,6 +1767,7 @@ static void blk_mq_map_swqueue(struct re
+ 	unsigned int i;
+ 	struct blk_mq_hw_ctx *hctx;
+ 	struct blk_mq_ctx *ctx;
+	struct blk_mq_tag_set *set = q->tag_set;
+ 
+ 	queue_for_each_hw_ctx(q, hctx, i) {
+ 		cpumask_clear(hctx->cpumask);
+@@ -1806,16 +1794,20 @@ static void blk_mq_map_swqueue(struct re
+ 		 * disable it and free the request entries.
+ 		 */
+ 		if (!hctx->nr_ctx) {
+-			struct blk_mq_tag_set *set = q->tag_set;
+-
+ 			if (set->tags[i]) {
+ 				blk_mq_free_rq_map(set, set->tags[i], i);
+ 				set->tags[i] = NULL;
+-				hctx->tags = NULL;
+ 			}
+			hctx->tags = NULL;
+ 			continue;
+ 		}
+ 
+		/* unmapped hw queue can be remapped after CPU topo changed */
+		if (!set->tags[i])
+			set->tags[i] = blk_mq_init_rq_map(set, i);
+		hctx->tags = set->tags[i];
+		WARN_ON(!hctx->tags);
+
+ 		/*
+ 		 * Initialize batch roundrobin counts
+ 		 */
@@ -0,0 +1,38 @@
+From b2387ddcced8de3e6471a2fb16a409577063016f Mon Sep 17 00:00:00 2001
+From: Shaohua Li <shli@fb.com>
+Date: Fri, 1 May 2015 09:59:44 -0700
+Subject: [PATCH] blk-mq: fix FUA request hang
+
+When a FUA request enters its DATA stage of flush pipeline, the
+request is added to mq requeue list, the request will then be added to
+ctx->rq_list. blk_mq_attempt_merge() might merge the request with a bio.
+Later when the request is finished the flush pipeline, the
+request->__data_len is 0. Then I only saw the bio gets endio called, the
+original request never finish.
+
+Adding REQ_FLUSH_SEQ into REQ_NOMERGE_FLAGS looks an easy fix.
+
+stable: 3.15+
+
+Signed-off-by: Shaohua Li <shli@fb.com>
+Signed-off-by: Jens Axboe <axboe@fb.com>
+---
+ include/linux/blk_types.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
+index a1b25e3..b7299fe 100644
+--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
+@@ -220,7 +220,7 @@ enum rq_flag_bits {
+ 
+ /* This mask is used for both bio and request merge checking */
+ #define REQ_NOMERGE_FLAGS \
+-	(REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA)
+	(REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA | REQ_FLUSH_SEQ)
+ 
+ #define REQ_RAHEAD		(1ULL << __REQ_RAHEAD)
+ #define REQ_THROTTLED		(1ULL << __REQ_THROTTLED)
+-- 
+2.3.2
+
@@ -0,0 +1,62 @@
+From f054b56c951bf1731ba7314a4c7f1cc0b2977cc9 Mon Sep 17 00:00:00 2001
+From: Ming Lei <ming.lei@canonical.com>
+Date: Tue, 21 Apr 2015 10:00:19 +0800
+Subject: [PATCH] blk-mq: fix race between timeout and CPU hotplug
+
+Firstly during CPU hotplug, even queue is freezed, timeout
+handler still may come and access hctx->tags, which may cause
+use after free, so this patch deactivates timeout handler
+inside CPU hotplug notifier.
+
+Secondly, tags can be shared by more than one queues, so we
+have to check if the hctx has been unmapped, otherwise
+still use-after-free on tags can be triggered.
+
+Cc: <stable@vger.kernel.org>
+Reported-by: Dongsu Park <dongsu.park@profitbricks.com>
+Tested-by: Dongsu Park <dongsu.park@profitbricks.com>
+Signed-off-by: Ming Lei <ming.lei@canonical.com>
+Signed-off-by: Jens Axboe <axboe@fb.com>
+---
+ block/blk-mq.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/block/blk-mq.c b/block/blk-mq.c
+index ade8a2d..1fccb98 100644
+--- a/block/blk-mq.c
+++ b/block/blk-mq.c
+@@ -677,8 +677,11 @@ static void blk_mq_rq_timer(unsigned long priv)
+ 		data.next = blk_rq_timeout(round_jiffies_up(data.next));
+ 		mod_timer(&q->timeout, data.next);
+ 	} else {
+-		queue_for_each_hw_ctx(q, hctx, i)
+-			blk_mq_tag_idle(hctx);
+		queue_for_each_hw_ctx(q, hctx, i) {
+			/* the hctx may be unmapped, so check it here */
+			if (blk_mq_hw_queue_mapped(hctx))
+				blk_mq_tag_idle(hctx);
+		}
+ 	}
+ }
+ 
+@@ -2090,9 +2093,16 @@ static int blk_mq_queue_reinit_notify(struct notifier_block *nb,
+ 	 */
+ 	list_for_each_entry(q, &all_q_list, all_q_node)
+ 		blk_mq_freeze_queue_start(q);
+-	list_for_each_entry(q, &all_q_list, all_q_node)
+	list_for_each_entry(q, &all_q_list, all_q_node) {
+ 		blk_mq_freeze_queue_wait(q);
+ 
+		/*
+		 * timeout handler can't touch hw queue during the
+		 * reinitialization
+		 */
+		del_timer_sync(&q->timeout);
+	}
+
+ 	list_for_each_entry(q, &all_q_list, all_q_node)
+ 		blk_mq_queue_reinit(q);
+ 
+-- 
+2.3.2
+
@@ -0,0 +1,21 @@
+
+Disable floppy autoloading as it makes systems without real hw,
+but that has the pnp headers hang.
+
+See https://bugs.mageia.org/show_bug.cgi?id=4696
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+diff -Nurp linux-3.3.3-rc1/drivers/block/floppy.c.orig linux-3.3.3-rc1/drivers/block/floppy.c
+--- linux-3.3.3-rc1/drivers/block/floppy.c.orig	2012-03-19 01:15:34.000000000 +0200
+++ linux-3.3.3-rc1/drivers/block/floppy.c	2012-04-22 02:58:10.238498303 +0300
+@@ -4621,8 +4621,7 @@ static const struct pnp_device_id floppy
+ 	{"PNP0700", 0},
+ 	{}
+ };
+-
+-MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
+/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */
+ 
+ #else
+ 
@@ -0,0 +1,23 @@
+Add quirk to disable ISOC transfers for device
+"ID 1131:1001 Integrated System Solution Corp. KY-BT100 Bluetooth Adapter"
+http://qa.mandriva.com/show_bug.cgi?id=30638
+
+Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+---
+ drivers/bluetooth/btusb.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+(status: submitted upstream to bluez-devel ML on 2007-09-29)
+
+--- linux-2.6.28/drivers/bluetooth/btusb.c.orig	2009-02-11 10:29:20.000000000 -0500
+++ linux-2.6.28/drivers/bluetooth/btusb.c	2009-02-11 10:30:27.000000000 -0500
+@@ -120,6 +120,9 @@ static struct usb_device_id blacklist_ta
+ 	/* Kensington Bluetooth USB adapter */
+ 	{ USB_DEVICE(0x047d, 0x105e), .driver_info = BTUSB_WRONG_SCO_MTU },
+ 
+	/* ISSC Bluetooth Adapter v3.1 */
+	{ USB_DEVICE(0x1131, 0x1001), .driver_info = BTUSB_BROKEN_ISOC },
+
+ 	/* RTX Telecom based adapters with buggy SCO support */
+ 	{ USB_DEVICE(0x0400, 0x0807), .driver_info = BTUSB_BROKEN_ISOC },
+ 	{ USB_DEVICE(0x0400, 0x080a), .driver_info = BTUSB_BROKEN_ISOC },
@@ -0,0 +1,35 @@
+
+agp/intel: add new host bridge id for Q57 system
+
+Add new Host Bridge ID found on a Q57 based system from Positivo. I
+don't know what abbreviation id for this would be best, may be Q_HB
+instead of UNKNOWN currently used would be better.
+
+Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+
+[ rebased for 3.8-rc3 /tmb ]
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+Removed the parts of the patch that are already applied in the kernel by
+the commit 67384fe3fd450536342330f684ea1f7dcaef8130:
+    "char/agp: add another Ironlake host bridge"
+
+Rediffed for kernel 3.10.24.
+
+Signed-off-by: Eugene A. Shatokhin <eugene.shatokhin@rosalab.ru>
+
+ drivers/char/agp/intel-gtt.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff -Nurp linux-3.8-rc3/drivers/char/agp/intel-gtt.c linux-3.8-rc3.q57/drivers/char/agp/intel-gtt.c
+--- linux-3.8-rc3/drivers/char/agp/intel-gtt.c	2013-01-10 08:17:09.690594184 +0200
+++ linux-3.8-rc3.q57/drivers/char/agp/intel-gtt.c	2013-01-10 08:38:56.649888839 +0200
+@@ -1303,6 +1303,8 @@ static const struct intel_gtt_driver_des
+ 		&g4x_gtt_driver },
+ 	{ PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG,
+ 	    "HD Graphics", &ironlake_gtt_driver },
+	{ PCI_DEVICE_ID_INTEL_IRONLAKE_D2_HB,
+	    "HD Graphics", &ironlake_gtt_driver },
+ 	{ PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG,
+ 	    "HD Graphics", &ironlake_gtt_driver },
+ 	{ 0, NULL, NULL }
@@ -0,0 +1,20 @@
+
+This patch adds module aliases for matching the old dm-raid45 patch
+by heinzm@redhat.com carried by kernel-tmb series in order to make
+sure there is an upgrade path.
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+ drivers/md/dm-raid.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- linux-2.6.38.2-mga2/drivers/md/dm-raid.c.orig	2011-03-15 03:20:32.000000000 +0200
+++ linux-2.6.38.2-mga2/drivers/md/dm-raid.c	2011-04-02 21:52:21.331302590 +0300
+@@ -693,5 +693,7 @@ MODULE_DESCRIPTION(DM_NAME " raid4/5/6 t
+ MODULE_ALIAS("dm-raid4");
+ MODULE_ALIAS("dm-raid5");
+ MODULE_ALIAS("dm-raid6");
+MODULE_ALIAS("dm-raid45");
+MODULE_ALIAS("dm-raid4-5");
+ MODULE_AUTHOR("Neil Brown <dm-devel@redhat.com>");
+ MODULE_LICENSE("GPL");
@@ -0,0 +1,29 @@
+
+This patch adds missing module aliases for the old ieee1394 stack
+to make it easier for endusers.
+
+Note: firewire-sbp2 and firewire-ohci already contains the needed aliases.
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+diff -Nurp linux-2.6.38.4/drivers/firewire/core-transaction.c linux-2.6.38.4.fw/drivers/firewire/core-transaction.c
+--- linux-2.6.38.4/drivers/firewire/core-transaction.c	2011-03-15 03:20:32.000000000 +0200
+++ linux-2.6.38.4.fw/drivers/firewire/core-transaction.c	2011-04-22 16:22:28.461386738 +0300
+@@ -1174,6 +1174,9 @@ static struct fw_address_handler registe
+ MODULE_AUTHOR("Kristian Hoegsberg <krh@bitplanet.net>");
+ MODULE_DESCRIPTION("Core IEEE1394 transaction logic");
+ MODULE_LICENSE("GPL");
+MODULE_ALIAS("ieee1394");
+MODULE_ALIAS("raw1394");
+MODULE_ALIAS("video1394");
+ 
+ static const u32 vendor_textual_descriptor[] = {
+ 	/* textual descriptor leaf () */
+diff -Nurp linux-2.6.38.4/drivers/firewire/net.c linux-2.6.38.4.fw/drivers/firewire/net.c
+--- linux-2.6.38.4/drivers/firewire/net.c	2011-03-15 03:20:32.000000000 +0200
+++ linux-2.6.38.4.fw/drivers/firewire/net.c	2011-04-22 16:20:34.008883920 +0300
+@@ -1719,3 +1719,4 @@ MODULE_AUTHOR("Jay Fenlason <fenlason@re
+ MODULE_DESCRIPTION("IP over IEEE1394 as per RFC 2734/3146");
+ MODULE_LICENSE("GPL");
+ MODULE_DEVICE_TABLE(ieee1394, fwnet_id_table);
+MODULE_ALIAS("eth1394");
@@ -0,0 +1,55 @@
+From d67e199611b986b345ea3087ee2e4a15da1c98b3 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Tue, 21 Apr 2015 16:46:28 +0300
+Subject: [PATCH] efi: Fix error handling in add_sysfs_runtime_map_entry()
+
+I spotted two (difficult to hit) bugs while reviewing this.
+
+1)  There is a double free bug because we unregister "map_kset" in
+    add_sysfs_runtime_map_entry() and also efi_runtime_map_init().
+2)  If we fail to allocate "entry" then we should return
+    ERR_PTR(-ENOMEM) instead of NULL.
+
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Cc: Dave Young <dyoung@redhat.com>
+Cc: Guangyu Sun <guangyu.sun@oracle.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Matt Fleming <matt.fleming@intel.com>
+---
+ drivers/firmware/efi/runtime-map.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
+index 87b8e3b..5c55227 100644
+--- a/drivers/firmware/efi/runtime-map.c
+++ b/drivers/firmware/efi/runtime-map.c
+@@ -120,7 +120,8 @@ add_sysfs_runtime_map_entry(struct kobject *kobj, int nr)
+ 	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
+ 	if (!entry) {
+ 		kset_unregister(map_kset);
+-		return entry;
+		map_kset = NULL;
+		return ERR_PTR(-ENOMEM);
+ 	}
+ 
+ 	memcpy(&entry->md, efi_runtime_map + nr * efi_memdesc_size,
+@@ -132,6 +133,7 @@ add_sysfs_runtime_map_entry(struct kobject *kobj, int nr)
+ 	if (ret) {
+ 		kobject_put(&entry->kobj);
+ 		kset_unregister(map_kset);
+		map_kset = NULL;
+ 		return ERR_PTR(ret);
+ 	}
+ 
+@@ -195,8 +197,6 @@ out_add_entry:
+ 		entry = *(map_entries + j);
+ 		kobject_put(&entry->kobj);
+ 	}
+-	if (map_kset)
+-		kset_unregister(map_kset);
+ out:
+ 	return ret;
+ }
+-- 
+2.3.2
+
@@ -0,0 +1,290 @@
+
+ fs/aufs/Kconfig          |    2 +-
+ fs/dcache.c              |    1 +
+ fs/inode.c               |    2 ++
+ fs/namespace.c           |    2 ++
+ fs/notify/group.c        |    4 ++++
+ fs/notify/mark.c         |    4 ++++
+ fs/open.c                |    1 +
+ fs/splice.c              |    2 ++
+ security/commoncap.c     |    2 ++
+ security/device_cgroup.c |    2 ++
+ security/security.c      |   10 ++++++++++
+ 11 files changed, 31 insertions(+), 1 deletion(-)
+
+diff -Nurp linux-3.19-aufs/fs/aufs/Kconfig linux-3.19-aufs-modular/fs/aufs/Kconfig
+--- linux-3.19-aufs/fs/aufs/Kconfig	2015-02-22 23:16:18.302926737 +0200
+++ linux-3.19-aufs-modular/fs/aufs/Kconfig	2015-02-22 23:23:41.617919334 +0200
+@@ -1,5 +1,5 @@
+ config AUFS_FS
+-	bool "Aufs (Advanced multi layered unification filesystem) support"
+	tristate "Aufs (Advanced multi layered unification filesystem) support"
+ 	help
+ 	Aufs is a stackable unification filesystem such as Unionfs,
+ 	which unifies several directories and provides a merged single
+diff -Nurp linux-3.19-aufs/fs/dcache.c linux-3.19-aufs-modular/fs/dcache.c
+--- linux-3.19-aufs/fs/dcache.c	2015-02-22 23:16:18.313926786 +0200
+++ linux-3.19-aufs-modular/fs/dcache.c	2015-02-22 23:23:41.620919348 +0200
+@@ -1124,6 +1124,7 @@ rename_retry:
+ 	seq = 1;
+ 	goto again;
+ }
+EXPORT_SYMBOL_GPL(d_walk);
+ 
+ /*
+  * Search for at least 1 mount point in the dentry's subdirs.
+diff -Nurp linux-3.19-aufs/fs/inode.c linux-3.19-aufs-modular/fs/inode.c
+--- linux-3.19-aufs/fs/inode.c	2015-02-22 23:16:18.314926790 +0200
+++ linux-3.19-aufs-modular/fs/inode.c	2015-02-22 23:23:41.617919334 +0200
+@@ -57,6 +57,7 @@ static struct hlist_head *inode_hashtabl
+ static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
+ 
+ __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
+EXPORT_SYMBOL(inode_sb_list_lock);
+ 
+ /*
+  * Empty aops. Can be used for the cases where the user does not
+@@ -1515,6 +1516,7 @@ int update_time(struct inode *inode, str
+ 	mark_inode_dirty_sync(inode);
+ 	return 0;
+ }
+EXPORT_SYMBOL(update_time);
+ 
+ /**
+  *	touch_atime	-	update the access time
+diff -Nurp linux-3.19-aufs/fs/namespace.c linux-3.19-aufs-modular/fs/namespace.c
+--- linux-3.19-aufs/fs/namespace.c	2015-02-09 04:54:22.000000000 +0200
+++ linux-3.19-aufs-modular/fs/namespace.c	2015-02-22 23:23:41.618919339 +0200
+@@ -454,6 +454,7 @@ void __mnt_drop_write(struct vfsmount *m
+ 	mnt_dec_writers(real_mount(mnt));
+ 	preempt_enable();
+ }
+EXPORT_SYMBOL_GPL(__mnt_drop_write);
+ 
+ /**
+  * mnt_drop_write - give up write access to a mount
+@@ -1728,6 +1729,7 @@ int iterate_mounts(int (*f)(struct vfsmo
+ 	}
+ 	return 0;
+ }
+EXPORT_SYMBOL(iterate_mounts);
+ 
+ static void cleanup_group_ids(struct mount *mnt, struct mount *end)
+ {
+diff -Nurp linux-3.19-aufs/fs/notify/group.c linux-3.19-aufs-modular/fs/notify/group.c
+--- linux-3.19-aufs/fs/notify/group.c	2015-02-09 04:54:22.000000000 +0200
+++ linux-3.19-aufs-modular/fs/notify/group.c	2015-02-22 23:23:41.618919339 +0200
+@@ -22,6 +22,7 @@
+ #include <linux/srcu.h>
+ #include <linux/rculist.h>
+ #include <linux/wait.h>
+#include <linux/module.h>
+ 
+ #include <linux/fsnotify_backend.h>
+ #include "fsnotify.h"
+@@ -72,6 +73,7 @@ void fsnotify_get_group(struct fsnotify_
+ {
+ 	atomic_inc(&group->refcnt);
+ }
+EXPORT_SYMBOL(fsnotify_get_group);
+ 
+ /*
+  * Drop a reference to a group.  Free it if it's through.
+@@ -81,6 +83,7 @@ void fsnotify_put_group(struct fsnotify_
+ 	if (atomic_dec_and_test(&group->refcnt))
+ 		fsnotify_final_destroy_group(group);
+ }
+EXPORT_SYMBOL(fsnotify_put_group);
+ 
+ /*
+  * Create a new fsnotify_group and hold a reference for the group returned.
+@@ -109,6 +112,7 @@ struct fsnotify_group *fsnotify_alloc_gr
+ 
+ 	return group;
+ }
+EXPORT_SYMBOL(fsnotify_alloc_group);
+ 
+ int fsnotify_fasync(int fd, struct file *file, int on)
+ {
+diff -Nurp linux-3.19-aufs/fs/notify/mark.c linux-3.19-aufs-modular/fs/notify/mark.c
+--- linux-3.19-aufs/fs/notify/mark.c	2015-02-09 04:54:22.000000000 +0200
+++ linux-3.19-aufs-modular/fs/notify/mark.c	2015-02-22 23:23:41.618919339 +0200
+@@ -109,6 +109,7 @@ void fsnotify_put_mark(struct fsnotify_m
+ 		mark->free_mark(mark);
+ 	}
+ }
+EXPORT_SYMBOL(fsnotify_put_mark);
+ 
+ /* Calculate mask of events for a list of marks */
+ u32 fsnotify_recalc_mask(struct hlist_head *head)
+@@ -202,6 +203,7 @@ void fsnotify_destroy_mark(struct fsnoti
+ 	fsnotify_destroy_mark_locked(mark, group);
+ 	mutex_unlock(&group->mark_mutex);
+ }
+EXPORT_SYMBOL(fsnotify_destroy_mark);
+ 
+ /*
+  * Destroy all marks in the given list. The marks must be already detached from
+@@ -386,6 +388,7 @@ int fsnotify_add_mark(struct fsnotify_ma
+ 	mutex_unlock(&group->mark_mutex);
+ 	return ret;
+ }
+EXPORT_SYMBOL(fsnotify_add_mark);
+ 
+ /*
+  * Given a list of marks, find the mark associated with given group. If found
+@@ -455,6 +458,7 @@ void fsnotify_init_mark(struct fsnotify_
+ 	atomic_set(&mark->refcnt, 1);
+ 	mark->free_mark = free_mark;
+ }
+EXPORT_SYMBOL(fsnotify_init_mark);
+ 
+ static int fsnotify_mark_destroy(void *ignored)
+ {
+diff -Nurp linux-3.19-aufs/fs/open.c linux-3.19-aufs-modular/fs/open.c
+--- linux-3.19-aufs/fs/open.c	2015-02-09 04:54:22.000000000 +0200
+++ linux-3.19-aufs-modular/fs/open.c	2015-02-22 23:23:41.618919339 +0200
+@@ -62,6 +62,7 @@ int do_truncate(struct dentry *dentry, l
+ 	mutex_unlock(&dentry->d_inode->i_mutex);
+ 	return ret;
+ }
+EXPORT_SYMBOL(do_truncate);
+ 
+ long vfs_truncate(struct path *path, loff_t length)
+ {
+diff -Nurp linux-3.19-aufs/fs/splice.c linux-3.19-aufs-modular/fs/splice.c
+--- linux-3.19-aufs/fs/splice.c	2015-02-22 23:16:18.315926795 +0200
+++ linux-3.19-aufs-modular/fs/splice.c	2015-02-22 23:23:41.619919343 +0200
+@@ -1127,6 +1127,7 @@ long do_splice_from(struct pipe_inode_in
+ 
+ 	return splice_write(pipe, out, ppos, len, flags);
+ }
+EXPORT_SYMBOL(do_splice_from);
+ 
+ /*
+  * Attempt to initiate a splice from a file to a pipe.
+@@ -1153,6 +1154,7 @@ long do_splice_to(struct file *in, loff_
+ 
+ 	return splice_read(in, ppos, pipe, len, flags);
+ }
+EXPORT_SYMBOL(do_splice_to);
+ 
+ /**
+  * splice_direct_to_actor - splices data directly between two non-pipes
+diff -Nurp linux-3.19-aufs/security/commoncap.c linux-3.19-aufs-modular/security/commoncap.c
+--- linux-3.19-aufs/security/commoncap.c	2015-02-09 04:54:22.000000000 +0200
+++ linux-3.19-aufs-modular/security/commoncap.c	2015-02-22 23:23:41.619919343 +0200
+@@ -979,9 +979,11 @@ int cap_mmap_addr(unsigned long addr)
+ 	}
+ 	return ret;
+ }
+EXPORT_SYMBOL(cap_mmap_addr);
+ 
+ int cap_mmap_file(struct file *file, unsigned long reqprot,
+ 		  unsigned long prot, unsigned long flags)
+ {
+ 	return 0;
+ }
+EXPORT_SYMBOL(cap_mmap_file);
+diff -Nurp linux-3.19-aufs/security/device_cgroup.c linux-3.19-aufs-modular/security/device_cgroup.c
+--- linux-3.19-aufs/security/device_cgroup.c	2015-02-09 04:54:22.000000000 +0200
+++ linux-3.19-aufs-modular/security/device_cgroup.c	2015-02-22 23:23:41.619919343 +0200
+@@ -7,6 +7,7 @@
+ #include <linux/device_cgroup.h>
+ #include <linux/cgroup.h>
+ #include <linux/ctype.h>
+#include <linux/export.h>
+ #include <linux/list.h>
+ #include <linux/uaccess.h>
+ #include <linux/seq_file.h>
+@@ -849,6 +850,7 @@ int __devcgroup_inode_permission(struct
+ 	return __devcgroup_check_permission(type, imajor(inode), iminor(inode),
+ 			access);
+ }
+EXPORT_SYMBOL(__devcgroup_inode_permission);
+ 
+ int devcgroup_inode_mknod(int mode, dev_t dev)
+ {
+diff -Nurp linux-3.19-aufs/security/security.c linux-3.19-aufs-modular/security/security.c
+--- linux-3.19-aufs/security/security.c	2015-02-09 04:54:22.000000000 +0200
+++ linux-3.19-aufs-modular/security/security.c	2015-02-22 23:23:41.619919343 +0200
+@@ -407,6 +407,7 @@ int security_path_rmdir(struct path *dir
+ 		return 0;
+ 	return security_ops->path_rmdir(dir, dentry);
+ }
+EXPORT_SYMBOL(security_path_rmdir);
+ 
+ int security_path_unlink(struct path *dir, struct dentry *dentry)
+ {
+@@ -423,6 +424,7 @@ int security_path_symlink(struct path *d
+ 		return 0;
+ 	return security_ops->path_symlink(dir, dentry, old_name);
+ }
+EXPORT_SYMBOL(security_path_symlink);
+ 
+ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ 		       struct dentry *new_dentry)
+@@ -431,6 +433,7 @@ int security_path_link(struct dentry *ol
+ 		return 0;
+ 	return security_ops->path_link(old_dentry, new_dir, new_dentry);
+ }
+EXPORT_SYMBOL(security_path_link);
+ 
+ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+ 			 struct path *new_dir, struct dentry *new_dentry,
+@@ -458,6 +461,7 @@ int security_path_truncate(struct path *
+ 		return 0;
+ 	return security_ops->path_truncate(path);
+ }
+EXPORT_SYMBOL(security_path_truncate);
+ 
+ int security_path_chmod(struct path *path, umode_t mode)
+ {
+@@ -465,6 +469,7 @@ int security_path_chmod(struct path *pat
+ 		return 0;
+ 	return security_ops->path_chmod(path, mode);
+ }
+EXPORT_SYMBOL(security_path_chmod);
+ 
+ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
+ {
+@@ -472,6 +477,7 @@ int security_path_chown(struct path *pat
+ 		return 0;
+ 	return security_ops->path_chown(path, uid, gid);
+ }
+EXPORT_SYMBOL(security_path_chown);
+ 
+ int security_path_chroot(struct path *path)
+ {
+@@ -557,6 +563,7 @@ int security_inode_readlink(struct dentr
+ 		return 0;
+ 	return security_ops->inode_readlink(dentry);
+ }
+EXPORT_SYMBOL(security_inode_readlink);
+ 
+ int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+@@ -571,6 +578,7 @@ int security_inode_permission(struct ino
+ 		return 0;
+ 	return security_ops->inode_permission(inode, mask);
+ }
+EXPORT_SYMBOL(security_inode_permission);
+ 
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ {
+@@ -693,6 +701,7 @@ int security_file_permission(struct file
+ 
+ 	return fsnotify_perm(file, mask);
+ }
+EXPORT_SYMBOL(security_file_permission);
+ 
+ int security_file_alloc(struct file *file)
+ {
+@@ -753,6 +762,7 @@ int security_mmap_file(struct file *file
+ 		return ret;
+ 	return ima_file_mmap(file, prot);
+ }
+EXPORT_SYMBOL(security_mmap_file);
+ 
+ int security_mmap_addr(unsigned long addr)
+ {
@@ -0,0 +1,96 @@
+From 3d84be799194147e04c0e3129ed44a948773b80a Mon Sep 17 00:00:00 2001
+From: Forrest Liu <forrestl@synology.com>
+Date: Wed, 11 Feb 2015 14:23:47 +0800
+Subject: [PATCH] Btrfs: fix BUG_ON in btrfs_orphan_add() when delete unused
+ block group
+
+Removing large amount of block group in a transaction may encounters
+BUG_ON() in btrfs_orphan_add(). That is because btrfs_orphan_reserve_metadata()
+will grab metadata reservation from transaction handle, and
+btrfs_delete_unused_bgs() didn't reserve metadata for trnasaction handle when
+delete unused block group.
+
+The problem can be reproduce by following script
+
+    mntpath=/btrfs
+    loopdev=/dev/loop0
+    filepath=/home/forrest/image
+
+    umount $mntpath
+    losetup -d $loopdev
+    truncate --size 1000g $filepath
+    losetup $loopdev $filepath
+    mkfs.btrfs -f $loopdev
+    mount $loopdev $mntpath
+
+    for j in `seq 1 1 1000`; do
+        fallocate -l 1g $mntpath/$j
+    done
+    # wait cleaner thread remove unused block group
+    sleep 300
+
+The call trace that results from the BUG_ON() is:
+
+[  613.093084] ------------[ cut here ]------------
+[  613.097928] kernel BUG at fs/btrfs/inode.c:3142!
+[  613.105855] invalid opcode: 0000 [#1] SMP
+[  613.112702] Modules linked in: coretemp(E) crc32_pclmul(E) ghash_clmulni_intel(E) aesni_intel(E) snd_ens1371(E) snd_ac97_codec(E) aes_x86_64(E) lrw(E) gf128mul(E) glue_helper(E) ppdev(E) ac97_bus(E) ablk_helper(E) gameport(E) cryptd(E) snd_rawmidi(E) snd_seq_device(E) snd_pcm(E) vmw_balloon(E) snd_timer(E) snd(E) soundcore(E) serio_raw(E) vmwgfx(E) ttm(E) drm_kms_helper(E) drm(E) vmw_vmci(E) parport_pc(E) shpchp(E) i2c_piix4(E) mac_hid(E) lp(E) parport(E) btrfs(E) xor(E) raid6_pq(E) hid_generic(E) usbhid(E) hid(E) psmouse(E) ahci(E) libahci(E) e1000(E) mptspi(E) mptscsih(E) mptbase(E) floppy(E) vmw_pvscsi(E) vmxnet3(E)
+[  613.144196] CPU: 0 PID: 1480 Comm: btrfs-cleaner Tainted: G            E  3.19.0-rc7-custom #2
+[  613.148501] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 07/31/2013
+[  613.152694] task: ffff880035cdb1a0 ti: ffff880039cf4000 task.ti: ffff880039cf4000
+[  613.154969] RIP: 0010:[<ffffffffa01441c2>]  [<ffffffffa01441c2>] btrfs_orphan_add+0x1d2/0x1e0 [btrfs]
+[  613.157780] RSP: 0018:ffff880039cf7c48  EFLAGS: 00010286
+[  613.159560] RAX: 00000000ffffffe4 RBX: ffff88003bd981a0 RCX: ffff88003c9e4000
+[  613.161904] RDX: 0000000000002244 RSI: 0000000000040000 RDI: ffff88003c9e4138
+[  613.164264] RBP: ffff880039cf7c88 R08: 000060ffc0000850 R09: 0000000000000000
+[  613.166507] R10: ffff88003bc4b7a0 R11: ffffea0000eb6740 R12: ffff88003c9c0000
+[  613.168681] R13: ffff88003c102160 R14: ffff88003c9c0458 R15: 0000000000000001
+[  613.170932] FS:  0000000000000000(0000) GS:ffff88003f600000(0000) knlGS:0000000000000000
+[  613.173316] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
+[  613.175227] CR2: 00007f6343537000 CR3: 0000000036329000 CR4: 00000000000407f0
+[  613.177554] Stack:
+[  613.178712]  ffff880039cf7c88 ffffffffa0182a54 ffff88003c9e4b04 ffff88003c9c7800
+[  613.181297]  ffff88003bc4b7a0 ffff88003bd981a0 ffff88003c8db200 ffff88003c2fcc60
+[  613.183782]  ffff880039cf7d18 ffffffffa012da97 ffff88003bc4b7a4 ffff88003bc4b7a0
+[  613.186171] Call Trace:
+[  613.187493]  [<ffffffffa0182a54>] ? lookup_free_space_inode+0x44/0x100 [btrfs]
+[  613.189801]  [<ffffffffa012da97>] btrfs_remove_block_group+0x137/0x740 [btrfs]
+[  613.192126]  [<ffffffffa0166912>] btrfs_remove_chunk+0x672/0x780 [btrfs]
+[  613.194267]  [<ffffffffa012e2ff>] btrfs_delete_unused_bgs+0x25f/0x280 [btrfs]
+[  613.196567]  [<ffffffffa0135e4c>] cleaner_kthread+0x12c/0x190 [btrfs]
+[  613.198687]  [<ffffffffa0135d20>] ? check_leaf+0x350/0x350 [btrfs]
+[  613.200758]  [<ffffffff8108f232>] kthread+0xd2/0xf0
+[  613.202616]  [<ffffffff8108f160>] ? kthread_create_on_node+0x180/0x180
+[  613.204738]  [<ffffffff8175dabc>] ret_from_fork+0x7c/0xb0
+[  613.206652]  [<ffffffff8108f160>] ? kthread_create_on_node+0x180/0x180
+[  613.208741] Code: ff ff 0f 1f 80 00 00 00 00 89 45 c8 3e 80 63 80 fd 48 89 df e8 d0 23 fe ff 8b 45 c8 e9 14 ff ff ff b8 f4 ff ff ff e9 12 ff ff ff <0f> 0b 66 66 66 2e 0f 1f 84 00 00 00 00 00 66 66 66 66 90 55 48
+[  613.216562] RIP  [<ffffffffa01441c2>] btrfs_orphan_add+0x1d2/0x1e0 [btrfs]
+[  613.218828]  RSP <ffff880039cf7c48>
+[  613.220382] ---[ end trace 71073106deb8a457 ]---
+
+This patch replace btrfs_join_transaction() with btrfs_start_transaction() in
+btrfs_delete_unused_bgs() to revent BUG_ON() in btrfs_orphan_add()
+
+Signed-off-by: Forrest Liu <forrestl@synology.com>
+Signed-off-by: Chris Mason <clm@fb.com>
+---
+ fs/btrfs/extent-tree.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
+index 0f67370..28ce5c8 100644
+--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
+@@ -9555,7 +9555,8 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)
+ 		 * Want to do this before we do anything else so we can recover
+ 		 * properly if we fail to join the transaction.
+ 		 */
+-		trans = btrfs_join_transaction(root);
+		/* 1 for btrfs_orphan_reserve_metadata() */
+		trans = btrfs_start_transaction(root, 1);
+ 		if (IS_ERR(trans)) {
+ 			btrfs_set_block_group_rw(root, block_group);
+ 			ret = PTR_ERR(trans);
+-- 
+2.3.1
+
@@ -0,0 +1,53 @@
+From 909e26dce3f7600f5e293ac0522c28790a0c8c9c Mon Sep 17 00:00:00 2001
+From: Omar Sandoval <osandov@osandov.com>
+Date: Fri, 10 Apr 2015 14:20:40 -0700
+Subject: btrfs: unlock i_mutex after attempting to delete subvolume during send
+
+From: Omar Sandoval <osandov@osandov.com>
+
+commit 909e26dce3f7600f5e293ac0522c28790a0c8c9c upstream.
+
+Whenever the check for a send in progress introduced in commit
+521e0546c970 (btrfs: protect snapshots from deleting during send) is
+hit, we return without unlocking inode->i_mutex. This is easy to see
+with lockdep enabled:
+
+[  +0.000059] ================================================
+[  +0.000028] [ BUG: lock held when returning to user space! ]
+[  +0.000029] 4.0.0-rc5-00096-g3c435c1 #93 Not tainted
+[  +0.000026] ------------------------------------------------
+[  +0.000029] btrfs/211 is leaving the kernel with locks still held!
+[  +0.000029] 1 lock held by btrfs/211:
+[  +0.000023]  #0:  (&type->i_mutex_dir_key){+.+.+.}, at: [<ffffffff8135b8df>] btrfs_ioctl_snap_destroy+0x2df/0x7a0
+
+Make sure we unlock it in the error path.
+
+Reviewed-by: Filipe Manana <fdmanana@suse.com>
+Reviewed-by: David Sterba <dsterba@suse.cz>
+Signed-off-by: Omar Sandoval <osandov@osandov.com>
+Signed-off-by: Chris Mason <clm@fb.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/btrfs/ioctl.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
+@@ -2403,7 +2403,7 @@ static noinline int btrfs_ioctl_snap_des
+ 			"Attempt to delete subvolume %llu during send",
+ 			dest->root_key.objectid);
+ 		err = -EPERM;
+-		goto out_dput;
+		goto out_unlock_inode;
+ 	}
+ 
+ 	d_invalidate(dentry);
+@@ -2498,6 +2498,7 @@ out_up_write:
+ 				root_flags & ~BTRFS_ROOT_SUBVOL_DEAD);
+ 		spin_unlock(&dest->root_item_lock);
+ 	}
+out_unlock_inode:
+ 	mutex_unlock(&inode->i_mutex);
+ 	if (!err) {
+ 		shrink_dcache_sb(root->fs_info->sb);
@@ -0,0 +1,41 @@
+From: Ross Lagerwall <ross.lagerwall-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org>
+Subject: [PATCH RESEND] efivarfs: Ensure VariableName is NUL-terminated
+Date: Thu, 2 Apr 2015 08:39:00 +0100
+
+Some buggy firmware implementations update VariableNameSize on success
+such that it does not include the final NUL character which results in
+garbage in the efivarfs name entries.  Use kzalloc on the efivar_entry
+(as is done in efivars.c) to ensure that the name is always
+NUL-terminated.
+
+The buggy firmware is:
+BIOS Information
+        Vendor: Intel Corp.
+        Version: S1200RP.86B.02.02.0005.102320140911
+        Release Date: 10/23/2014
+        BIOS Revision: 4.6
+System Information
+        Manufacturer: Intel Corporation
+        Product Name: S1200RP_SE
+
+Signed-off-by: Ross Lagerwall <ross.lagerwall-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org>
+---
+ fs/efivarfs/super.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
+index ddbce42..acf9a67 100644
+--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
+@@ -121,7 +121,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,
+ 	int len, i;
+ 	int err = -ENOMEM;
+ 
+-	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
+ 	if (!entry)
+ 		return err;
+ 
+-- 
+2.1.0
+
@@ -0,0 +1,93 @@
+From d2dc317d564a46dfc683978a2e5a4f91434e9711 Mon Sep 17 00:00:00 2001
+From: Lukas Czerner <lczerner@redhat.com>
+Date: Sat, 2 May 2015 21:36:55 -0400
+Subject: [PATCH] ext4: fix data corruption caused by unwritten and delayed
+ extents
+
+Currently it is possible to lose whole file system block worth of data
+when we hit the specific interaction with unwritten and delayed extents
+in status extent tree.
+
+The problem is that when we insert delayed extent into extent status
+tree the only way to get rid of it is when we write out delayed buffer.
+However there is a limitation in the extent status tree implementation
+so that when inserting unwritten extent should there be even a single
+delayed block the whole unwritten extent would be marked as delayed.
+
+At this point, there is no way to get rid of the delayed extents,
+because there are no delayed buffers to write out. So when a we write
+into said unwritten extent we will convert it to written, but it still
+remains delayed.
+
+When we try to write into that block later ext4_da_map_blocks() will set
+the buffer new and delayed and map it to invalid block which causes
+the rest of the block to be zeroed loosing already written data.
+
+For now we can fix this by simply not allowing to set delayed status on
+written extent in the extent status tree. Also add WARN_ON() to make
+sure that we notice if this happens in the future.
+
+This problem can be easily reproduced by running the following xfs_io.
+
+xfs_io -f -c "pwrite -S 0xaa 4096 2048" \
+          -c "falloc 0 131072" \
+          -c "pwrite -S 0xbb 65536 2048" \
+          -c "fsync" /mnt/test/fff
+
+echo 3 > /proc/sys/vm/drop_caches
+xfs_io -c "pwrite -S 0xdd 67584 2048" /mnt/test/fff
+
+This can be theoretically also reproduced by at random by running fsx,
+but it's not very reliable, though on machines with bigger page size
+(like ppc) this can be seen more often (especially xfstest generic/127)
+
+Signed-off-by: Lukas Czerner <lczerner@redhat.com>
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Cc: stable@vger.kernel.org
+---
+ fs/ext4/extents_status.c | 8 ++++++++
+ fs/ext4/inode.c          | 2 ++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
+index d33d5a6..26724ae 100644
+--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
+@@ -703,6 +703,14 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
+ 
+ 	BUG_ON(end < lblk);
+ 
+	if ((status & EXTENT_STATUS_DELAYED) &&
+	    (status & EXTENT_STATUS_WRITTEN)) {
+		ext4_warning(inode->i_sb, "Inserting extent [%u/%u] as "
+				" delayed and written which can potentially "
+				" cause data loss.\n", lblk, len);
+		WARN_ON(1);
+	}
+
+ 	newes.es_lblk = lblk;
+ 	newes.es_len = len;
+ 	ext4_es_store_pblock_status(&newes, pblk, status);
+diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
+index f6b35d8..4415cea 100644
+--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
+@@ -532,6 +532,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,
+ 		status = map->m_flags & EXT4_MAP_UNWRITTEN ?
+ 				EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;
+ 		if (!(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) &&
+		    !(status & EXTENT_STATUS_WRITTEN) &&
+ 		    ext4_find_delalloc_range(inode, map->m_lblk,
+ 					     map->m_lblk + map->m_len - 1))
+ 			status |= EXTENT_STATUS_DELAYED;
+@@ -636,6 +637,7 @@ found:
+ 		status = map->m_flags & EXT4_MAP_UNWRITTEN ?
+ 				EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;
+ 		if (!(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) &&
+		    !(status & EXTENT_STATUS_WRITTEN) &&
+ 		    ext4_find_delalloc_range(inode, map->m_lblk,
+ 					     map->m_lblk + map->m_len - 1))
+ 			status |= EXTENT_STATUS_DELAYED;
+-- 
+2.3.2
+
@@ -0,0 +1,53 @@
+From 280227a75b56ab5d35854f3a77ef74a7ad56a203 Mon Sep 17 00:00:00 2001
+From: Davide Italiano <dccitaliano@gmail.com>
+Date: Sat, 2 May 2015 23:21:15 -0400
+Subject: ext4: move check under lock scope to close a race.
+
+From: Davide Italiano <dccitaliano@gmail.com>
+
+commit 280227a75b56ab5d35854f3a77ef74a7ad56a203 upstream.
+
+fallocate() checks that the file is extent-based and returns
+EOPNOTSUPP in case is not. Other tasks can convert from and to
+indirect and extent so it's safe to check only after grabbing
+the inode mutex.
+
+Signed-off-by: Davide Italiano <dccitaliano@gmail.com>
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/ext4/extents.c |   15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
+@@ -4934,13 +4934,6 @@ long ext4_fallocate(struct file *file, i
+ 	if (ret)
+ 		return ret;
+ 
+-	/*
+-	 * currently supporting (pre)allocate mode for extent-based
+-	 * files _only_
+-	 */
+-	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))
+-		return -EOPNOTSUPP;
+-
+ 	if (mode & FALLOC_FL_COLLAPSE_RANGE)
+ 		return ext4_collapse_range(inode, offset, len);
+ 
+@@ -4962,6 +4955,14 @@ long ext4_fallocate(struct file *file, i
+ 
+ 	mutex_lock(&inode->i_mutex);
+ 
+	/*
+	 * We only support preallocation for extent-based files only
+	 */
+	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {
+		ret = -EOPNOTSUPP;
+		goto out;
+	}
+
+ 	if (!(mode & FALLOC_FL_KEEP_SIZE) &&
+ 	     offset + len > i_size_read(inode)) {
+ 		new_size = offset + len;
@@ -0,0 +1,49 @@
+From cd4a40174b71acd021877341684d8bb1dc8ea4ae Mon Sep 17 00:00:00 2001
+From: "Eric W. Biederman" <ebiederm@xmission.com>
+Date: Wed, 7 Jan 2015 14:28:26 -0600
+Subject: [PATCH] mnt: Fail collect_mounts when applied to unmounted mounts
+
+The only users of collect_mounts are in audit_tree.c
+
+In audit_trim_trees and audit_add_tree_rule the path passed into
+collect_mounts is generated from kern_path passed an audit_tree
+pathname which is guaranteed to be an absolute path.   In those cases
+collect_mounts is obviously intended to work on mounted paths and
+if a race results in paths that are unmounted when collect_mounts
+it is reasonable to fail early.
+
+The paths passed into audit_tag_tree don't have the absolute path
+check.  But are used to play with fsnotify and otherwise interact with
+the audit_trees, so again operating only on mounted paths appears
+reasonable.
+
+Avoid having to worry about what happens when we try and audit
+unmounted filesystems by restricting collect_mounts to mounts
+that appear in the mount tree.
+
+Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
+---
+ fs/namespace.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/fs/namespace.c b/fs/namespace.c
+index 2b12b7a..acc5583 100644
+--- a/fs/namespace.c
+++ b/fs/namespace.c
+@@ -1669,8 +1669,11 @@ struct vfsmount *collect_mounts(struct path *path)
+ {
+ 	struct mount *tree;
+ 	namespace_lock();
+-	tree = copy_tree(real_mount(path->mnt), path->dentry,
+-			 CL_COPY_ALL | CL_PRIVATE);
+	if (!check_mnt(real_mount(path->mnt)))
+		tree = ERR_PTR(-EINVAL);
+	else
+		tree = copy_tree(real_mount(path->mnt), path->dentry,
+				 CL_COPY_ALL | CL_PRIVATE);
+ 	namespace_unlock();
+ 	if (IS_ERR(tree))
+ 		return ERR_CAST(tree);
+-- 
+2.3.2
+
@@ -0,0 +1,36 @@
+From 7e96c1b0e0f495c5a7450dc4aa7c9a24ba4305bd Mon Sep 17 00:00:00 2001
+From: "Eric W. Biederman" <ebiederm@xmission.com>
+Date: Fri, 8 May 2015 16:36:50 -0500
+Subject: [PATCH] mnt: Fix fs_fully_visible to verify the root directory is
+ visible
+
+This fixes a dumb bug in fs_fully_visible that allows proc or sys to
+be mounted if there is a bind mount of part of /proc/ or /sys/ visible.
+
+Cc: stable@vger.kernel.org
+Reported-by: Eric Windisch <ewindisch@docker.com>
+Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
+---
+ fs/namespace.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/fs/namespace.c b/fs/namespace.c
+index 1f4f9da..1b9e111 100644
+--- a/fs/namespace.c
+++ b/fs/namespace.c
+@@ -3179,6 +3179,12 @@ bool fs_fully_visible(struct file_system_type *type)
+ 		if (mnt->mnt.mnt_sb->s_type != type)
+ 			continue;
+ 
+		/* This mount is not fully visible if it's root directory
+		 * is not the root directory of the filesystem.
+		 */
+		if (mnt->mnt.mnt_root != mnt->mnt.mnt_sb->s_root)
+			continue;
+
+ 		/* This mount is not fully visible if there are any child mounts
+ 		 * that cover anything except for empty directories.
+ 		 */
+-- 
+2.3.2
+
@@ -0,0 +1,36 @@
+From f15133df088ecadd141ea1907f2c96df67c729f0 Mon Sep 17 00:00:00 2001
+From: Al Viro <viro@zeniv.linux.org.uk>
+Date: Fri, 8 May 2015 22:53:15 -0400
+Subject: [PATCH] path_openat(): fix double fput()
+
+path_openat() jumps to the wrong place after do_tmpfile() - it has
+already done path_cleanup() (as part of path_lookupat() called by
+do_tmpfile()), so doing that again can lead to double fput().
+
+Cc: stable@vger.kernel.org	# v3.11+
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+---
+ fs/namei.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/fs/namei.c b/fs/namei.c
+index f67cf6c..fe30d3b 100644
+--- a/fs/namei.c
+++ b/fs/namei.c
+@@ -3209,7 +3209,7 @@ static struct file *path_openat(int dfd,
+ 
+ 	if (unlikely(file->f_flags & __O_TMPFILE)) {
+ 		error = do_tmpfile(dfd, pathname, nd, flags, op, file, &opened);
+-		goto out;
+		goto out2;
+ 	}
+ 
+ 	error = path_init(dfd, pathname->name, flags, nd);
+@@ -3239,6 +3239,7 @@ static struct file *path_openat(int dfd,
+ 	}
+ out:
+ 	path_cleanup(nd);
+out2:
+ 	if (!(opened & FILE_OPENED)) {
+ 		BUG_ON(!error);
+ 		put_filp(file);
@@ -0,0 +1,136 @@
+From 0ff28d9f4674d781e492bcff6f32f0fe48cf0fed Mon Sep 17 00:00:00 2001
+From: Christophe Leroy <christophe.leroy@c-s.fr>
+Date: Wed, 6 May 2015 17:26:47 +0200
+Subject: [PATCH] splice: sendfile() at once fails for big files
+
+Using sendfile with below small program to get MD5 sums of some files,
+it appear that big files (over 64kbytes with 4k pages system) get a
+wrong MD5 sum while small files get the correct sum.
+This program uses sendfile() to send a file to an AF_ALG socket
+for hashing.
+
+/* md5sum2.c */
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <linux/if_alg.h>
+
+int main(int argc, char **argv)
+{
+	int sk = socket(AF_ALG, SOCK_SEQPACKET, 0);
+	struct stat st;
+	struct sockaddr_alg sa = {
+		.salg_family = AF_ALG,
+		.salg_type = "hash",
+		.salg_name = "md5",
+	};
+	int n;
+
+	bind(sk, (struct sockaddr*)&sa, sizeof(sa));
+
+	for (n = 1; n < argc; n++) {
+		int size;
+		int offset = 0;
+		char buf[4096];
+		int fd;
+		int sko;
+		int i;
+
+		fd = open(argv[n], O_RDONLY);
+		sko = accept(sk, NULL, 0);
+		fstat(fd, &st);
+		size = st.st_size;
+		sendfile(sko, fd, &offset, size);
+		size = read(sko, buf, sizeof(buf));
+		for (i = 0; i < size; i++)
+			printf("%2.2x", buf[i]);
+		printf("  %s\n", argv[n]);
+		close(fd);
+		close(sko);
+	}
+	exit(0);
+}
+
+Test below is done using official linux patch files. First result is
+with a software based md5sum. Second result is with the program above.
+
+root@vgoip:~# ls -l patch-3.6.*
+-rw-r--r--    1 root     root         64011 Aug 24 12:01 patch-3.6.2.gz
+-rw-r--r--    1 root     root         94131 Aug 24 12:01 patch-3.6.3.gz
+
+root@vgoip:~# md5sum patch-3.6.*
+b3ffb9848196846f31b2ff133d2d6443  patch-3.6.2.gz
+c5e8f687878457db77cb7158c38a7e43  patch-3.6.3.gz
+
+root@vgoip:~# ./md5sum2 patch-3.6.*
+b3ffb9848196846f31b2ff133d2d6443  patch-3.6.2.gz
+5fd77b24e68bb24dcc72d6e57c64790e  patch-3.6.3.gz
+
+After investivation, it appears that sendfile() sends the files by blocks
+of 64kbytes (16 times PAGE_SIZE). The problem is that at the end of each
+block, the SPLICE_F_MORE flag is missing, therefore the hashing operation
+is reset as if it was the end of the file.
+
+This patch adds SPLICE_F_MORE to the flags when more data is pending.
+
+With the patch applied, we get the correct sums:
+
+root@vgoip:~# md5sum patch-3.6.*
+b3ffb9848196846f31b2ff133d2d6443  patch-3.6.2.gz
+c5e8f687878457db77cb7158c38a7e43  patch-3.6.3.gz
+
+root@vgoip:~# ./md5sum2 patch-3.6.*
+b3ffb9848196846f31b2ff133d2d6443  patch-3.6.2.gz
+c5e8f687878457db77cb7158c38a7e43  patch-3.6.3.gz
+
+Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
+Signed-off-by: Jens Axboe <axboe@fb.com>
+---
+ fs/splice.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/fs/splice.c b/fs/splice.c
+index 476024b..bfe62ae 100644
+--- a/fs/splice.c
+++ b/fs/splice.c
+@@ -1161,7 +1161,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
+ 	long ret, bytes;
+ 	umode_t i_mode;
+ 	size_t len;
+-	int i, flags;
+	int i, flags, more;
+ 
+ 	/*
+ 	 * We require the input being a regular file, as we don't want to
+@@ -1204,6 +1204,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
+ 	 * Don't block on output, we have to drain the direct pipe.
+ 	 */
+ 	sd->flags &= ~SPLICE_F_NONBLOCK;
+	more = sd->flags & SPLICE_F_MORE;
+ 
+ 	while (len) {
+ 		size_t read_len;
+@@ -1217,6 +1218,15 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
+ 		sd->total_len = read_len;
+ 
+ 		/*
+		 * If more data is pending, set SPLICE_F_MORE
+		 * If this is the last data and SPLICE_F_MORE was not set
+		 * initially, clears it.
+		 */
+		if (read_len < len)
+			sd->flags |= SPLICE_F_MORE;
+		else if (!more)
+			sd->flags &= ~SPLICE_F_MORE;
+		/*
+ 		 * NOTE: nonblocking mode only applies to the input. We
+ 		 * must not do the output in nonblocking mode as then we
+ 		 * could get stuck data in the internal pipe:
+-- 
+2.3.2
+
--- a/Show More
+++ b/Show More