Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751941AbaLRCy5 (ORCPT ); Wed, 17 Dec 2014 21:54:57 -0500 Received: from mail-qg0-f54.google.com ([209.85.192.54]:65080 "EHLO mail-qg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751850AbaLRCy4 (ORCPT ); Wed, 17 Dec 2014 21:54:56 -0500 MIME-Version: 1.0 In-Reply-To: References: Date: Wed, 17 Dec 2014 18:54:55 -0800 X-Google-Sender-Auth: YBJcNzkNp2JLY04jyBhSosN4j8w Message-ID: Subject: Re: [GIT PULL] Ceph updates for 3.19-rc1 From: Linus Torvalds To: "Yan, Zheng" Cc: Sage Weil , ceph-devel , Linux Kernel Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 17, 2014 at 6:25 PM, Yan, Zheng wrote: > my commit "ceph: add inline data to pagecache" incidentally adds > fs/ceph/super.j.rej. please remove it from your branch. sorry for > the inconvenience I wish I hadn't pulled it so quickly, and could have fixed it up as part of the merge commit, but I pushed a separate commit to remove it. Linus -- 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/