[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20210726035902.b6zo72r6mdlxyf7w@vireshk-i7>
Date: Mon, 26 Jul 2021 09:29:02 +0530
From: Viresh Kumar <viresh.kumar@...aro.org>
To: Arnd Bergmann <arnd@...db.de>
Cc: Jie Deng <jie.deng@...el.com>,
Linux I2C <linux-i2c@...r.kernel.org>,
"open list:DRM DRIVER FOR QEMU'S CIRRUS DEVICE"
<virtualization@...ts.linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Wolfram Sang <wsa@...nel.org>,
Wolfram Sang <wsa+renesas@...g-engineering.com>,
"Michael S. Tsirkin" <mst@...hat.com>,
Jason Wang <jasowang@...hat.com>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
yu1.wang@...el.com, conghui.chen@...el.com,
Stefan Hajnoczi <stefanha@...hat.com>,
gregkh <gregkh@...uxfoundation.org>,
Vincent Guittot <vincent.guittot@...aro.org>,
Alex Bennée <alex.bennee@...aro.org>,
jiedeng@...mni.sjtu.edu.cn
Subject: Re: [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
Powered by blists - more mailing lists