linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the moduleh tree with the xen-two tree
@ 2011-10-25  8:34 Stephen Rothwell
  2011-10-26 19:30 ` Paul Gortmaker
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-10-25  8:34 UTC (permalink / raw)
  To: Paul Gortmaker
  Cc: linux-next, linux-kernel, Dan Magenheimer, Konrad Rzeszutek Wilk

[-- Attachment #1: Type: text/plain, Size: 889 bytes --]

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@canb.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>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the moduleh tree with the xen-two tree
  2011-10-25  8:34 linux-next: manual merge of the moduleh tree with the xen-two tree Stephen Rothwell
@ 2011-10-26 19:30 ` Paul Gortmaker
  0 siblings, 0 replies; 2+ messages in thread
From: Paul Gortmaker @ 2011-10-26 19:30 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Dan Magenheimer, Konrad Rzeszutek Wilk

[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@canb.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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-10-26 19:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-25  8:34 linux-next: manual merge of the moduleh tree with the xen-two tree Stephen Rothwell
2011-10-26 19:30 ` Paul Gortmaker

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).