lkml.org 
[lkml]   [2021]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the cgroup tree with the kvm tree
From
Date
On 22/04/21 07:53, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the cgroup tree got conflicts in:
>
> arch/x86/kvm/svm/sev.c
>
> between commit:
>
> 9fa1521daafb ("KVM: SVM: Do not set sev->es_active until KVM_SEV_ES_INIT completes")
>
> from the kvm tree and commit:
>
> 7aef27f0b2a8 ("svm/sev: Register SEV and SEV-ES ASIDs to the misc controller")
>
> from the cgroup 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.
>

Tejun, please don't commit patches to other tree without an Acked-by
from the maintainer (which I wouldn't have provided, as the right way to
go would have been a topic branch).

Fortunately these patches are at the bottom of your tree. If it's okay,
I'll just pull from there "as if" you had provided a topic branch all
the time.

Thanks,

Paolo

\
 
 \ /
  Last update: 2021-04-22 08:35    [W:0.102 / U:0.196 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site