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: <20110811150252.54c4abf3598edef9bab14bb6@canb.auug.org.au>
Date:	Thu, 11 Aug 2011 15:02:52 +1000
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,
	ShuoX Liu <shuox.liu@...el.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/main.c between commit b57b760a97cf ("PM / Suspend: Add
statistics debugfs file for suspend to RAM") from the pm tree and commit
6320ae56afdf ("kernel: Fix files explicitly needing EXPORT_SYMBOL
infrastructure") from the moduleh tree.

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/main.c
index 2757acb,a811007..0000000
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@@ -12,8 -12,7 +12,9 @@@
  #include <linux/string.h>
  #include <linux/resume-trace.h>
  #include <linux/workqueue.h>
 +#include <linux/debugfs.h>
 +#include <linux/seq_file.h>
+ #include <linux/export.h>
  
  #include "power.h"
  
--
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/