Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the kvm-arm tree with the kbuild tree
@ 2019-11-18  3:38 Stephen Rothwell
  2019-11-25  2:58 ` Stephen Rothwell
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2019-11-18  3:38 UTC (permalink / raw)
  To: Christoffer Dall, Marc Zyngier, Masahiro Yamada
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Paolo Bonzini, Radim Krčmář,
	KVM

[-- 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 --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the kvm-arm tree with the kbuild tree
  2019-11-18  3:38 linux-next: manual merge of the kvm-arm tree with the kbuild tree Stephen Rothwell
@ 2019-11-25  2:58 ` Stephen Rothwell
  2019-11-26 20:30   ` Stephen Rothwell
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2019-11-25  2:58 UTC (permalink / raw)
  To: Masahiro Yamada, Paolo Bonzini, Radim Krčmář
  Cc: Christoffer Dall, Marc Zyngier, Linux Next Mailing List,
	Linux Kernel Mailing List, KVM

[-- 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 --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the kvm-arm tree with the kbuild tree
  2019-11-25  2:58 ` Stephen Rothwell
@ 2019-11-26 20:30   ` Stephen Rothwell
  0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2019-11-26 20:30 UTC (permalink / raw)
  To: Masahiro Yamada, Paolo Bonzini, Radim Krčmář
  Cc: Christoffer Dall, Marc Zyngier, Linux Next Mailing List,
	Linux Kernel Mailing List, KVM

[-- 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 --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-18  3:38 linux-next: manual merge of the kvm-arm tree with the kbuild tree Stephen Rothwell
2019-11-25  2:58 ` Stephen Rothwell
2019-11-26 20:30   ` Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git