Messages in this thread | | | Date | Wed, 13 Jul 2022 08:09:49 +0200 | Subject | Re: linux-next: manual merge of the kvm tree with Linus' tree | From | Paolo Bonzini <> |
| |
On 7/13/22 08:02, Stephen Rothwell wrote: > I didn't know if the new includes needed to be prefixed with "../" > as well ... I though it was better safe than sorry.
If it compiles, it's perfect. :)
Thanks, I'll check it out and report to Linus the reason for the conflict.
Paolo
> 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.
| |