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  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]
Date:   Tue, 15 Jan 2019 11:18:45 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Daniel Walker <dwalker@...o99.com>
Cc:     Al Viro <viro@...IV.linux.org.uk>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        David Howells <dhowells@...hat.com>
Subject: Re: linux-next: manual merge of the cisco tree with the vfs tree

Hi Daniel,

On Mon, 14 Jan 2019 14:54:12 -0800 Daniel Walker <dwalker@...o99.com> wrote:
>
> I did a rebase after your original made this. I'm not sure it's needed any
> longer. However, I was planning to rebase my tree again on top of the latest
> Linus tree. How would you like to proceed ?

I still get the conflict when I merge your tree, but it is not such a
bit conflict that it warrants rebasing your tree to get rid of it.  It
will be sorted out easily enough when Linus merges your tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists