linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 23 Oct 2014 15:06:31 +0200
From:	Michal Hocko <mhocko@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	"Rafael J. Wysocki" <rjw@...ysocki.net>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the akpm-current tree with the pm
 tree

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/