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@xxxxxxxxxxxxxxxx
Attachment:
pgpxVadStvyXn.pgp
Description: OpenPGP digital signature
