* linux-next: manual merge of the vhost tree with the kvm-arm tree
@ 2020-03-30 5:56 Stephen Rothwell
2020-03-30 5:57 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2020-03-30 5:56 UTC (permalink / raw)
To: Michael S. Tsirkin, Christoffer Dall, Marc Zyngier
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Jason Wang
[-- Attachment #1: Type: text/plain, Size: 709 bytes --]
Hi all,
Today's linux-next merge of the vhost tree got a conflict in:
arch/arm/kvm/Kconfig
between commit:
541ad0150ca4 ("arm: Remove 32bit KVM host support")
from the kvm-arm tree and commit:
ec9d8449a99b ("vhost: refine vhost and vringh kconfig")
from the vhost tree.
I fixed it up (see below) 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 vhost tree with the kvm-arm tree
2020-03-30 5:56 linux-next: manual merge of the vhost tree with the kvm-arm tree Stephen Rothwell
@ 2020-03-30 5:57 ` Stephen Rothwell
2020-03-30 7:08 ` Jason Wang
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2020-03-30 5:57 UTC (permalink / raw)
To: Michael S. Tsirkin, Christoffer Dall, Marc Zyngier
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Jason Wang
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
Hi all,
On Mon, 30 Mar 2020 16:56:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vhost tree got a conflict in:
>
> arch/arm/kvm/Kconfig
>
> between commit:
>
> 541ad0150ca4 ("arm: Remove 32bit KVM host support")
>
> from the kvm-arm tree and commit:
>
> ec9d8449a99b ("vhost: refine vhost and vringh kconfig")
>
> from the vhost tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
^^^^^^^^^
I just removed the file, of course.
--
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 vhost tree with the kvm-arm tree
2020-03-30 5:57 ` Stephen Rothwell
@ 2020-03-30 7:08 ` Jason Wang
0 siblings, 0 replies; 3+ messages in thread
From: Jason Wang @ 2020-03-30 7:08 UTC (permalink / raw)
To: Stephen Rothwell, Michael S. Tsirkin, Christoffer Dall, Marc Zyngier
Cc: Linux Next Mailing List, Linux Kernel Mailing List
On 2020/3/30 下午1:57, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 30 Mar 2020 16:56:14 +1100 Stephen Rothwell<sfr@canb.auug.org.au> wrote:
>> Today's linux-next merge of the vhost tree got a conflict in:
>>
>> arch/arm/kvm/Kconfig
>>
>> between commit:
>>
>> 541ad0150ca4 ("arm: Remove 32bit KVM host support")
>>
>> from the kvm-arm tree and commit:
>>
>> ec9d8449a99b ("vhost: refine vhost and vringh kconfig")
>>
>> from the vhost tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary. This
> ^^^^^^^^^
> I just removed the file, of course.
Hi Stephen:
If you meant arch/arm/kvm/Kconfig I think it's correct.
Thakns
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-30 7:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-30 5:56 linux-next: manual merge of the vhost tree with the kvm-arm tree Stephen Rothwell
2020-03-30 5:57 ` Stephen Rothwell
2020-03-30 7:08 ` Jason Wang
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).