linux-kernel - linux-next: manual merge of the mm-hotfixes 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>] [day] [month] [year] [list]

Message-ID: <20230620092940.3597ace2@canb.auug.org.au>
Date:   Tue, 20 Jun 2023 09:29:40 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>
Cc:     David Howells <dhowells@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        "Vishal Moola (Oracle)" <vishal.moola@...il.com>
Subject: linux-next: manual merge of the mm-hotfixes tree with Linus' tree

Hi all,

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

  fs/afs/write.c

between commits:

  a2b6f2ab3e14 ("afs: Fix dangling folio ref counts in writeback")
  819da022dd00 ("afs: Fix waiting for writeback then skipping folio")

from Linus' tree and commits:

  4f243fa208e8 ("afs: fix dangling folio ref counts in writeback")
  c548e38a7cc3 ("afs: fix waiting for writeback then skipping folio")

from the mm-hotfixes tree.

I fixed it up (I used the version from Linus' tree) 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