From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nicolas Pitre <nicolas.pitre@linaro.org>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the xen-two tree with the arm tree
Date: Tue, 2 Oct 2012 08:44:20 -0400 [thread overview]
Message-ID: <20121002124420.GA9009@phenom.dumpdata.com> (raw)
In-Reply-To: <20121002141141.827ca565a2722b72b1c2157e@canb.auug.org.au>
On Tue, Oct 02, 2012 at 02:11:41PM +1000, Stephen Rothwell wrote:
> Hi Konrad,
>
> Today's linux-next merge of the xen-two tree got a conflict in
> arch/arm/Kconfig between commit bd51e2f59558 ("ARM: 7506/1: allow for
> ATAGS to be configured out when DT support is selected") from the arm
> tree and commit eff8d6447d5f ("xen/arm: introduce CONFIG_XEN on ARM")
> from the xen-two tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thank you!
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/Kconfig
> index 7df4acc,3361466..0000000
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@@ -1897,6 -1891,22 +1897,16 @@@ config CC_STACKPROTECTO
> neutralized via a kernel panic.
> This feature requires gcc version 4.2 or above.
>
> -config DEPRECATED_PARAM_STRUCT
> - bool "Provide old way to pass kernel parameters"
> - help
> - This was deprecated in 2001 and announced to live on for 5 years.
> - Some old boot loaders still use this way.
> -
> + config XEN_DOM0
> + def_bool y
> + depends on XEN
> +
> + config XEN
> + bool "Xen guest support on ARM (EXPERIMENTAL)"
> + depends on EXPERIMENTAL && ARM && OF
> + help
> + Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
> +
> endmenu
>
> menu "Boot options"
prev parent reply other threads:[~2012-10-02 12:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 4:11 linux-next: manual merge of the xen-two tree with the arm tree Stephen Rothwell
2012-10-02 12:44 ` Konrad Rzeszutek Wilk [this message]
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=20121002124420.GA9009@phenom.dumpdata.com \
--to=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.