lkml.org 
[lkml]   [2018]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the phy-next tree with Linus' tree
From
Date
Hi,

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@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?

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.

Thanks
Kishon
>

\
 
 \ /
  Last update: 2018-12-12 06:30    [W:0.049 / U:0.336 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site