From: Catalin Marinas <catalin.marinas@arm•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Will Deacon <will@kernel•org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Anshuman Khandual <anshuman.khandual@arm•com>,
Mike Rapoport <rppt@linux•ibm.com>
Subject: Re: linux-next: manual merge of the akpm tree with the arm64 tree
Date: Thu, 5 Mar 2020 09:21:51 +0000 [thread overview]
Message-ID: <20200305092151.GB1729062@arrakis.emea.arm.com> (raw)
In-Reply-To: <20200305165046.42e62969@canb.auug.org.au>
On Thu, Mar 05, 2020 at 04:50:46PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the akpm tree got a conflict in:
>
> arch/arm64/mm/mmu.c
>
> between commit:
>
> bbd6ec605c0f ("arm64/mm: Enable memory hot remove")
>
> from the arm64 tree and patch:
>
> 37be0f08b1cc ("arm64/mm: implement unmap_hotplug_p4d_range")
>
> from the akpm tree.
>
> I fixed it up (I just dropped the latter (and its followup fix) for today)
Thanks Stephen. Anshuman integrated those fixes in his memory hotremove
series.
--
Catalin
next prev parent reply other threads:[~2020-03-05 9:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 5:50 linux-next: manual merge of the akpm tree with the arm64 tree Stephen Rothwell
2020-03-05 9:21 ` Catalin Marinas [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-07 9:25 Stephen Rothwell
2021-06-07 10:29 ` Will Deacon
2021-03-22 6:40 Stephen Rothwell
2021-03-22 18:03 ` Catalin Marinas
2021-01-28 8:08 Stephen Rothwell
2020-11-30 7:28 Stephen Rothwell
2020-11-30 7:48 ` Stephen Rothwell
2020-11-30 11:58 ` Catalin Marinas
2020-11-26 7:06 Stephen Rothwell
2020-11-26 7:25 ` Peter Collingbourne
2020-01-23 5:43 Stephen Rothwell
2017-04-07 7:41 Stephen Rothwell
2017-04-07 8:48 ` Catalin Marinas
2017-04-07 9:25 ` 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=20200305092151.GB1729062@arrakis.emea.arm.com \
--to=catalin.marinas@arm$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=anshuman.khandual@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rppt@linux$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=will@kernel$(echo .)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