linux-next: manual merge of the xen-tip tree with the tip tree

Stephen Rothwell
2017-08-28T05:20:20Z

Hi all,

Today's linux-next merge of the xen-tip tree got conflicts in:

arch/x86/xen/xen-asm.S
arch/x86/xen/xen-asm_64.S

between commit:

edcb5cf84f05 ("x86/paravirt/xen: Remove xen_patch()")

from the tip tree and commits:

ad5b8c4ba323("xen: get rid of paravirt op adjust_exception_frame")
bd830917233b ("paravirt,xen: remove xen_patch()")

from the xen-tip tree.

I fixed it up (edcb5cf84f05 and bd830917233b ate more or less the same
patch, so I just used the latter version files) and can carry the fix
as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--
Cheers,
Stephen Rothwell