* linux-next: manual merge of the xen-two tree with the arm tree
@ 2012-10-02 4:11 Stephen Rothwell
2012-10-02 12:44 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-10-02 4:11 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: linux-next, linux-kernel, Nicolas Pitre, Russell King
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
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).
--
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"
[-- 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 xen-two tree with the arm tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-10-02 12:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Nicolas Pitre, Russell King
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"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-02 12:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).