From: Jerome Glisse <jglisse@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Sean Christopherson <sean.j.christopherson@intel.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with Linus' tree
Date: Fri, 11 Jan 2019 10:08:53 -0500 [thread overview]
Message-ID: <20190111150852.GA3190@redhat.com> (raw)
In-Reply-To: <20190111135100.487a1896@canb.auug.org.au>
On Fri, Jan 11, 2019 at 01:51:00PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> mm/rmap.c
>
> between commit:
>
> ba422731316d ("mm/mmu_notifier: mm/rmap.c: Fix a mmu_notifier range bug in try_to_unmap_one")
>
> from Linus' tree and commit:
>
> f955d5dda846 ("mm/mmu_notifier: contextual information for event triggering invalidation v2")
>
> 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.
This looks good to me.
Thank you,
Jérôme
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc mm/rmap.c
> index 0454ecc29537,62e47f3462cf..000000000000
> --- a/mm/rmap.c
> +++ b/mm/rmap.c
> @@@ -1371,9 -1372,10 +1372,10 @@@ static bool try_to_unmap_one(struct pag
> * Note that the page can not be free in this function as call of
> * try_to_unmap() must hold a reference on the page.
> */
> - mmu_notifier_range_init(&range, vma->vm_mm, vma->vm_start,
> - min(vma->vm_end, vma->vm_start +
> + mmu_notifier_range_init(&range, vma->vm_mm, address,
> + min(vma->vm_end, address +
> - (PAGE_SIZE << compound_order(page))));
> + (PAGE_SIZE << compound_order(page))),
> + MMU_NOTIFY_CLEAR);
> if (PageHuge(page)) {
> /*
> * If sharing is possible, start and end will be adjusted
next prev parent reply other threads:[~2019-01-11 15:09 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-11 2:51 linux-next: manual merge of the akpm-current tree with Linus' tree Stephen Rothwell
2019-01-11 15:08 ` Jerome Glisse [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-04-11 3:35 Stephen Rothwell
2021-04-06 11:29 Stephen Rothwell
2021-02-08 12:10 Stephen Rothwell
2020-09-08 9:24 Stephen Rothwell
2020-09-08 9:17 Stephen Rothwell
2020-06-03 8:07 Stephen Rothwell
2020-06-03 7:53 Stephen Rothwell
2019-02-18 6:51 Stephen Rothwell
2019-02-20 1:00 ` Stephen Rothwell
2019-01-07 2:16 Stephen Rothwell
2018-08-15 8:05 Stephen Rothwell
2018-07-23 8:00 Stephen Rothwell
2018-06-14 1:43 Stephen Rothwell
2018-06-14 1:36 Stephen Rothwell
2018-03-16 5:56 Stephen Rothwell
2017-11-02 8:10 Stephen Rothwell
2017-11-02 7:37 Stephen Rothwell
2017-05-08 3:48 Stephen Rothwell
2017-04-24 7:25 Stephen Rothwell
2017-04-24 9:11 ` Mel Gorman
2016-12-05 5:38 Stephen Rothwell
2016-12-05 5:56 ` Michal Hocko
2016-12-05 6:08 ` Stephen Rothwell
2016-01-18 3:22 Stephen Rothwell
2015-12-18 5:09 Stephen Rothwell
2015-10-06 5:46 Stephen Rothwell
2015-07-20 3:54 Stephen Rothwell
2015-05-19 6:40 Stephen Rothwell
2014-08-08 5:46 Stephen Rothwell
2014-08-07 6:51 Stephen Rothwell
2014-05-29 9:08 Stephen Rothwell
2014-04-29 4:47 Stephen Rothwell
2014-04-24 5:38 Stephen Rothwell
2014-04-07 4:18 Stephen Rothwell
2014-01-29 3:46 Stephen Rothwell
2013-12-23 3:58 Stephen Rothwell
2013-12-03 1:52 Stephen Rothwell
2013-12-03 7:16 ` Richard Weinberger
2013-12-03 7:31 ` Andrew Morton
2013-12-03 7:36 ` Richard Weinberger
2013-02-02 12:55 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=20190111150852.GA3190@redhat.com \
--to=jglisse@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sean.j.christopherson@intel.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).