linux-kernel - linux-next: manual merge of the moduleh tree with the xen-two 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20111025193442.66255eed8e72d5e88cce192f@canb.auug.org.au>
Date:	Tue, 25 Oct 2011 19:34:42 +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,
	Dan Magenheimer <dan.magenheimer@...cle.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Subject: linux-next: manual merge of the moduleh tree with the xen-two tree

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/xen/xen-selfballoon.c between commit 38a1ed4f039d ("xen: Fix
selfballooning and ensure it doesn't go too far") from the xen-two tree
and commit 29ff02027c68 ("xen: fix implicit stat.h/module.h include usage
in xen-selfballoon.c") 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 drivers/xen/xen-selfballoon.c
index d93c708,e21e3ce..0000000
--- a/drivers/xen/xen-selfballoon.c
+++ b/drivers/xen/xen-selfballoon.c
@@@ -68,8 -68,8 +68,10 @@@
   */
  
  #include <linux/kernel.h>
 +#include <linux/bootmem.h>
 +#include <linux/swap.h>
+ #include <linux/stat.h>
+ #include <linux/module.h>
  #include <linux/mm.h>
  #include <linux/mman.h>
  #include <linux/module.h>

Content of type "application/pgp-signature" skipped