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] [thread-next>] [day] [month] [year] [list]
Date:   Wed, 12 Dec 2018 16:12:17 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Kishon Vijay Abraham I <kishon@...com>
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 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?

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ