~ubuntu-kernel/ubuntu/+source/linux/+git/vivid:ww-sync

Last commit made on 2015-03-27
Get this branch:
git clone -b ww-sync https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/vivid
Members of Ubuntu Kernel Repositories can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

688f27f... by Benjamin Tissoires <email address hidden>

Input: synaptics - remove X1 Carbon 3rd gen from the topbuttonpad list

BugLink: http://bugs.launchpad.net/bugs/1414930

Lenovo decided to switch back to physical buttons for the trackstick on
their latest series. The PNPId list was provided before they reverted back
to physical buttons, so it contains the new models too. We can know from
the touchpad capabilities that the touchpad has physical buttons, so
removing the ids from the list is not mandatory. It is still nicer to
remove the wrong ids, so start by removing the X1 Carbon 3rd gen, with the
PNPId of LEN0048.

Signed-off-by: Benjamin Tissoires <email address hidden>
Acked-by: Hans de Goede <email address hidden>
Signed-off-by: Dmitry Torokhov <email address hidden>
(cherry picked from commit 860e6f7fcbe5653ec4e394f9ee335f2032398beb)
Signed-off-by: Timo Aaltonen <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Acked-by: Seth Forshee <email address hidden>
Signed-off-by: Andy Whitcroft <email address hidden>

112fac6... by Benjamin Tissoires <email address hidden>

Input: synaptics - re-route tracksticks buttons on the Lenovo 2015 series

BugLink: http://bugs.launchpad.net/bugs/1414930

The 2015 series of the Lenovo thinkpads added back the hardware buttons on
top of the touchpad for the trackstick.

Unfortunately, they are wired to the touchpad, and not the trackstick.
Thus, they are seen as extra buttons from the kernel point of view.

This leads to a problem in user space because extra buttons on synaptics
devices used to be used as scroll up/down buttons. So in the end, the
experience for the user is scroll events for buttons left and right when
using the trackstick. Yay!

Fortunately, the firmware advertises such behavior in the extended
capability $10, and so we can re-route the buttons through the pass-through
interface.

Hallelujah-expressed-by: Peter Hutterer <email address hidden>
Signed-off-by: Benjamin Tissoires <email address hidden>
Acked-by: Hans de Goede <email address hidden>
Signed-off-by: Dmitry Torokhov <email address hidden>
(cherry picked from commit cdd9dc195916ef5644cfac079094c3c1d1616e4c)
Signed-off-by: Timo Aaltonen <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Acked-by: Seth Forshee <email address hidden>
Signed-off-by: Andy Whitcroft <email address hidden>

0d560cc... by Benjamin Tissoires <email address hidden>

Input: synaptics - remove TOPBUTTONPAD property for Lenovos 2015

BugLink: http://bugs.launchpad.net/bugs/1414930

The 2015 series of the Lenovo thinkpads added back the hardware buttons on
top of the touchpad for the trackstick.

Unfortunately, Lenovo used the PNPIDs that are supposed to be "5 buttons"
touchpads, so the new laptops also have the INPUT_PROP_TOPBUTTONPAD. Yay!

Instead of manually removing each of the new ones, or hoping that we know
all the current ones, we can consider that the PNPIDs list that were given
contains touchpads that have the trackstick buttons, either physically
wired to them, or emulated with the top software button property.

Thanks to the extra buttons capability in query $10, we can reliably detect
the physical buttons from the software ones, and so we can remove the
TOPBUTTONPAD property even if it was declared as such.

Signed-off-by: Benjamin Tissoires <email address hidden>
Acked-by: Hans de Goede <email address hidden>
Signed-off-by: Dmitry Torokhov <email address hidden>
(cherry picked from commit 3adde1f59195df2965f632e22b31f97fb371612f)
Signed-off-by: Timo Aaltonen <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Acked-by: Seth Forshee <email address hidden>
Signed-off-by: Andy Whitcroft <email address hidden>

6c8c7e1... by Benjamin Tissoires <email address hidden>

Input: synaptics - retrieve the extended capabilities in query $10

BugLink: http://bugs.launchpad.net/bugs/1414930

Newer Synaptics touchpads need to get information from the query $10.
Retrieve it if available.

Signed-off-by: Benjamin Tissoires <email address hidden>
Acked-by: Hans de Goede <email address hidden>
Signed-off-by: Dmitry Torokhov <email address hidden>
(cherry picked from commit 06aa374bc70468b517dd36b95c48c8f391c08a27)
Signed-off-by: Timo Aaltonen <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Acked-by: Seth Forshee <email address hidden>
Signed-off-by: Andy Whitcroft <email address hidden>

7436111... by Benjamin Tissoires <email address hidden>

Input: synaptics - do not retrieve the board id on old firmwares

BugLink: http://bugs.launchpad.net/bugs/1414930

The board id capability has been added in firmware 7.5.

Cc: <email address hidden>
Signed-off-by: Benjamin Tissoires <email address hidden>
Acked-by: Hans de Goede <email address hidden>
Signed-off-by: Dmitry Torokhov <email address hidden>
(cherry picked from commit b57a7128be24062b5b5b26032b7cd58f1651547e)
Signed-off-by: Timo Aaltonen <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Acked-by: Seth Forshee <email address hidden>
Signed-off-by: Andy Whitcroft <email address hidden>

7f49ef6... by Benjamin Tissoires <email address hidden>

Input: synaptics - handle spurious release of trackstick buttons

BugLink: http://bugs.launchpad.net/bugs/1414930

The Fimware 8.1 has a bug in which the extra buttons are only sent when the
ExtBit is 1. This should be fixed in a future FW update which should have
a bump of the minor version.

Cc: <email address hidden>
Signed-off-by: Benjamin Tissoires <email address hidden>
Acked-by: Hans de Goede <email address hidden>
Signed-off-by: Dmitry Torokhov <email address hidden>
(cherry picked from commit ebc80840b850db72f7ae84fbcf77630ae5409629)
Signed-off-by: Timo Aaltonen <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Acked-by: Seth Forshee <email address hidden>
Signed-off-by: Andy Whitcroft <email address hidden>

265631c... by Dmitry Torokhov

Input: synaptics - fix middle button on Lenovo 2015 products

BugLink: http://bugs.launchpad.net/bugs/1414930

On the X1 Carbon 3rd gen (with a 2015 broadwell cpu), the physical middle
button of the trackstick (attached to the touchpad serio device, of course)
seems to get lost.

Actually, the touchpads reports 3 extra buttons, which falls in the switch
below to the '2' case. Let's handle the case of odd numbers also, so that
the middle button finds its way back.

Cc: <email address hidden>
Signed-off-by: Benjamin Tissoires <email address hidden>
Acked-by: Hans de Goede <email address hidden>
Signed-off-by: Dmitry Torokhov <email address hidden>
(cherry picked from commit dc5465dc8a6d5cae8a0e1d8826bdcb2e4cb261ab)
Signed-off-by: Timo Aaltonen <email address hidden>
Acked-by: Andy Whitcroft <email address hidden>
Acked-by: Seth Forshee <email address hidden>
Signed-off-by: Andy Whitcroft <email address hidden>

4b62e4d... by Andy Whitcroft

UBUNTU: [Config] CONFIG_DEFAULT_MMAP_MIN_ADDR needs to match on armhf and arm64

Attempting to run 32bit binaries on arm64 triggers applications to be
Killed, as the CONFIG_DEFAULT_MMAP_MIN_ADDR used on armhf is not valid on
arm64. While this can be overriden via sysctl, the default should be sane.

BugLink: http://bugs.launchpad.net/bugs/1418140
Signed-off-by: Andy Whitcroft <email address hidden>

f33599e... by Andy Whitcroft

UBUNTU: [Config] exclude oss modules from linux-image

BugLink: http://bugs.launchpad.net/bugs/1434842
Signed-off-by: Andy Whitcroft <email address hidden>

1fcacb1... by Andy Whitcroft

UBUNTU: [Config] re-enable OSS support and blacklist

We are seeing requests for the OSS support to be reenabled, it seems that
it is needed for old games. We do not want it loading by default so use
the new blacklist support to suppress autoloading. This should bring us
into line with other distros where manual loading is required.

BugLink: http://bugs.launchpad.net/bugs/1434842
Signed-off-by: Andy Whitcroft <email address hidden>