From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dan Williams <dan.j.williams@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Ross Zwisler <ross.zwisler@linux•intel.com>
Subject: linux-next: manual merge of the nvdimm tree with Linus' tree
Date: Fri, 28 Aug 2015 16:15:58 +1000 [thread overview]
Message-ID: <20150828161558.29184e3f@canb.auug.org.au> (raw)
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@canb•auug.org.au
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,
next reply other threads:[~2015-08-28 6:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-28 6:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-11-10 1:24 linux-next: manual merge of the nvdimm tree with Linus' tree Stephen Rothwell
2015-11-10 2:42 ` Dan Williams
2015-11-10 4:50 ` Stephen Rothwell
2015-11-10 0:52 Stephen Rothwell
2015-06-20 12:38 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150828161558.29184e3f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dan.j.williams@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ross.zwisler@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox