From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Jeremy Fitzhardinge <jeremy@goop•org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>,
Stefano Stabellini <stefano.stabellini@eu•citrix.com>,
Xen Devel <Xen-devel@lists•xensource.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Vrabel <david.vrabel@citrix•com>,
"Kirill A. Shutemov" <kirill.shutemov@linux•intel.com>
Subject: linux-next: manual merge of the akpm-current tree with the xen-tip tree
Date: Thu, 29 Jan 2015 18:28:55 +1100 [thread overview]
Message-ID: <20150129182855.58f0cf82@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1309 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
include/linux/mm.h between commit 667a0a06c99d ("mm: provide a
find_special_page vma operation") from the xen-tip tree and commit
cfd00f5aa195 ("mm: drop vm_ops->remap_pages and
generic_file_remap_pages() stub") from the akpm-current 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 include/linux/mm.h
index 9269af7349fe,b5e28731a293..000000000000
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@@ -287,17 -284,6 +284,14 @@@ struct vm_operations_struct
struct mempolicy *(*get_policy)(struct vm_area_struct *vma,
unsigned long addr);
#endif
- /* called by sys_remap_file_pages() to populate non-linear mapping */
- int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
- unsigned long size, pgoff_t pgoff);
+
+ /*
+ * Called by vm_normal_page() for special PTEs to find the
+ * page for @addr. This is useful if the default behavior
+ * (using pte_page()) would not find the correct page.
+ */
+ struct page *(*find_special_page)(struct vm_area_struct *vma,
+ unsigned long addr);
};
struct mmu_gather;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-01-29 7:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-29 7:28 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-07-30 9:02 linux-next: manual merge of the akpm-current tree with the xen-tip tree Stephen Rothwell
2018-07-30 17:02 ` Boris Ostrovsky
2018-07-30 17:45 ` Boris Ostrovsky
2018-08-16 0:05 ` 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=20150129182855.58f0cf82@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=david.vrabel@citrix$(echo .)com \
--cc=jeremy@goop$(echo .)org \
--cc=kirill.shutemov@linux$(echo .)intel.com \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=stefano.stabellini@eu$(echo .)citrix.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