linux-kernel - Re: 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20111026193038.GA6385@windriver.com>
Date:	Wed, 26 Oct 2011 15:30:38 -0400
From:	Paul Gortmaker <paul.gortmaker@...driver.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
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: Re: linux-next: manual merge of the moduleh tree with the xen-two
 tree

[linux-next: manual merge of the moduleh tree with the xen-two tree] On 25/10/2011 (Tue 19:34) Stephen Rothwell wrote:

> 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>

Thanks, Stephen.

I'll just drop the module.h commit, since there is clearly two module.h
listings above, as 4fec0e0bde09095b6349dc6206dbf19cebcd0a7e from
v3.1-rc3 and forward added the last line above.  The stat.h addition,
while correct, isn't critical, since module.h has to include stat.h

Paul.
--
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/