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 S1753364Ab3IEQmL (ORCPT <rfc822;w@1wt.eu>);
	Thu, 5 Sep 2013 12:42:11 -0400
Received: from mail-vb0-f48.google.com ([209.85.212.48]:53087 "EHLO
	mail-vb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752124Ab3IEQmJ (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 5 Sep 2013 12:42:09 -0400
MIME-Version: 1.0
In-Reply-To: <20130905103116.6998495cd755f5ae2c3def78@canb.auug.org.au>
References: <1378314218-28021-1-git-send-email-roland@kernel.org>
	<20130905103116.6998495cd755f5ae2c3def78@canb.auug.org.au>
Date: Thu, 5 Sep 2013 09:42:05 -0700
X-Google-Sender-Auth: fy5cYjfboBMmfnRCvNKd_RnJ6c0
Message-ID: <CA+55aFwyJO10zX0DNgfqmsvPCfnaiT-7Fmwz8MVBTq2wtL4L0w@mail.gmail.com>
Subject: Re: [GIT PULL] please pull infiniband.git
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Roland Dreier <roland@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        David Miller <davem@davemloft.net>,
        Network Development <netdev@vger.kernel.org>
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Sep 4, 2013 at 5:31 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I am carrying the following merge fix patch for a semantic conflict
> between this tree and Dave's net-next tree:

Ok. I haven't gotten David's pull request yet, and unless I get it
later today I'll probably forget this.

David, mind reminding me when you do send (or maybe cc'ing Stephen, so
that he will)?

                  Linus