linux-kernel - Re: linux-next: manual merge of the pm tree with the s390 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] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 25 Oct 2011 10:39:46 +0200
From:	"Rafael J. Wysocki" <rjw@...k.pl>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>
Subject: Re: linux-next: manual merge of the pm tree with the s390 tree

On Tuesday, October 25, 2011, Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in
> arch/s390/kernel/suspend.c between commit 4de2166b1804 ("[S390] sparse:
> fix sparse warnings about missing prototypes") from the s390 tree and
> commit 85055dd805f0 ("PM / Hibernate: Include storage keys in hibernation
> image on s390") from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

The fix looks correct to me, so please carry it going forward (unless
Martin decides to pull it into his tree).

Thanks,
Rafael
--
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/