| Message ID | 1321468623-7847-1-git-send-email-chase.douglas@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 11/16/2011 01:37 PM, Chase Douglas wrote: > This allows the latest N-Trig devices to function properly. > > BugLink: https://bugs.launchpad.net/bugs/724831 > > Cc: stable@vger.kernel.org > Signed-off-by: Chase Douglas<chase.douglas@canonical.com> > Signed-off-by: Jiri Kosina<jkosina@suse.cz> > --- > This has been accepted into Jiri Kosina's git tree for 3.4. It will eventually > come down through the stable queue in three or four months, but it should be > applied to Precise in the meantime. > Surely you mean the 3.3 merge window ? Why won't Jiri accept this for 3.2 ? There are still a number of rc candidates left, and this looks like a minor bug fix patch suitable for an rc. > Note that this won't have any effect until the Ubuntu sauce hid-ntrig patches > are reverted. > > drivers/hid/hid-core.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c > index 4f81d20..1691c99 100644 > --- a/drivers/hid/hid-core.c > +++ b/drivers/hid/hid-core.c > @@ -361,7 +361,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item) > > case HID_GLOBAL_ITEM_TAG_REPORT_SIZE: > parser->global.report_size = item_udata(item); > - if (parser->global.report_size> 32) { > + if (parser->global.report_size> 96) { > dbg_hid("invalid report_size %d\n", > parser->global.report_size); > return -1;
On 11/17/2011 03:58 AM, Tim Gardner wrote: > On 11/16/2011 01:37 PM, Chase Douglas wrote: >> This allows the latest N-Trig devices to function properly. >> >> BugLink: https://bugs.launchpad.net/bugs/724831 >> >> Cc: stable@vger.kernel.org >> Signed-off-by: Chase Douglas<chase.douglas@canonical.com> >> Signed-off-by: Jiri Kosina<jkosina@suse.cz> >> --- >> This has been accepted into Jiri Kosina's git tree for 3.4. It will eventually >> come down through the stable queue in three or four months, but it should be >> applied to Precise in the meantime. >> > > Surely you mean the 3.3 merge window ? Why won't Jiri accept this for > 3.2 ? There are still a number of rc candidates left, and this looks > like a minor bug fix patch suitable for an rc. I agree and am pestering him about it. I may be misinterpreting his tree. He appears to be using a different branch scheme than in the past. -- Chase
On 11/17/2011 10:02 AM, Chase Douglas wrote: > On 11/17/2011 03:58 AM, Tim Gardner wrote: >> On 11/16/2011 01:37 PM, Chase Douglas wrote: >>> This allows the latest N-Trig devices to function properly. >>> >>> BugLink: https://bugs.launchpad.net/bugs/724831 >>> >>> Cc: stable@vger.kernel.org >>> Signed-off-by: Chase Douglas<chase.douglas@canonical.com> >>> Signed-off-by: Jiri Kosina<jkosina@suse.cz> >>> --- >>> This has been accepted into Jiri Kosina's git tree for 3.4. It will eventually >>> come down through the stable queue in three or four months, but it should be >>> applied to Precise in the meantime. >>> >> >> Surely you mean the 3.3 merge window ? Why won't Jiri accept this for >> 3.2 ? There are still a number of rc candidates left, and this looks >> like a minor bug fix patch suitable for an rc. > > I agree and am pestering him about it. I may be misinterpreting his > tree. He appears to be using a different branch scheme than in the past. > > -- Chase Any progress ?
On 11/21/2011 05:53 AM, Tim Gardner wrote: > On 11/17/2011 10:02 AM, Chase Douglas wrote: >> On 11/17/2011 03:58 AM, Tim Gardner wrote: >>> On 11/16/2011 01:37 PM, Chase Douglas wrote: >>>> This allows the latest N-Trig devices to function properly. >>>> >>>> BugLink: https://bugs.launchpad.net/bugs/724831 >>>> >>>> Cc: stable@vger.kernel.org >>>> Signed-off-by: Chase Douglas<chase.douglas@canonical.com> >>>> Signed-off-by: Jiri Kosina<jkosina@suse.cz> >>>> --- >>>> This has been accepted into Jiri Kosina's git tree for 3.4. It will eventually >>>> come down through the stable queue in three or four months, but it should be >>>> applied to Precise in the meantime. >>>> >>> >>> Surely you mean the 3.3 merge window ? Why won't Jiri accept this for >>> 3.2 ? There are still a number of rc candidates left, and this looks >>> like a minor bug fix patch suitable for an rc. >> >> I agree and am pestering him about it. I may be misinterpreting his >> tree. He appears to be using a different branch scheme than in the past. >> >> -- Chase > > Any progress ? Still pestering. RTT is approximately 4 days... I can confirm that his "upstream" branch is stuff that will go into the next merge window, and his "upstream-fixes" branch is stuff that will go into the current rc releases. This patch is only in his "upstream" branch right now. I'm asking him why it shouldn't go into 3.3, and I'll update you when I find out. -- Chase
On 11/21/2011 07:11 AM, Chase Douglas wrote: > On 11/21/2011 05:53 AM, Tim Gardner wrote: >> On 11/17/2011 10:02 AM, Chase Douglas wrote: >>> On 11/17/2011 03:58 AM, Tim Gardner wrote: >>>> On 11/16/2011 01:37 PM, Chase Douglas wrote: >>>>> This allows the latest N-Trig devices to function properly. >>>>> >>>>> BugLink: https://bugs.launchpad.net/bugs/724831 >>>>> >>>>> Cc: stable@vger.kernel.org >>>>> Signed-off-by: Chase Douglas<chase.douglas@canonical.com> >>>>> Signed-off-by: Jiri Kosina<jkosina@suse.cz> >>>>> --- >>>>> This has been accepted into Jiri Kosina's git tree for 3.4. It will eventually >>>>> come down through the stable queue in three or four months, but it should be >>>>> applied to Precise in the meantime. >>>>> >>>> >>>> Surely you mean the 3.3 merge window ? Why won't Jiri accept this for >>>> 3.2 ? There are still a number of rc candidates left, and this looks >>>> like a minor bug fix patch suitable for an rc. >>> >>> I agree and am pestering him about it. I may be misinterpreting his >>> tree. He appears to be using a different branch scheme than in the past. >>> >>> -- Chase >> >> Any progress ? > > Still pestering. RTT is approximately 4 days... I can confirm that his > "upstream" branch is stuff that will go into the next merge window, and > his "upstream-fixes" branch is stuff that will go into the current rc > releases. This patch is only in his "upstream" branch right now. I'm > asking him why it shouldn't go into 3.3, and I'll update you when I find > out. I got word back from Jiri today. He doesn't want to push the change because it has the potential to cause regressions in the HID layer. There's nothing about this particular patch that he has highlighted as an issue, but it is not a pure "fix" in the sense that it allows more devices to pass the HID parser checks. I can see his point, and if I were in his shoes I might make the same decision. However, given that we are a community distribution with a focus on consumer use cases, this patch allows a multitouch touchscreen product to function without any changes other than device ID addition, and this patch is merely a softening of a HID parsing check, I feel it is reasonable to apply it as an SRU. Either way, I think the patch should be applied to Precise since it will come down from stable in a few months anyways. -- Chase
Applied to precise master-next. Thanks, Leann On Wed, 2011-11-16 at 10:37 -0800, Chase Douglas wrote: > This allows the latest N-Trig devices to function properly. > > BugLink: https://bugs.launchpad.net/bugs/724831 > > Cc: stable@vger.kernel.org > Signed-off-by: Chase Douglas <chase.douglas@canonical.com> > Signed-off-by: Jiri Kosina <jkosina@suse.cz> > --- > This has been accepted into Jiri Kosina's git tree for 3.4. It will eventually > come down through the stable queue in three or four months, but it should be > applied to Precise in the meantime. > > Note that this won't have any effect until the Ubuntu sauce hid-ntrig patches > are reverted. > > drivers/hid/hid-core.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c > index 4f81d20..1691c99 100644 > --- a/drivers/hid/hid-core.c > +++ b/drivers/hid/hid-core.c > @@ -361,7 +361,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item) > > case HID_GLOBAL_ITEM_TAG_REPORT_SIZE: > parser->global.report_size = item_udata(item); > - if (parser->global.report_size > 32) { > + if (parser->global.report_size > 96) { > dbg_hid("invalid report_size %d\n", > parser->global.report_size); > return -1; > -- > 1.7.5.4 > >
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 4f81d20..1691c99 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -361,7 +361,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item) case HID_GLOBAL_ITEM_TAG_REPORT_SIZE: parser->global.report_size = item_udata(item); - if (parser->global.report_size > 32) { + if (parser->global.report_size > 96) { dbg_hid("invalid report_size %d\n", parser->global.report_size); return -1;