linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Dan Magenheimer <dan.magenheimer@oracle.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: linux-next: manual merge of the moduleh tree with the xen-two tree
Date: Tue, 25 Oct 2011 19:34:42 +1100	[thread overview]
Message-ID: <20111025193442.66255eed8e72d5e88cce192f@canb.auug.org.au> (raw)

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

             reply	other threads:[~2011-10-25  8:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-25  8:34 Stephen Rothwell [this message]
2011-10-26 19:30 ` linux-next: manual merge of the moduleh tree with the xen-two tree Paul Gortmaker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111025193442.66255eed8e72d5e88cce192f@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=dan.magenheimer@oracle.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=paul.gortmaker@windriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).