linux-kernel - linux-next: manual merge of the vhost tree with Linus' tree

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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20210906122806.2ca7e715@canb.auug.org.au>
Date:   Mon, 6 Sep 2021 12:28:06 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Michael S. Tsirkin" <mst@...hat.com>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Xie Yongji <xieyongji@...edance.com>
Subject: linux-next: manual merge of the vhost tree with Linus' tree

Hi all,

Today's linux-next merge of the vhost tree got a conflict in:

  fs/eventfd.c

between commit:

  b542e383d8c0 ("eventfd: Make signal recursion protection a task bit")

from Linus' tree and commit:

  0afdb2abbff3 ("eventfd: Export eventfd_wake_count to modules")

from the vhost tree.

I fixed it up (I removed eventfd_wake_count as I could not see any added
use for it) 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