Messages in this thread | | | From | Miguel Ojeda <> | Date | Mon, 18 Oct 2021 13:32:54 +0200 | Subject | Re: linux-next: manual merge of the rust tree with the bpf-next tree |
| |
On Mon, Oct 18, 2021 at 6:51 AM Stephen Rothwell <sfr@canb.auug.org.au> 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 correct, thanks Stephen!
I am glad you didn't have more conflicts after the rebase to v5.15-rc5.
Cheers, Miguel
| |