linux-kernel - linux-next: manual merge of the nvdimm tree with the block 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: <20220315191831.15816703@canb.auug.org.au>
Date:   Tue, 15 Mar 2022 19:18:31 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Dan Williams <dan.j.williams@...el.com>,
        Jens Axboe <axboe@...nel.dk>
Cc:     Christoph Hellwig <hch@....de>,
        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 nvdimm tree with the block tree

Hi all,

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

  drivers/nvdimm/blk.c

between commits:

  322cbb50de71 ("block: remove genhd.h")
  20072ec82864 ("nvdimm-blk: use bvec_kmap_local in nd_blk_rw_integrity")

from the block tree and commit:

  f8669f1d6a86 ("nvdimm/blk: Delete the block-aperture window driver")

from the nvdimm tree.

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