linux-kernel - Re: linux-next: please clean up the lightnvm 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <577F2C83.4060704@bjorling.me>
Date:	Fri, 8 Jul 2016 06:30:59 +0200
From:	Matias Bjørling <m@...rling.me>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jens Axboe <axboe@...nel.dk>
Subject: Re: linux-next: please clean up the lightnvm tree

On 07/08/2016 06:22 AM, Stephen Rothwell wrote:
> Hi Matias,
>
> I noticed that the commits in the lightnvm tree have been applied
> to the block tree as a series of patches (i.e. effectively rebased).
> Could you please remove all the duplicate patches from the lightnvm tree
> (which I think is the whole tree, curretly) before they start causing
> merge conflicts for me.
>
> One way to do this would be to rebase your tree on top of the block tree.
>

Thanks Stephen. Updated the for-next. I will make sure they are taken 
off if applied directly to the block tree in the future.