linux-kernel - linux-next: manual merge of the vhost tree with the arm-soc and Linus' trees

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20210901142255.1189dd71@canb.auug.org.au>
Date:   Wed, 1 Sep 2021 14:22:55 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Michael S. Tsirkin" <mst@...hat.com>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Conghui Chen <conghui.chen@...el.com>,
        Cristian Marussi <cristian.marussi@....com>,
        Igor Skalkin <igor.skalkin@...nsynergy.com>,
        Jie Deng <jie.deng@...el.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Peter Hilber <peter.hilber@...nsynergy.com>,
        Sudeep Holla <sudeep.holla@....com>,
        Viresh Kumar <viresh.kumar@...aro.org>,
        Wolfram Sang <wsa@...nel.org>
Subject: linux-next: manual merge of the vhost tree with the arm-soc and
 Linus' trees

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

Content of type "application/pgp-signature" skipped