Messages in this thread | | | From | Arnd Bergmann <> | Date | Mon, 25 Jan 2021 10:44:23 +0100 | Subject | Re: linux-next: manual merge of the risc-v tree with the arm-soc tree |
| |
On Sun, Jan 24, 2021 at 11:14 PM 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 good, thanks!
Arnd
| |