From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Dan Williams <dan.j.williams@intel•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Souptick Joarder <jrdr.linux@gmail•com>,
Matthew Wilcox <mawilcox@microsoft•com>
Subject: linux-next: manual merge of the akpm-current tree with the nvdimm tree
Date: Mon, 4 Jun 2018 20:24:53 +1000 [thread overview]
Message-ID: <20180604202453.77342f89@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1652 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/dax.c
between commit:
cc4a90ac816e ("dax: dax_insert_mapping_entry always succeeds")
from the nvdimm tree and commit:
aa726309bde7 ("fs/dax.c: add new return type vm_fault_t")
from the akpm-current tree.
I fixed it up (see below) 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
diff --cc fs/dax.c
index d6b01de7f881,821986c61f7e..000000000000
--- a/fs/dax.c
+++ b/fs/dax.c
@@@ -1017,8 -910,9 +1017,8 @@@ static vm_fault_t dax_load_hole(struct
{
struct inode *inode = mapping->host;
unsigned long vaddr = vmf->address;
- int ret = VM_FAULT_NOPAGE;
+ vm_fault_t ret = VM_FAULT_NOPAGE;
struct page *zero_page;
- void *entry2;
pfn_t pfn;
zero_page = ZERO_PAGE(0);
@@@ -1028,9 -922,14 +1028,9 @@@
}
pfn = page_to_pfn_t(zero_page);
- entry2 = dax_insert_mapping_entry(mapping, vmf, entry, pfn,
- RADIX_DAX_ZERO_PAGE, false);
- if (IS_ERR(entry2)) {
- ret = VM_FAULT_SIGBUS;
- goto out;
- }
-
+ dax_insert_mapping_entry(mapping, vmf, entry, pfn, RADIX_DAX_ZERO_PAGE,
+ false);
- vm_insert_mixed(vmf->vma, vaddr, pfn);
+ ret = vmf_insert_mixed(vmf->vma, vaddr, pfn);
out:
trace_dax_load_hole(inode, vmf, ret);
return ret;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-06-04 10:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-04 10:24 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-07 6:39 linux-next: manual merge of the akpm-current tree with the nvdimm tree Stephen Rothwell
2021-12-07 6:55 ` Christoph Hellwig
2021-12-07 10:23 ` Joao Martins
2017-11-16 3:16 Stephen Rothwell
2017-11-16 4:55 ` Minchan Kim
2017-04-24 6:47 Stephen Rothwell
2016-01-08 5:51 Stephen Rothwell
2015-12-31 10:51 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=20180604202453.77342f89@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dan.j.williams@intel$(echo .)com \
--cc=jrdr.linux@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mawilcox@microsoft$(echo .)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