From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
"Darrick J. Wong" <darrick.wong@oracle•com>,
David Chinner <david@fromorbit•com>,
linux-xfs@vger•kernel.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>, Dave Jiang <dave.jiang@intel•com>
Subject: linux-next: manual merge of the akpm-current tree with the xfs tree
Date: Fri, 10 Feb 2017 17:57:43 +1100 [thread overview]
Message-ID: <20170210175743.2a872558@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/dax.h
between commit:
8ff6daa17b6a ("omap: constify struct iomap_ops")
from the xfs tree and commits:
d6fb008f420c ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf")
db09ccff3e4e ("mm: replace FAULT_FLAG_SIZE with parameter to huge_fault")
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 include/linux/dax.h
index 2983e52efd07,df63730e86d2..000000000000
--- a/include/linux/dax.h
+++ b/include/linux/dax.h
@@@ -37,9 -37,9 +37,9 @@@ static inline void *dax_radix_locked_en
}
ssize_t dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,
- struct iomap_ops *ops);
+ const struct iomap_ops *ops);
- int dax_iomap_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
- const struct iomap_ops *ops);
+ int dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size,
- struct iomap_ops *ops);
++ const struct iomap_ops *ops);
int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index);
int dax_invalidate_mapping_entry(struct address_space *mapping, pgoff_t index);
int dax_invalidate_mapping_entry_sync(struct address_space *mapping,
next reply other threads:[~2017-02-10 6:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-10 6:57 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-11 8:33 linux-next: manual merge of the akpm-current tree with the xfs tree Stephen Rothwell
2017-02-10 7:07 Stephen Rothwell
2017-02-10 6:45 Stephen Rothwell
2017-02-10 6:41 Stephen Rothwell
2016-02-10 5:24 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=20170210175743.2a872558@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=darrick.wong@oracle$(echo .)com \
--cc=dave.jiang@intel$(echo .)com \
--cc=david@fromorbit$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-xfs@vger$(echo .)kernel.org \
/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