From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752606AbcGHEbL (ORCPT ); Fri, 8 Jul 2016 00:31:11 -0400 Received: from mail-lf0-f43.google.com ([209.85.215.43]:32889 "EHLO mail-lf0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751110AbcGHEbE (ORCPT ); Fri, 8 Jul 2016 00:31:04 -0400 Subject: Re: linux-next: please clean up the lightnvm tree To: Stephen Rothwell References: <20160708142251.650e3756@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Axboe From: =?UTF-8?Q?Matias_Bj=c3=b8rling?= Message-ID: <577F2C83.4060704@bjorling.me> Date: Fri, 8 Jul 2016 06:30:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <20160708142251.650e3756@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.