From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751986AbcJJAhE (ORCPT ); Sun, 9 Oct 2016 20:37:04 -0400 Received: from ozlabs.org ([103.22.144.67]:58945 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750786AbcJJAhD (ORCPT ); Sun, 9 Oct 2016 20:37:03 -0400 Date: Mon, 10 Oct 2016 11:37:01 +1100 From: Stephen Rothwell To: Miklos Szeredi Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: clean up the vfs-miklos tree Message-ID: <20161010113701.43a17ee5@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 Miklos, It looks like everything in the vfs-miklos tree is now in Linus' tree or the vfs tree but as different commits and so is causing merge conflicts. Could you please clean it up, or should I just drop it now? -- Cheers, Stephen Rothwell