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: <20220215180043.23879691@canb.auug.org.au>
Date:   Tue, 15 Feb 2022 18:00:43 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Matthew Wilcox <willy@...radead.org>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the akpm-current tree with the folio
 tree

Hi all,

Today's linux-next merge of the block tree got conflicts in:

  include/linux/mm.h
  include/linux/rmap.h
  mm/gup.c
  mm/huge_memory.c
  mm/internal.h
  mm/memory-failure.c
  mm/migrate.c
  mm/mlock.c
  mm/rmap.c
  mm/vmscan.c

There is no way I can figure out in a reasonable time (or at all
probably) the resolution needed here.  You guys need to get together
and figure out how the folio tree changes are going to progress to
Linus' tree.

I have gone back and used the folio tree from next-20220204 again for
today.
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ