linux-kernel - linux-next: manual merge of the moduleh 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>] [day] [month] [year] [list]

Message-Id: <20111006162756.c2ce5222b2cd9061d471986f@canb.auug.org.au>
Date:	Thu, 6 Oct 2011 16:27:56 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Barry Song <baohua.song@....com>,
	"Rafael J. Wysocki" <rjw@...k.pl>
Subject: linux-next: manual merge of the moduleh tree with the pm tree

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
kernel/power/hibernate.c between commit 55415f553b8b ("PM / Hibernate:
Add resumewait param to support MMC-like devices as resume file") from
the pm tree and commit 5ee961c64584 ("kernel: Fix files explicitly
needing EXPORT_SYMBOL infrastructure") from the moduleh tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc kernel/power/hibernate.c
index 0f87850,ce21f25..0000000
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@@ -14,7 -14,7 +14,8 @@@
  #include <linux/reboot.h>
  #include <linux/string.h>
  #include <linux/device.h>
 +#include <linux/async.h>
+ #include <linux/export.h>
  #include <linux/kmod.h>
  #include <linux/delay.h>
  #include <linux/fs.h>

Content of type "application/pgp-signature" skipped