lkml.org 
[lkml]   [2021]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v15] i2c: virtio: add a virtio i2c frontend driver
On 23-07-21, 11:03, Arnd Bergmann wrote:
> > index 70a8057a..99aa27b 100644
> > --- a/include/uapi/linux/virtio_ids.h
> > +++ b/include/uapi/linux/virtio_ids.h
> > @@ -55,6 +55,7 @@
> > #define VIRTIO_ID_FS 26 /* virtio filesystem */
> > #define VIRTIO_ID_PMEM 27 /* virtio pmem */
> > #define VIRTIO_ID_MAC80211_HWSIM 29 /* virtio mac80211-hwsim */
> > +#define VIRTIO_ID_I2C_ADAPTER 34 /* virtio i2c adapter */
> > #define VIRTIO_ID_BT 40 /* virtio bluetooth */
>
> This will now conflict with Viresh's patch that adds all the other IDs.
> Not sure if there is anything to be done about that.

An easier way of avoiding all such conflicts can be:

- Michael applies my first patch (which sync's the device id's from specs) for
5.14-rc4. Rest of the patches can go for 5.15.

- And then Wolfram applies this series over rc4 instead of rc1.

Or we can leave the conflict there for Linus to handle.

--
viresh

\
 
 \ /
  Last update: 2021-07-26 05:59    [W:0.072 / U:0.708 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site