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

Commit Message

Stephen Rothwell Aug. 18, 2021, 12:08 a.m. UTC

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.

Patch

diff --cc include/uapi/linux/virtio_ids.h
index f74155f6882d,99aa27b100bc..000000000000
--- a/include/uapi/linux/virtio_ids.h