From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752925AbcGHEXU (ORCPT ); Fri, 8 Jul 2016 00:23:20 -0400 Received: from ozlabs.org ([103.22.144.67]:57369 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751412AbcGHEXJ (ORCPT ); Fri, 8 Jul 2016 00:23:09 -0400 Date: Fri, 8 Jul 2016 14:22:51 +1000 From: Stephen Rothwell To: Matias =?UTF-8?B?QmrDuHJsaW5n?= Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jens Axboe Subject: linux-next: please clean up the lightnvm tree Message-ID: <20160708142251.650e3756@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. -- Cheers, Stephen Rothwell