From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753171AbcDEAme (ORCPT ); Mon, 4 Apr 2016 20:42:34 -0400 Received: from ozlabs.org ([103.22.144.67]:41483 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751368AbcDEAmd (ORCPT ); Mon, 4 Apr 2016 20:42:33 -0400 Date: Tue, 5 Apr 2016 10:42:28 +1000 From: Stephen Rothwell To: Sage Weil Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: please clean up the ceph tree Message-ID: <20160405104228.22b0de07@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 Sage, It appears that the ceph tree was completely rebased before asking Linus to merge it (to remove its first commit (ebfadc523e06 "[DO NOT MERGE] rbd: bump RBD_MAX_PARENT_CHAIN_LEN to 128")). Please clean it up as it is starting to produce comflicts in linux-next (against Linus' tree so far). -- Cheers, Stephen Rothwell