linux-kernel - linux-next: manual merge of the akpm tree with the nvdimm 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20180405163007.38ec8cc6@canb.auug.org.au>
Date:   Thu, 5 Apr 2018 16:30:07 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Dan Williams <dan.j.williams@...el.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Matthew Wilcox <mawilcox@...rosoft.com>
Subject: linux-next: manual merge of the akpm tree with the nvdimm tree

Hi Andrew,

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

  fs/dax.c

between commit:

  fab6964f22b9 ("mm, fs, dax: handle layout changes to pinned dax mappings")

which was removed from the nvdimm tree today and patch:

  "page cache: use xa_lock"

from the akpm tree.

I fixed it up (I removed the dax_layout_busy_page() function) 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