Xen devel - Jan 2012 - linux-next: manual merge of the xen tree with Linus' tree

Hi all,

Today''s linux-next merge of the xen tree got a conflict in
arch/x86/xen/Kconfig between commit 10fe570fc167 ("Revert "xen/debug:
WARN_ON when identity PFN has no _PAGE_IOMAP flag set."") from
Linus''
tree and commit 23757fb5d678 ("xen: add CPU microcode update driver")
from the xen tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/xen/Kconfig
index fdce49c,4d04d4f..0000000
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@@ -50,3 -50,14 +50,6 @@@ config XEN_DEBUG_F
  	  Enable statistics output and various tuning options in debugfs.
  	  Enabling this option may incur a significant performance overhead.
  
 -config XEN_DEBUG
 -	bool "Enable Xen debug checks"
 -	depends on XEN
 -	default n
 -	help
 -	  Enable various WARN_ON checks in the Xen MMU code.
 -	  Enabling this option WILL incur a significant performance overhead.
 -
+ config MICROCODE_XEN
+        def_bool y
+        depends on XEN_DOM0 && MICROCODE

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
> 
> Today''s linux-next merge of the xen tree got a conflict in
> arch/x86/xen/Kconfig between commit 10fe570fc167 ("Revert
"xen/debug:
> WARN_ON when identity PFN has no _PAGE_IOMAP flag set."") from
Linus''
> tree and commit 23757fb5d678 ("xen: add CPU microcode update
driver")
> from the xen tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/x86/xen/Kconfig
> index fdce49c,4d04d4f..0000000
> --- a/arch/x86/xen/Kconfig
> +++ b/arch/x86/xen/Kconfig
> @@@ -50,3 -50,14 +50,6 @@@ config XEN_DEBUG_F
>   	  Enable statistics output and various tuning options in debugfs.
>   	  Enabling this option may incur a significant performance overhead.
>   
>  -config XEN_DEBUG
>  -	bool "Enable Xen debug checks"
>  -	depends on XEN
>  -	default n
>  -	help
>  -	  Enable various WARN_ON checks in the Xen MMU code.
>  -	  Enabling this option WILL incur a significant performance overhead.
>  -
> + config MICROCODE_XEN
> +        def_bool y
> +        depends on XEN_DOM0 && MICROCODE
Jeremy, Konrad, the current Xen microcode crap was objected to 
early last year by the people developing the x86 microcode 
subsystem - still you have put it into the Xen tree, without 
even Cc:-ing the people involved!

To make it even clearer, because you don''t seem to be able to 
follow the proper upstream workflow unless forced to:

 NAKed-By: Ingo Molnar <mingo@elte.hu>

Please remove it from the Xen tree until the proper agreeement 
is reached.

Thanks,

	Ingo

On 01/11/2012 02:57 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today''s linux-next merge of the xen tree got a conflict in
> arch/x86/xen/Kconfig between commit 10fe570fc167 ("Revert
"xen/debug:
> WARN_ON when identity PFN has no _PAGE_IOMAP flag set."") from
Linus''
> tree and commit 23757fb5d678 ("xen: add CPU microcode update
driver")
> from the xen tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Do you know which branch this is coming from?  Are you by some chance
still (or again) pulling from my "git://github.com/jsgf/linux-xen.git
upstream/xen" repo, which contains a number of obsolete changes,
including the microcode stuff (now removed)?

I just created a new (empty)
"git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
upstream/linux-next" branch; could you make sure that replaces any other
branch you have from either kernel.org xen.git or github.com/jsgf/linux-xen?

Thanks,
    J

On 01/12/2012 08:29 AM, Jeremy Fitzhardinge wrote:
> Are you by some chance still (or again) pulling from my
> "git://github.com/jsgf/linux-xen.git upstream/xen" repo, which
> contains a number of obsolete changes...
Which looks like my mistake, because I don''t think I had asked you to
switch back to git.kernel.org.

Thanks,
    J

Hi Jeremy,

On Thu, 12 Jan 2012 08:44:18 +1100 Jeremy Fitzhardinge <jeremy@goop.org>
wrote:
>
> On 01/12/2012 08:29 AM, Jeremy Fitzhardinge wrote:
> > Are you by some chance still (or again) pulling from my
> > "git://github.com/jsgf/linux-xen.git upstream/xen" repo,
which
> > contains a number of obsolete changes...
> 
> Which looks like my mistake, because I don''t think I had asked you
to
> switch back to git.kernel.org.
OK, I will switch back to kernel.org today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/