Messages in this thread | | | Date | Fri, 20 Mar 2020 19:55:40 -0700 | From | Andrew Morton <> | Subject | Re: [tip: sched/core] psi: Move PF_MEMSTALL out of task->flags |
| |
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!).
| |