Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754223Ab3GJD5R (ORCPT ); Tue, 9 Jul 2013 23:57:17 -0400 Received: from cobra.newdream.net ([66.33.216.30]:52395 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753410Ab3GJD5Q (ORCPT ); Tue, 9 Jul 2013 23:57:16 -0400 Date: Tue, 9 Jul 2013 20:57:15 -0700 (PDT) From: Sage Weil X-X-Sender: sage@cobra.newdream.net To: Stephen Rothwell cc: Sage Weil , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Subject: Re: linux-next: manual merge of the ceph tree with Linus' tree In-Reply-To: <20130710112410.f786035ff9202e773aa052c9@canb.auug.org.au> Message-ID: References: <20130710112410.f786035ff9202e773aa052c9@canb.auug.org.au> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 650 Lines: 19 On Wed, 10 Jul 2013, Stephen Rothwell wrote: > Hi Sage, > > Today's linux-next merge of the ceph tree got conflicts in > drivers/block/rbd.c and net/ceph/osd_client.c because the ceph tree was > rebased before being sent to Linus and it looks like one patch > was dropped and several more added. > > I just used the upstream version of the cpeh tree for today - please > clean up. Fixed, thanks! sage -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/