Re: linux-next: manual merge of the phy-next tree with Linus' tree

From: Kishon Vijay Abraham I
Date: Wed Dec 12 2018 - 00:29:21 EST


On 12/12/18 10:42 AM, Stephen Rothwell wrote:
> 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?

Merging will create a new merge commit which I can avoid by rebasing. Also the
patches in next branch will be above the patches in fixes branch.