Hi Dan,
Today's linux-next merge of the nvdimm tree got a conflict in:
drivers/acpi/nfit.c
between commit:
de4a196c02a2 ("nfit, nd_blk: BLK status register is only 32 bits")
from Linus' tree and commit:
67a3e8fe9015 ("nd_blk: change aperture mapping from WC to WB")
from the nvdimm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/acpi/nfit.c
index bb29e56276bd,82d07e8fda00..000000000000
--- a/drivers/acpi/nfit.c
+++ b/drivers/acpi/nfit.c
@@@ -1032,7 -1017,7 +1017,7 @@@ static u32 read_blk_stat(struct nfit_bl
if (mmio->num_lines)
offset = to_interleave_offset(offset, mmio);
- return readl(mmio->base + offset);
- return readq(mmio->addr.base + offset);
++ return readl(mmio->addr.base + offset);
}
static void write_blk_ctl(struct nfit_blk *nfit_blk, unsigned int bw,
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
