From: Michal Hocko <mhocko@suse•cz>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation•org>,
"Rafael J. Wysocki" <rjw@rjwysocki•net>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the akpm-current tree with the pm tree
Date: Thu, 23 Oct 2014 15:06:31 +0200 [thread overview]
Message-ID: <20141023130631.GE23011@dhcp22.suse.cz> (raw)
In-Reply-To: <20141023140905.3bd78e51@canb.auug.org.au>
On Thu 23-10-14 14:09:05, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in
> include/linux/oom.h, kernel/power/process.c and mm/oom_kill.c between
> commit 5695be142e20 ("OOM, PM: OOM killed task shouldn't escape PM
> suspend") from the pm tree and commit e039ae202d34 ("OOM, PM: OOM
> killed task cannot escape PM suspend") from the akpm-current tree.
>
> I fixed it up (the pm tree version seems to be newer, so I used that)
> and can carry the fix as necessary (no action is required).
Yes that is correct. I thought Andrew has dropped the previous version
of the patch from his tree. Rafael has merged his in the meantime.
Thanks!
--
Michal Hocko
SUSE Labs
next prev parent reply other threads:[~2014-10-23 13:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-23 3:09 linux-next: manual merge of the akpm-current tree with the pm tree Stephen Rothwell
2014-10-23 13:06 ` Michal Hocko [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-28 10:24 Stephen Rothwell
2020-09-28 10:40 ` Jonathan Cameron
2020-10-01 9:53 Stephen Rothwell
2020-10-01 17:14 ` Nathan Chancellor
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=20141023130631.GE23011@dhcp22.suse.cz \
--to=mhocko@suse$(echo .)cz \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@rjwysocki$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/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