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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <470d74f1-2778-db77-641e-97310335ac42@ti.com>
Date:   Wed, 12 Dec 2018 10:58:38 +0530
From:   Kishon Vijay Abraham I <kishon@...com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
CC:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Douglas Anderson <dianders@...omium.org>,
        Evan Green <evgreen@...omium.org>
Subject: Re: linux-next: manual merge of the phy-next tree with Linus' tree

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