On Wed, 14 Oct 2020 16:00:56 +0200 Alexander Potapenko <glider@xxxxxxxxxx> wrote:
> Hi Andrew,
>
> On Tue, Oct 13, 2020 at 8:20 PM <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
> >
> >
> > The patch titled
> > Subject: x86: add failure injection to get/put/clear_user
> > has been removed from the -mm tree. Its filename was
> > x86-add-failure-injection-to-get-put-clear_user.patch
> >
> > This patch was dropped because other changes were merged, which wrecked this patch
>
> On top of which tree should we rebase the patches to see/resolve these
> conflicts?
> linux-next/akpm and linux-mm/master seem to still contain all three
> patches in question.
The problem is ec6347bb43395 ("x86, powerpc: Rename memcpy_mcsafe() to
copy_mc_to_{user, kernel}()"), which is in Linus's tree. It seems to
have got slammed in at the last minute (with a cc:stable so I guess
it's important). Please rebase and retest against current -linus and
resend?
