* linux-next: manual merge of the vhost tree with the arm-soc and Linus' trees
@ 2021-09-01 4:22 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2021-09-01 4:22 UTC (permalink / raw)
To: Michael S. Tsirkin, Olof Johansson, Arnd Bergmann, ARM
Cc: Conghui Chen, Cristian Marussi, Igor Skalkin, Jie Deng,
Linux Kernel Mailing List, Linux Next Mailing List, Peter Hilber,
Sudeep Holla, Viresh Kumar, Wolfram Sang
[-- Attachment #1: Type: text/plain, Size: 880 bytes --]
Hi all,
Today's linux-next merge of the vhost tree got a conflict in:
include/uapi/linux/virtio_ids.h
between commits:
46abe13b5e3d ("firmware: arm_scmi: Add virtio transport")
3cfc88380413 ("i2c: virtio: add a virtio i2c frontend driver")
from the arm-soc and Linus' trees and commit:
df2fd4361a56 ("uapi: virtio_ids: Sync ids with specification")
from the vhost tree.
I fixed it up (the latter included the changes form the former commits,
so I juts used that) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-09-01 4:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-01 4:22 linux-next: manual merge of the vhost tree with the arm-soc and Linus' trees Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).