linux-kernel - Re: linux-next: upcoming conflict between the target-updates and target-bva trees

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: <1e3679b7-2812-8916-92f8-09d9cbd6deea@acm.org>
Date:   Thu, 1 Jun 2017 21:55:47 -0700
From:   Bart Van Assche <bvanassche@....org>
To:     "Nicholas A. Bellinger" <nab@...ux-iscsi.org>,
        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>
Subject: Re: linux-next: upcoming conflict between the target-updates and
        target-bva trees

On 06/01/17 21:03, Nicholas A. Bellinger wrote:
> On Fri, 2017-06-02 at 13:39 +1000, Stephen Rothwell wrote:
>> Last night the target-bva tree was rebased on top of the target-updates
>> tree.  Just now, part of the target-updates tree has been rewritten.
>> So now I expect to get conflict(s) when I merge these trees since the
>> commits in the target-updates tree are no longer the same as those that
>> the target-bva tree was rebased on top of.
>>
>> Please take a little time to sort out your development process.
> 
> Unfortunately, this is going to continue to be a problem once these
> patches are list reviewed, and included in target-updates.
> 
> Bart, can you please drop the patches?
Hello Stephen and Nic,

I have just reset that branch to v4.12-rc1. Sorry for the inconvenience.

Bart.