| Message ID | 20100525234452.A5EDFF899A@sepang.rtg.net |
|---|---|
| State | Accepted |
| Delegated to: | Stefan Bader |
| Headers | show |
On 05/26/2010 01:44 AM, Tim Gardner wrote: > The following changes since commit f0819aaf4948e34a44d9d685615ddee74271cd70: > Chase Douglas (1): > UBUNTU: enforce CONFIG_TMPFS_POSIX_ACL=y > > are available in the git repository at: > > git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lp551234 Subject: [PATCH] (pre-stable) Input: psmouse - reset all types of mice before reconnecting Tim, Peter. Tim submitted that patch as pre-stable but I have not seen this showing up on upstream queues. Has this been forwarded to stable@kernel.org? I will pull it into next update for Lucid but I would also like to see this getting fed back upstream. -Stefan
On 06/02/2010 10:21 AM, Stefan Bader wrote: > On 05/26/2010 01:44 AM, Tim Gardner wrote: >> The following changes since commit f0819aaf4948e34a44d9d685615ddee74271cd70: >> Chase Douglas (1): >> UBUNTU: enforce CONFIG_TMPFS_POSIX_ACL=y >> >> are available in the git repository at: >> >> git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lp551234 > > Subject: [PATCH] (pre-stable) Input: psmouse - reset all types of mice before > reconnecting > > Tim, Peter. > > Tim submitted that patch as pre-stable but I have not seen this showing up on > upstream queues. Has this been forwarded to stable@kernel.org? It has not. After reading the requirements for stable inclusion here. http://linux.tar.bz/articles/2.6-development_process It doesn't seem to fit their criteria, e.g. this isn't a critical bug for them. > I will pull it into next update for Lucid but I would also like to see this > getting fed back upstream. Well it was pulled into Linus' tree so we can expect it in the next major release. Right? Peter > -Stefan >
On 06/02/2010 09:10 AM, Peter M. Petrakis wrote: > On 06/02/2010 10:21 AM, Stefan Bader wrote: >> On 05/26/2010 01:44 AM, Tim Gardner wrote: >>> The following changes since commit f0819aaf4948e34a44d9d685615ddee74271cd70: >>> Chase Douglas (1): >>> UBUNTU: enforce CONFIG_TMPFS_POSIX_ACL=y >>> >>> are available in the git repository at: >>> >>> git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lp551234 >> >> Subject: [PATCH] (pre-stable) Input: psmouse - reset all types of mice before >> reconnecting >> >> Tim, Peter. >> >> Tim submitted that patch as pre-stable but I have not seen this showing up on >> upstream queues. Has this been forwarded to stable@kernel.org? > > It has not. After reading the requirements for stable inclusion here. > > http://linux.tar.bz/articles/2.6-development_process > > It doesn't seem to fit their criteria, e.g. this isn't a critical bug for > them. > >> I will pull it into next update for Lucid but I would also like to see this >> getting fed back upstream. > > Well it was pulled into Linus' tree so we can expect it in the next major > release. Right? > Yes - this will eventually show up in Maverick.
On 06/02/2010 03:00 PM, Tim Gardner wrote: > On 06/02/2010 09:10 AM, Peter M. Petrakis wrote: >> On 06/02/2010 10:21 AM, Stefan Bader wrote: >>> On 05/26/2010 01:44 AM, Tim Gardner wrote: >>>> The following changes since commit >>>> f0819aaf4948e34a44d9d685615ddee74271cd70: >>>> Chase Douglas (1): >>>> UBUNTU: enforce CONFIG_TMPFS_POSIX_ACL=y >>>> >>>> are available in the git repository at: >>>> >>>> git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lp551234 >>> >>> Subject: [PATCH] (pre-stable) Input: psmouse - reset all types of >>> mice before >>> reconnecting >>> >>> Tim, Peter. >>> >>> Tim submitted that patch as pre-stable but I have not seen this >>> showing up on >>> upstream queues. Has this been forwarded to stable@kernel.org? >> >> It has not. After reading the requirements for stable inclusion here. >> >> http://linux.tar.bz/articles/2.6-development_process >> >> It doesn't seem to fit their criteria, e.g. this isn't a critical bug for >> them. >> >>> I will pull it into next update for Lucid but I would also like to >>> see this >>> getting fed back upstream. >> >> Well it was pulled into Linus' tree so we can expect it in the next major >> release. Right? >> > > Yes - this will eventually show up in Maverick. Are you implying that it won't show up in a Lucid SRU because it doesn't meet their criteria for acceptance into the stable series? Peter
On 06/02/2010 05:10 PM, Peter M. Petrakis wrote: > On 06/02/2010 10:21 AM, Stefan Bader wrote: >> On 05/26/2010 01:44 AM, Tim Gardner wrote: >>> The following changes since commit f0819aaf4948e34a44d9d685615ddee74271cd70: >>> Chase Douglas (1): >>> UBUNTU: enforce CONFIG_TMPFS_POSIX_ACL=y >>> >>> are available in the git repository at: >>> >>> git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lp551234 >> >> Subject: [PATCH] (pre-stable) Input: psmouse - reset all types of mice before >> reconnecting >> >> Tim, Peter. >> >> Tim submitted that patch as pre-stable but I have not seen this showing up on >> upstream queues. Has this been forwarded to stable@kernel.org? > > It has not. After reading the requirements for stable inclusion here. > > http://linux.tar.bz/articles/2.6-development_process > > It doesn't seem to fit their criteria, e.g. this isn't a critical bug for > them. Looking at other changes that get in, I don't see "critical" as a requirement. Given that it allows a reasonable number of people to have a problem fixed, it is upstream and is small enough, I would at least try. If unsure, as Dmitry about his feeling. >> I will pull it into next update for Lucid but I would also like to see this >> getting fed back upstream. > > Well it was pulled into Linus' tree so we can expect it in the next major > release. Right? > > Peter >> -Stefan >> >
On 06/03/2010 05:37 PM, Peter M. Petrakis wrote: > > > On 06/02/2010 03:00 PM, Tim Gardner wrote: >> On 06/02/2010 09:10 AM, Peter M. Petrakis wrote: >>> On 06/02/2010 10:21 AM, Stefan Bader wrote: >>>> On 05/26/2010 01:44 AM, Tim Gardner wrote: >>>>> The following changes since commit >>>>> f0819aaf4948e34a44d9d685615ddee74271cd70: >>>>> Chase Douglas (1): >>>>> UBUNTU: enforce CONFIG_TMPFS_POSIX_ACL=y >>>>> >>>>> are available in the git repository at: >>>>> >>>>> git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lp551234 >>>> >>>> Subject: [PATCH] (pre-stable) Input: psmouse - reset all types of >>>> mice before >>>> reconnecting >>>> >>>> Tim, Peter. >>>> >>>> Tim submitted that patch as pre-stable but I have not seen this >>>> showing up on >>>> upstream queues. Has this been forwarded to stable@kernel.org? >>> >>> It has not. After reading the requirements for stable inclusion here. >>> >>> http://linux.tar.bz/articles/2.6-development_process >>> >>> It doesn't seem to fit their criteria, e.g. this isn't a critical bug for >>> them. >>> >>>> I will pull it into next update for Lucid but I would also like to >>>> see this >>>> getting fed back upstream. >>> >>> Well it was pulled into Linus' tree so we can expect it in the next major >>> release. Right? >>> >> >> Yes - this will eventually show up in Maverick. > > Are you implying that it won't show up in a Lucid SRU because it > doesn't meet their criteria for acceptance into the stable series? > > Peter > I have (for now) included it into the next released for Lucid going to proposed. I would just encourage trying to promote it to upstream stable, too. -Stefan
Applied to Lucid master
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 0876d82..9451e28 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -1349,6 +1349,7 @@ static int psmouse_reconnect(struct serio *serio) struct psmouse *psmouse = serio_get_drvdata(serio); struct psmouse *parent = NULL; struct serio_driver *drv = serio->drv; + unsigned char type; int rc = -1; if (!drv || !psmouse) { @@ -1368,10 +1369,15 @@ static int psmouse_reconnect(struct serio *serio) if (psmouse->reconnect) { if (psmouse->reconnect(psmouse)) goto out; - } else if (psmouse_probe(psmouse) < 0 || - psmouse->type != psmouse_extensions(psmouse, - psmouse_max_proto, false)) { - goto out; + } else { + psmouse_reset(psmouse); + + if (psmouse_probe(psmouse) < 0) + goto out; + + type = psmouse_extensions(psmouse, psmouse_max_proto, false); + if (psmouse->type != type) + goto out; } /* ok, the device type (and capabilities) match the old one,
The following changes since commit f0819aaf4948e34a44d9d685615ddee74271cd70: Chase Douglas (1): UBUNTU: enforce CONFIG_TMPFS_POSIX_ACL=y are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lp551234 Dmitry Torokhov (1): (pre-stable) Input: psmouse - reset all types of mice before reconnecting drivers/input/mouse/psmouse-base.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) From 8a01e55a286fd66bb2328a3dfb083ab492c26bd4 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov <dmitry.torokhov@gmail.com> Date: Thu, 13 May 2010 00:42:23 -0700 Subject: [PATCH] (pre-stable) Input: psmouse - reset all types of mice before reconnecting BugLink: http://bugs.launchpad.net/bugs/551234 Synaptics hardware requires resetting device after suspend to ram in order for the device to be operational. The reset lives in synaptics-specific reconnect handler, but it is not being invoked if synaptics support is disabled and the device is handled as a standard PS/2 device (bare or IntelliMouse protocol). Let's add reset into generic reconnect handler as well. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> (cherry picked from commit ef110b24e28f36620f63dab94708a17c7e267358) Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- drivers/input/mouse/psmouse-base.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)