summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2016-01-15 11:04:43 -0600
committerJustin M. Forbes <jforbes@redhat.com>2016-01-15 11:04:43 -0600
commit57edd9b76bfe2e787f56ad0928f00a206cac5199 (patch)
treedc601d6d40cf1583b2ff3b522eed0f4d10dfa061
parent9ae86272fd4a76bea1d15ed16c25e37e5d1cfefd (diff)
downloadkernel-57edd9b76bfe2e787f56ad0928f00a206cac5199.tar.gz
kernel-57edd9b76bfe2e787f56ad0928f00a206cac5199.tar.xz
kernel-57edd9b76bfe2e787f56ad0928f00a206cac5199.zip
Linux v4.4-5966-g7d1fc01
-rw-r--r--HID-multitouch-enable-palm-rejection-if-device-imple.patch41
-rw-r--r--gitrev2
-rw-r--r--kernel.spec10
-rw-r--r--mfd-wm8994-Ensure-that-the-whole-MFD-is-built-into-a.patch28
-rw-r--r--sources2
5 files changed, 6 insertions, 77 deletions
diff --git a/HID-multitouch-enable-palm-rejection-if-device-imple.patch b/HID-multitouch-enable-palm-rejection-if-device-imple.patch
deleted file mode 100644
index b9753fce7..000000000
--- a/HID-multitouch-enable-palm-rejection-if-device-imple.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 37e81f1a82ba4f214c05c4cc3807378753c7a867 Mon Sep 17 00:00:00 2001
-From: Allen Hung <allen_hung@dell.com>
-Date: Fri, 20 Nov 2015 18:21:06 +0800
-Subject: [PATCH] HID: multitouch: enable palm rejection if device implements
- confidence usage
-
-The usage Confidence is mandary to Windows Precision Touchpad devices. The
-appearance of this usage is checked in hidinput_connect but the quirk
-MT_QUIRK_VALID_IS_CONFIDENCE is not applied to device accordingly.
-Apply this quirk and also remove quirk MT_QUIRK_ALWAYS_VALID to enable palm
-rejection for the WIN 8 touchpad devices which have implemented usage
-Confidence in its input reports.
-
-Tested on Dell XPS 13 laptop.
-
-Signed-off-by: Allen Hung <allen_hung@dell.com>
-Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
----
- drivers/hid/hid-multitouch.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 7c811252c1ce..0c94348a168d 100644
---- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -448,6 +448,11 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
- mt_store_field(usage, td, hi);
- return 1;
- case HID_DG_CONFIDENCE:
-+ if (cls->name == MT_CLS_WIN_8 &&
-+ field->application == HID_DG_TOUCHPAD) {
-+ cls->quirks &= ~MT_QUIRK_ALWAYS_VALID;
-+ cls->quirks |= MT_QUIRK_VALID_IS_CONFIDENCE;
-+ }
- mt_store_field(usage, td, hi);
- return 1;
- case HID_DG_TIPSWITCH:
---
-2.5.0
-
diff --git a/gitrev b/gitrev
index fc7647f6b..9c407044e 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-7fdec82af6a9e190e53d07a1463d2a9ac49a8750
+7d1fc01afc5af35e5197e0e75abe900f6bd279b8
diff --git a/kernel.spec b/kernel.spec
index b3ee05937..be1d43190 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 3
+%define gitrev 4
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -506,8 +506,6 @@ Patch456: arm64-acpi-drop-expert-patch.patch
Patch457: ARM-tegra-usb-no-reset.patch
-Patch460: mfd-wm8994-Ensure-that-the-whole-MFD-is-built-into-a.patch
-
Patch463: arm-i.MX6-Utilite-device-dtb.patch
Patch466: input-kill-stupid-messages.patch
@@ -586,9 +584,6 @@ Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
Patch508: kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
-#rhbz 1287819
-Patch570: HID-multitouch-enable-palm-rejection-if-device-imple.patch
-
#rhbz 1286293
Patch571: ideapad-laptop-Add-Lenovo-ideapad-Y700-17ISK-to-no_h.patch
@@ -2048,6 +2043,9 @@ fi
#
#
%changelog
+* Fri Jan 15 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc0.git4.1
+- Linux v4.4-5966-g7d1fc01
+
* Thu Jan 14 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc0.git3.1
- Linux v4.4-5593-g7fdec82
diff --git a/mfd-wm8994-Ensure-that-the-whole-MFD-is-built-into-a.patch b/mfd-wm8994-Ensure-that-the-whole-MFD-is-built-into-a.patch
deleted file mode 100644
index dfedd2ab0..000000000
--- a/mfd-wm8994-Ensure-that-the-whole-MFD-is-built-into-a.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 567a18f57213647e2c31bbdc7f6b8f9991d22fad Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Fri, 13 Nov 2015 19:03:29 +0000
-Subject: [PATCH] mfd: wm8994: Ensure that the whole MFD is built into a single
- module
-
-Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
----
- drivers/mfd/Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
-index a59e3fc..4a767ef 100644
---- a/drivers/mfd/Makefile
-+++ b/drivers/mfd/Makefile
-@@ -61,7 +61,8 @@ wm8350-objs := wm8350-core.o wm8350-regmap.o wm8350-gpio.o
- wm8350-objs += wm8350-irq.o
- obj-$(CONFIG_MFD_WM8350) += wm8350.o
- obj-$(CONFIG_MFD_WM8350_I2C) += wm8350-i2c.o
--obj-$(CONFIG_MFD_WM8994) += wm8994-core.o wm8994-irq.o wm8994-regmap.o
-+wm8994-objs := wm8994-core.o wm8994-irq.o wm8994-regmap.o
-+obj-$(CONFIG_MFD_WM8994) += wm8994.o
-
- obj-$(CONFIG_TPS6105X) += tps6105x.o
- obj-$(CONFIG_TPS65010) += tps65010.o
---
-2.5.0
-
diff --git a/sources b/sources
index f1aa7def6..128dbdbe8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
9a78fa2eb6c68ca5a40ed5af08142599 linux-4.4.tar.xz
dcbc8fe378a676d5d0dd208cf524e144 perf-man-4.4.tar.gz
-aec418883cc715fdbfce4b6dcc04c8f0 patch-4.4-git3.xz
+48e32361f4429bf2b4908fd982fe6b9b patch-4.4-git4.xz