linux-next: manual merge of the kvm-arm tree with the kbuild tree

linux-next: manual merge of the kvm-arm tree with the kbuild tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

Hi all,

Today's linux-next merge of the kvm-arm tree got a conflict in:

  include/Kbuild

between commit:

  fcbb8461fd23 ("kbuild: remove header compile test")

from the kbuild tree and commit:

  55009c6ed2d2 ("KVM: arm/arm64: Factor out hypercall handling from PSCI code")

from the kvm-arm tree.

I fixed it up (I just removed the file) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the kvm-arm tree with the kbuild tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 936 bytes --]

Hi all,

On Mon, 18 Nov 2019 14:38:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
> 
>   include/Kbuild
> 
> between commit:
> 
>   fcbb8461fd23 ("kbuild: remove header compile test")
> 
> from the kbuild tree and commit:
> 
>   55009c6ed2d2 ("KVM: arm/arm64: Factor out hypercall handling from PSCI code")
> 
> from the kvm-arm tree.
> 
> I fixed it up (I just removed the file) 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.

This is now a conflict between the kvm tree and the kbuild tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the kvm-arm tree with the kbuild tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1122 bytes --]

Hi all,

On Mon, 25 Nov 2019 13:58:11 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 18 Nov 2019 14:38:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the kvm-arm tree got a conflict in:
> > 
> >   include/Kbuild
> > 
> > between commit:
> > 
> >   fcbb8461fd23 ("kbuild: remove header compile test")
> > 
> > from the kbuild tree and commit:
> > 
> >   55009c6ed2d2 ("KVM: arm/arm64: Factor out hypercall handling from PSCI code")
> > 
> > from the kvm-arm tree.
> > 
> > I fixed it up (I just removed the file) 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.  
> 
> This is now a conflict between the kvm tree and the kbuild tree.

And now between the kbuild tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]