Messages in this thread | | | From | Miguel Ojeda <> | Date | Wed, 3 Aug 2022 11:28:43 +0200 | Subject | Re: linux-next: manual merge of the rust tree with the kbuild tree |
| |
On Wed, Aug 3, 2022 at 1:38 AM <broonie@kernel.org> wrote: > > 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.
Looks good to me! Thanks!
Cheers, Miguel
| |