Messages in this thread | | | Date | Wed, 12 Dec 2018 16:12:17 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the phy-next tree with Linus' tree |
| |
Hi Kishon,
On Wed, 12 Dec 2018 10:37:37 +0530 Kishon Vijay Abraham I <kishon@ti.com> 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 [unhandled content-type:application/pgp-signature] | |