All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>,
	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>,
	Viresh Kumar <viresh.kumar@linaro.org>,
	Wolfram Sang <wsa@kernel.org>
Subject: linux-next: manual merge of the vhost tree with the arm-soc and Linus' trees
Date: Wed, 1 Sep 2021 14:22:55 +1000	[thread overview]
Message-ID: <20210901142255.1189dd71@canb.auug.org.au> (raw)

[-- 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 --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>,
	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>,
	Viresh Kumar <viresh.kumar@linaro.org>,
	Wolfram Sang <wsa@kernel.org>
Subject: linux-next: manual merge of the vhost tree with the arm-soc and Linus' trees
Date: Wed, 1 Sep 2021 14:22:55 +1000	[thread overview]
Message-ID: <20210901142255.1189dd71@canb.auug.org.au> (raw)


[-- Attachment #1.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 #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

             reply	other threads:[~2021-09-01  4:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-01  4:22 Stephen Rothwell [this message]
2021-09-01  4:22 ` linux-next: manual merge of the vhost tree with the arm-soc and Linus' trees Stephen Rothwell

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=20210901142255.1189dd71@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=mst@redhat.com \
    --cc=olof@lixom.net \
    --cc=peter.hilber@opensynergy.com \
    --cc=sudeep.holla@arm.com \
    --cc=viresh.kumar@linaro.org \
    --cc=wsa@kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.