From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752894AbaIVHWf (ORCPT <rfc822;w@1wt.eu>);
	Mon, 22 Sep 2014 03:22:35 -0400
Received: from verein.lst.de ([213.95.11.211]:46766 "EHLO newverein.lst.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751649AbaIVHWd (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 22 Sep 2014 03:22:33 -0400
Date: Mon, 22 Sep 2014 09:22:28 +0200
From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Trond Myklebust <trond.myklebust@fys.uio.no>,
        linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Kirill Tkhai <ktkhai@parallels.com>
Subject: Re: linux-next: manual merge of the tip tree with the nfs tree
Message-ID: <20140922072228.GA4417@lst.de>
References: <20140922133156.454481f9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20140922133156.454481f9@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Thanks Stephen,

the fixup looks obviously correct to me.