Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <1584408485-1921-1-git-send-email-laoar.shao@gmail.com>
 <158470908459.28353.7390210153247885071.tip-bot2@tip-bot2>
 <CALOAHbDGvbZ6x6pDcPah3_3YV9mwMtuFWbLhi0hTQmRro73jqg@mail.gmail.com> <20200320195540.4b50a01e601d67bb3574cf2a@linux-foundation.org>
In-Reply-To: <20200320195540.4b50a01e601d67bb3574cf2a@linux-foundation.org>
From:   Yafang Shao <laoar.shao@gmail.com>
Date:   Sat, 21 Mar 2020 11:34:57 +0800
Message-ID: <CALOAHbBWBdWGLGVAUjZGitR8xweNGg5yDQ8hvNiGyhc_HvnMhA@mail.gmail.com>
Subject: Re: [tip: sched/core] psi: Move PF_MEMSTALL out of task->flags
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     LKML <linux-kernel@vger.kernel.org>,
        linux-tip-commits@vger.kernel.org,
        Johannes Weiner <hannes@cmpxchg.org>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>,
        x86 <x86@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sat, Mar 21, 2020 at 10:55 AM Andrew Morton
<akpm@linux-foundation.org> wrote:
>
> On Sat, 21 Mar 2020 10:47:05 +0800 Yafang Shao <laoar.shao@gmail.com> wrote:
>
> > This patch was aleady added into Andrew's -mm tree.[1]
> > I'm not sure whether that could cause merge conflict when both of them
> > are merged into Linus's tree.
> >
>
> That's OK - if a patch turns up in someone else's -next tree I'll drop
> my copy.  Usually after checking that the other copy was the same
> version (it usually is) and after checking whether it has up to date
> cc:stable and review/ack tags (it usually doesn't!).
>

Got it.
Thanks for your explanation.

-- 
Yafang Shao
DiDi