[GIT,PULL] IR fixups for 2.6.37
Message ID | 20101216190302.GA25148@redhat.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers |
Return-path: <mchehab@gaivota> Envelope-to: mchehab@gaivota Delivery-date: Thu, 16 Dec 2010 17:58:47 -0200 Received: from mchehab by gaivota with local (Exim 4.72) (envelope-from <mchehab@gaivota>) id 1PTJyR-0006KL-Bf for mchehab@gaivota; Thu, 16 Dec 2010 17:58:47 -0200 Received: from casper.infradead.org [85.118.1.10] by gaivota with IMAP (fetchmail-6.3.17) for <mchehab@localhost> (single-drop); Thu, 16 Dec 2010 17:58:47 -0200 (BRST) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1PTJ6k-0003Xt-UP; Thu, 16 Dec 2010 19:03:19 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757375Ab0LPTDF (ORCPT <rfc822; kmpark@infradead.org> + 1 other); Thu, 16 Dec 2010 14:03:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3415 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757319Ab0LPTDD (ORCPT <rfc822;linux-media@vger.kernel.org>); Thu, 16 Dec 2010 14:03:03 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBGJ33W3030396 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for <linux-media@vger.kernel.org>; Thu, 16 Dec 2010 14:03:03 -0500 Received: from xavier.bos.redhat.com (xavier.bos.redhat.com [10.16.16.50]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBGJ32Xg018618; Thu, 16 Dec 2010 14:03:02 -0500 Received: by xavier.bos.redhat.com (Postfix, from userid 500) id 8CCD3816F8; Thu, 16 Dec 2010 14:03:02 -0500 (EST) Date: Thu, 16 Dec 2010 14:03:02 -0500 From: Jarod Wilson <jarod@redhat.com> To: mchehab@redhat.com Cc: linux-media@vger.kernel.org Subject: [GIT PULL] IR fixups for 2.6.37 Message-ID: <20101216190302.GA25148@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org Sender: Mauro Carvalho Chehab <mchehab@gaivota> |
Pull-request
git://git.kernel.org/pub/scm/linux/kernel/git/jarod/linux-2.6-ir.git for-2.6.37Message
Jarod Wilson
Dec. 16, 2010, 7:03 p.m. UTC
Hey Mauro, As previously discussed, here's a handful of IR patches I'd like to see make it into 2.6.37 still, as they fix a number of issues with the mceusb, streamzap, nuvoton and lirc_dev drivers. The last three mceusb patches are not yet in the v4l/dvb tree, but I've just posted them. The following changes since commit b0c3844d8af6b9f3f18f31e1b0502fbefa2166be: Linux 2.6.37-rc6 (2010-12-15 17:24:48 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jarod/linux-2.6-ir.git for-2.6.37 Dan Carpenter (2): [media] lirc_dev: stray unlock in lirc_dev_fop_poll() [media] lirc_dev: fixes in lirc_dev_fop_read() Jarod Wilson (10): [media] mceusb: add support for Conexant Hybrid TV RDU253S [media] nuvoton-cir: improve buffer parsing responsiveness [media] mceusb: fix up reporting of trailing space [media] mceusb: buffer parsing fixups for 1st-gen device [media] IR: add tv power scancode to rc6 mce keymap [media] mceusb: fix keybouce issue after parser simplification [media] streamzap: merge timeout space with trailing space mceusb: add another Fintek device ID mceusb: fix inverted mask inversion logic mceusb: set a default rx timeout Paul Bender (1): rc: fix sysfs entry for mceusb and streamzap drivers/media/IR/keymaps/rc-rc6-mce.c | 21 ++-- drivers/media/IR/lirc_dev.c | 29 +++--- drivers/media/IR/mceusb.c | 174 ++++++++++++++++++++------------ drivers/media/IR/nuvoton-cir.c | 10 ++- drivers/media/IR/streamzap.c | 21 +++-- 5 files changed, 156 insertions(+), 99 deletions(-)
Comments
Em 16-12-2010 17:03, Jarod Wilson escreveu: > Hey Mauro, > > As previously discussed, here's a handful of IR patches I'd like to see > make it into 2.6.37 still, as they fix a number of issues with the > mceusb, streamzap, nuvoton and lirc_dev drivers. > > The last three mceusb patches are not yet in the v4l/dvb tree, but I've > just posted them. > > The following changes since commit b0c3844d8af6b9f3f18f31e1b0502fbefa2166be: > > Linux 2.6.37-rc6 (2010-12-15 17:24:48 -0800) > > are available in the git repository at: > git://git.kernel.org/pub/scm/linux/kernel/git/jarod/linux-2.6-ir.git for-2.6.37 > > Dan Carpenter (2): > [media] lirc_dev: stray unlock in lirc_dev_fop_poll() > [media] lirc_dev: fixes in lirc_dev_fop_read() > > Jarod Wilson (10): > [media] mceusb: add support for Conexant Hybrid TV RDU253S > [media] nuvoton-cir: improve buffer parsing responsiveness > [media] mceusb: fix up reporting of trailing space > [media] mceusb: buffer parsing fixups for 1st-gen device > [media] IR: add tv power scancode to rc6 mce keymap > [media] mceusb: fix keybouce issue after parser simplification > [media] streamzap: merge timeout space with trailing space > mceusb: add another Fintek device ID > mceusb: fix inverted mask inversion logic > mceusb: set a default rx timeout > > Paul Bender (1): > rc: fix sysfs entry for mceusb and streamzap > > drivers/media/IR/keymaps/rc-rc6-mce.c | 21 ++-- > drivers/media/IR/lirc_dev.c | 29 +++--- > drivers/media/IR/mceusb.c | 174 ++++++++++++++++++++------------ > drivers/media/IR/nuvoton-cir.c | 10 ++- > drivers/media/IR/streamzap.c | 21 +++-- > 5 files changed, 156 insertions(+), 99 deletions(-) > Hi Jarod, I've pulled from your tree and added them at the master branch of my -next tree, at: http://git.kernel.org/?p=linux/kernel/git/mchehab/linux-next.git As we've discussed on #lirc channel, I solved the conflicts at mceusb and streamzap by just doing a diff between the merged tree and: ssh://linuxtv.org/git/jarod/linux-2.6-ir.git for-2.6.38 The merge patch had a weird diff, as it just showed the mceusb.c driver as a new one, so I suspect that it might have something wrong at the conflict resolution. Also, there's one small error generated with allyesconfig: drivers/media/rc/streamzap.c: In function ‘streamzap_probe’: drivers/media/rc/streamzap.c:460:2: warning: statement with no effect Could you please take a look on both things, to double check if everything is ok? Thanks! Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Dec 21, 2010 at 11:37:57AM -0200, Mauro Carvalho Chehab wrote: > Em 16-12-2010 17:03, Jarod Wilson escreveu: > > Hey Mauro, > > > > As previously discussed, here's a handful of IR patches I'd like to see > > make it into 2.6.37 still, as they fix a number of issues with the > > mceusb, streamzap, nuvoton and lirc_dev drivers. > > > > The last three mceusb patches are not yet in the v4l/dvb tree, but I've > > just posted them. > > > > The following changes since commit b0c3844d8af6b9f3f18f31e1b0502fbefa2166be: > > > > Linux 2.6.37-rc6 (2010-12-15 17:24:48 -0800) > > > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/jarod/linux-2.6-ir.git for-2.6.37 > > > > Dan Carpenter (2): > > [media] lirc_dev: stray unlock in lirc_dev_fop_poll() > > [media] lirc_dev: fixes in lirc_dev_fop_read() > > > > Jarod Wilson (10): > > [media] mceusb: add support for Conexant Hybrid TV RDU253S > > [media] nuvoton-cir: improve buffer parsing responsiveness > > [media] mceusb: fix up reporting of trailing space > > [media] mceusb: buffer parsing fixups for 1st-gen device > > [media] IR: add tv power scancode to rc6 mce keymap > > [media] mceusb: fix keybouce issue after parser simplification > > [media] streamzap: merge timeout space with trailing space > > mceusb: add another Fintek device ID > > mceusb: fix inverted mask inversion logic > > mceusb: set a default rx timeout > > > > Paul Bender (1): > > rc: fix sysfs entry for mceusb and streamzap > > > > drivers/media/IR/keymaps/rc-rc6-mce.c | 21 ++-- > > drivers/media/IR/lirc_dev.c | 29 +++--- > > drivers/media/IR/mceusb.c | 174 ++++++++++++++++++++------------ > > drivers/media/IR/nuvoton-cir.c | 10 ++- > > drivers/media/IR/streamzap.c | 21 +++-- > > 5 files changed, 156 insertions(+), 99 deletions(-) > > > > Hi Jarod, > > I've pulled from your tree and added them at the master branch of my -next tree, at: > http://git.kernel.org/?p=linux/kernel/git/mchehab/linux-next.git > > As we've discussed on #lirc channel, I solved the conflicts at mceusb and streamzap > by just doing a diff between the merged tree and: > ssh://linuxtv.org/git/jarod/linux-2.6-ir.git for-2.6.38 > > The merge patch had a weird diff, as it just showed the mceusb.c driver as a new one, > so I suspect that it might have something wrong at the conflict resolution. Hrm, yeah, diff is a bit odd, but the resulting mceusb.c looks correct. > Also, there's one small error generated with allyesconfig: > > drivers/media/rc/streamzap.c: In function ‘streamzap_probe’: > drivers/media/rc/streamzap.c:460:2: warning: statement with no effect Hm. That's pointing at the line that loads the rc5-sz decoder. With an allyesconfig, that does become a no-op, since the decoder would already be built in, so I think that should be fine. At least, it should be no different than any of the other decoders, except for where they're loaded from. > Could you please take a look on both things, to double check if everything is ok? Looks good to me.