linux-kernel - linux-next: manual merge of the nvdimm 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]

Date:	Sat, 20 Jun 2015 22:38:55 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dan Williams <dan.j.williams@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Richard Weinberger <richard@....at>, Jens Axboe <axboe@...com>
Subject: linux-next: manual merge of the nvdimm tree with Linus' tree

Hi Dan,

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

  drivers/block/Kconfig

between commit:

  b6f2098fb708 ("block: pmem: Add dependency on HAS_IOMEM")

from Linus' tree and commit:

  1ffe3c5dc311 ("libnvdimm, pmem: move pmem to drivers/nvdimm/")

from the nvdimm tree.

I fixed it up (the latter incorporated the change from the former)
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped