Subject: linux-next: manual merge of the i2c tree with the arm-soc tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 18 Aug 2021 10:08:19 +1000

Hi all,

Today's linux-next merge of the i2c tree got a conflict in:

  include/uapi/linux/virtio_ids.h

between commit:

  46abe13b5e3d ("firmware: arm_scmi: Add virtio transport")

from the arm-soc tree and commit:

  8fb12751ac78 ("i2c: virtio: add a virtio i2c frontend driver")

from the i2c tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/uapi/linux/virtio_ids.h
index f74155f6882d,99aa27b100bc..000000000000
--- a/include/uapi/linux/virtio_ids.h
+++ b/include/uapi/linux/virtio_ids.h
@@@ -55,7 -55,7 +55,8 @@@
  #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_SCMI			32 /* virtio SCMI */
+ #define VIRTIO_ID_I2C_ADAPTER		34 /* virtio i2c adapter */
  #define VIRTIO_ID_BT			40 /* virtio bluetooth */
  
  /*