Re: linux-next: manual merge of the phy-next tree with Linus' tree
From: Stephen Rothwell
Date: Wed Dec 12 2018 - 00:12:24 EST
Hi Kishon,
On Wed, 12 Dec 2018 10:37:37 +0530 Kishon Vijay Abraham I <kishon@xxxxxx> wrote:
>
> I've rebased by 'next' branch on top of my 'fixes' branch to avoid this conflict.
Why didn't you just merge them?
--
Cheers,
Stephen Rothwell
Attachment:
pgp_gwtK9NkNv.pgp
Description: OpenPGP digital signature