From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Wolfram Sang <wsa@the-dreams.de>, Olof Johansson <olof@lixom.net>,
Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Conghui Chen <conghui.chen@intel.com>,
Cristian Marussi <cristian.marussi@arm.com>,
Igor Skalkin <igor.skalkin@opensynergy.com>,
Jie Deng <jie.deng@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Peter Hilber <peter.hilber@opensynergy.com>,
Sudeep Holla <sudeep.holla@arm.com>,
Wolfram Sang <wsa@kernel.org>
Subject: linux-next: manual merge of the i2c tree with the arm-soc tree
Date: Wed, 18 Aug 2021 10:08:19 +1000 [thread overview]
Message-ID: <20210818100819.10927d37@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]
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 */
/*
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-08-18 0:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-18 0:08 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-15 17:50 linux-next: manual merge of the i2c tree with the arm-soc tree Mark Brown
2025-09-15 21:04 ` Wolfram Sang
2025-09-15 22:13 ` Mark Brown
2025-09-16 21:46 ` Thierry Reding
2025-09-17 21:14 ` Wolfram Sang
2025-09-22 12:03 ` Thierry Reding
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=20210818100819.10927d37@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=conghui.chen@intel.com \
--cc=cristian.marussi@arm.com \
--cc=igor.skalkin@opensynergy.com \
--cc=jie.deng@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=peter.hilber@opensynergy.com \
--cc=sudeep.holla@arm.com \
--cc=wsa@kernel.org \
--cc=wsa@the-dreams.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox