Linux v3.15.4
This commit is contained in:
Justin M. Forbes
parent
305024aa2a
commit
6d252143b7
|
|
@ -1,39 +0,0 @@
|
|||
Bugzilla: 1099761
|
||||
Upstream-status: 3.16 and CC'd for stable
|
||||
|
||||
From a914722f333b3359d2f4f12919380a334176bb89 Mon Sep 17 00:00:00 2001
|
||||
From: Mateusz Guzik <mguzik@redhat.com>
|
||||
Date: Tue, 10 Jun 2014 12:44:12 +0200
|
||||
Subject: [PATCH] NFS: populate ->net in mount data when remounting
|
||||
|
||||
Otherwise the kernel oopses when remounting with IPv6 server because
|
||||
net is dereferenced in dev_get_by_name.
|
||||
|
||||
Use net ns of current thread so that dev_get_by_name does not operate on
|
||||
foreign ns. Changing the address is prohibited anyway so this should not
|
||||
affect anything.
|
||||
|
||||
Signed-off-by: Mateusz Guzik <mguzik@redhat.com>
|
||||
Cc: linux-nfs@vger.kernel.org
|
||||
Cc: linux-kernel@vger.kernel.org
|
||||
Cc: stable@vger.kernel.org # 3.4+
|
||||
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
|
||||
---
|
||||
fs/nfs/super.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
|
||||
index 1a6d7ac9d9d2..084af1060d79 100644
|
||||
--- a/fs/nfs/super.c
|
||||
+++ b/fs/nfs/super.c
|
||||
@@ -2260,6 +2260,7 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
|
||||
data->nfs_server.addrlen = nfss->nfs_client->cl_addrlen;
|
||||
data->version = nfsvers;
|
||||
data->minorversion = nfss->nfs_client->cl_minorversion;
|
||||
+ data->net = current->nsproxy->net_ns;
|
||||
memcpy(&data->nfs_server.address, &nfss->nfs_client->cl_addr,
|
||||
data->nfs_server.addrlen);
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
Bugzilla: 1103528
|
||||
Upstream-status: Sent for 3.16
|
||||
|
||||
From 3b629bf4b018ece0c7b4d1c03bdc0eb69c884531 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Thu, 5 Jun 2014 11:48:30 +0200
|
||||
Subject: [PATCH] elantech: Deal with clickpads reporting right button events
|
||||
|
||||
At least the Dell Vostro 5470 elantech *clickpad* reports right button
|
||||
clicks when clicked in the right bottom area.
|
||||
|
||||
This is different from how (elantech) clickpads normally operate,
|
||||
normally no matter where the user clicks on the pad the pad always reports
|
||||
a left button event, since there is only 1 hardware button beneath the path.
|
||||
|
||||
It is unknown if this is caused by Dell having put 2 buttons under the pad,
|
||||
one under each bottom corner, or if this is something caused by the specific
|
||||
firmware in this clickpad.
|
||||
|
||||
Since this however still clearly is a real clickpad hardware-wise, we still
|
||||
want to report it as such to userspace, so that things like finger movement
|
||||
in the bottom area can be properly ignored as it should be on clickpads.
|
||||
|
||||
So deal with this weirdness by simply mapping a right click to a left click
|
||||
on elantech clickpads. As an added advantage this is something which we can
|
||||
simply do on all elantech clickpads, so no need to add special quirks for
|
||||
this weird model.
|
||||
|
||||
Reported-by: Elder Marco <eldermarco@gmail.com>
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
drivers/input/mouse/elantech.c | 22 ++++++++++++++++++----
|
||||
1 file changed, 18 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
|
||||
index 4d79821..846926d 100644
|
||||
--- a/drivers/input/mouse/elantech.c
|
||||
+++ b/drivers/input/mouse/elantech.c
|
||||
@@ -473,8 +473,15 @@ static void elantech_report_absolute_v3(struct psmouse *psmouse,
|
||||
input_report_key(dev, BTN_TOOL_FINGER, fingers == 1);
|
||||
input_report_key(dev, BTN_TOOL_DOUBLETAP, fingers == 2);
|
||||
input_report_key(dev, BTN_TOOL_TRIPLETAP, fingers == 3);
|
||||
- input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
|
||||
- input_report_key(dev, BTN_RIGHT, packet[0] & 0x02);
|
||||
+
|
||||
+ /* For clickpads map both buttons to BTN_LEFT */
|
||||
+ if (etd->fw_version & 0x001000) {
|
||||
+ input_report_key(dev, BTN_LEFT, packet[0] & 0x03);
|
||||
+ } else {
|
||||
+ input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
|
||||
+ input_report_key(dev, BTN_RIGHT, packet[0] & 0x02);
|
||||
+ }
|
||||
+
|
||||
input_report_abs(dev, ABS_PRESSURE, pres);
|
||||
input_report_abs(dev, ABS_TOOL_WIDTH, width);
|
||||
|
||||
@@ -484,10 +491,17 @@ static void elantech_report_absolute_v3(struct psmouse *psmouse,
|
||||
static void elantech_input_sync_v4(struct psmouse *psmouse)
|
||||
{
|
||||
struct input_dev *dev = psmouse->dev;
|
||||
+ struct elantech_data *etd = psmouse->private;
|
||||
unsigned char *packet = psmouse->packet;
|
||||
|
||||
- input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
|
||||
- input_report_key(dev, BTN_RIGHT, packet[0] & 0x02);
|
||||
+ /* For clickpads map both buttons to BTN_LEFT */
|
||||
+ if (etd->fw_version & 0x001000) {
|
||||
+ input_report_key(dev, BTN_LEFT, packet[0] & 0x03);
|
||||
+ } else {
|
||||
+ input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
|
||||
+ input_report_key(dev, BTN_RIGHT, packet[0] & 0x02);
|
||||
+ }
|
||||
+
|
||||
input_mt_report_pointer_emulation(dev, true);
|
||||
input_sync(dev);
|
||||
}
|
||||
--
|
||||
2.0.0
|
||||
|
||||
19
kernel.spec
19
kernel.spec
|
|
@ -74,7 +74,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 3
|
||||
%define stable_update 4
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
# Set rpm version accordingly
|
||||
|
|
@ -736,15 +736,9 @@ Patch25096: drm-i915-set-backlight-duty-cycle-after-backlight-enable-for-gen4.pa
|
|||
#rhbz 1064516
|
||||
Patch25098: e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch
|
||||
|
||||
#rhbz 1099761
|
||||
Patch25099: NFS-populate-net-in-mount-data-when-remounting.patch
|
||||
|
||||
#rhbz 1106856
|
||||
Patch25100: dm-thin-update-discard_granularity-to-reflect-the-thin-pool-blocksize.patch
|
||||
|
||||
#rhbz 1103528
|
||||
Patch25101: elantech-Deal-with-clickpads-reporting-right-button-.patch
|
||||
|
||||
Patch25102: intel_pstate-Fix-setting-VID.patch
|
||||
Patch25103: intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch
|
||||
Patch25104: intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch
|
||||
|
|
@ -1458,15 +1452,9 @@ ApplyPatch drm-i915-set-backlight-duty-cycle-after-backlight-enable-for-gen4.pat
|
|||
#rhbz 1064516
|
||||
ApplyPatch e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch
|
||||
|
||||
#rhbz 1099761
|
||||
ApplyPatch NFS-populate-net-in-mount-data-when-remounting.patch
|
||||
|
||||
#rhbz 1106856
|
||||
ApplyPatch dm-thin-update-discard_granularity-to-reflect-the-thin-pool-blocksize.patch
|
||||
|
||||
#rhbz 1103528
|
||||
ApplyPatch elantech-Deal-with-clickpads-reporting-right-button-.patch
|
||||
|
||||
ApplyPatch intel_pstate-Fix-setting-VID.patch
|
||||
ApplyPatch intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch
|
||||
ApplyPatch intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch
|
||||
|
|
@ -2296,6 +2284,11 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Mon Jul 7 2014 Justin M. Forbes <jforbes@fedoraproject.org> 3.15.4-200
|
||||
- Linux v3.15.4
|
||||
- Fixes CVE-2014-4715 (rhbz 1115767 1116362)
|
||||
- Fixes CVE-2014-4699 (rhbz 1115927 1116477)
|
||||
|
||||
* Tue Jul 1 2014 Justin M. Forbes <jforbes@fedoraproject.org> 3.15.3-200
|
||||
- Linux v3.15.3
|
||||
- drm/i915: Fix backlight regression caused by misconfigured VBT
|
||||
|
|
|
|||
Loading…
Reference in New Issue