From: Hans de Goede <hdegoede@redhat.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Mauro Carvalho Chehab <mchehab@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Date: Tue, 19 Jun 2012 13:50:36 +0200 [thread overview]
Message-ID: <4FE0678C.2050205@redhat.com> (raw)
In-Reply-To: <alpine.LNX.2.00.1206191205190.15308@pobox.suse.cz>
Hi,
On 06/19/2012 12:06 PM, Jiri Kosina wrote:
> On Tue, 19 Jun 2012, Stephen Rothwell wrote:
>
>> Hi Mauro,
>>
>> Today's linux-next merge of the v4l-dvb tree got a conflict in
>> drivers/hid/hid-ids.h between commit 9ed326951806 ("HID: multitouch: Add
>> support for Baanto touchscreen") from Linus' tree and commit 110301833d6f
>> ("[media] radio/si470x: Add support for the Axentia ALERT FM USB
>> Receiver") from the v4l-dvb tree.
>>
>> Just context changes. I fixed it up (see below) and can carry the fix as
>> necessary.
>> --
>> Cheers,
>> Stephen Rothwell sfr@canb.auug.org.au
>>
>> diff --cc drivers/hid/hid-ids.h
>> index 6d3037e,70298d1..0000000
>> --- a/drivers/hid/hid-ids.h
>> +++ b/drivers/hid/hid-ids.h
>> @@@ -160,9 -157,9 +160,12 @@@
>> #define USB_VENDOR_ID_AVERMEDIA 0x07ca
>> #define USB_DEVICE_ID_AVER_FM_MR800 0xb800
>>
>> + #define USB_VENDOR_ID_AXENTIA 0x12cf
>> + #define USB_DEVICE_ID_AXENTIA_FM_RADIO 0x7111
>> +
>> +#define USB_VENDOR_ID_BAANTO 0x2453
>> +#define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100
>> +
>> #define USB_VENDOR_ID_BELKIN 0x050d
>> #define USB_DEVICE_ID_FLIP_KVM 0x3201
>
> Thanks for reporting this, Stephen.
>
> Hmmm ... Mauro, Hans, do you feel it's actually proper to add the device
> ids to hid-ids.h? I am using this file usually solely for the drivers on
> the HID bus, which radio-si470x is not, I believe.
Not sure what you mean with "drivers on the HID bus", radio-si470x drivers
do use a USB-HID class interface, but the driver itself does not use
the kernel hid framework. The ids in hid-ids are used for adding this device
to the hid-core "blacklist" to avoid usb-hid from binding to it, so that
radio-si470x-usn can bind to it.
Regards,
Hans
next prev parent reply other threads:[~2012-06-19 11:50 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-19 1:29 linux-next: manual merge of the v4l-dvb tree with Linus' tree Stephen Rothwell
2012-06-19 10:06 ` Jiri Kosina
2012-06-19 11:50 ` Hans de Goede [this message]
2012-06-19 11:52 ` Jiri Kosina
-- strict thread matches above, loose matches on Subject: below --
2021-10-01 0:33 Stephen Rothwell
2021-10-01 6:46 ` Sean Young
2019-06-24 1:36 Stephen Rothwell
2019-06-06 0:43 Stephen Rothwell
2019-05-23 23:21 Stephen Rothwell
2019-01-31 23:22 Stephen Rothwell
2019-01-31 23:27 ` Stephen Rothwell
2016-08-04 1:02 Stephen Rothwell
2015-09-07 23:20 Stephen Rothwell
2015-04-21 1:54 Stephen Rothwell
2015-04-21 7:49 ` Laurent Pinchart
2015-04-21 8:02 ` Stephen Rothwell
2015-04-21 9:56 ` Mauro Carvalho Chehab
2015-04-21 12:38 ` Laurent Pinchart
2015-04-21 13:12 ` Mauro Carvalho Chehab
2015-04-21 13:36 ` Philipp Zabel
2015-04-21 1:50 Stephen Rothwell
2015-04-10 3:53 Stephen Rothwell
2014-01-14 0:50 Stephen Rothwell
2013-08-29 2:48 Stephen Rothwell
2012-10-02 1:13 Stephen Rothwell
2011-07-29 3:17 Stephen Rothwell
2011-07-29 4:10 ` Mauro Carvalho Chehab
2011-07-29 7:29 ` Stephen Rothwell
2011-04-08 3:27 Stephen Rothwell
2011-03-22 1:00 Stephen Rothwell
2010-07-06 2:01 Stephen Rothwell
2010-05-13 1:52 Stephen Rothwell
2010-05-10 0:36 Stephen Rothwell
2010-05-11 23:23 ` Mauro Carvalho Chehab
2010-05-12 0:23 ` Stephen Rothwell
2010-05-10 0:32 Stephen Rothwell
2010-05-11 5:19 ` Hiremath, Vaibhav
2010-05-10 0:29 Stephen Rothwell
2010-04-07 1:00 Stephen Rothwell
2010-04-09 5:22 ` Mauro Carvalho Chehab
2010-04-09 7:13 ` Stephen Rothwell
2009-09-02 2:17 Stephen Rothwell
2009-09-03 2:12 ` Mauro Carvalho Chehab
2009-09-03 6:49 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FE0678C.2050205@redhat.com \
--to=hdegoede@redhat.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.