Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761665AbZCZXCF (ORCPT ); Thu, 26 Mar 2009 19:02:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760278AbZCZXBJ (ORCPT ); Thu, 26 Mar 2009 19:01:09 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:43466 "EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1761554AbZCZXBI (ORCPT ); Thu, 26 Mar 2009 19:01:08 -0400 Date: Thu, 26 Mar 2009 16:00:55 -0700 (PDT) Message-Id: <20090326.160055.187303434.davem@davemloft.net> To: torvalds@linux-foundation.org Cc: rdreier@cisco.com, akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT]: Networking for 2.6.30 From: David Miller In-Reply-To: References: <20090326.020714.36421849.davem@davemloft.net> <20090326.152515.43533230.davem@davemloft.net> X-Mailer: Mew version 6.1 on Emacs 22.1 / Mule 5.0 (SAKAKI) 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 Content-Length: 660 Lines: 17 From: Linus Torvalds Date: Thu, 26 Mar 2009 15:56:24 -0700 (PDT) > On Thu, 26 Mar 2009, David Miller wrote: > > > > Just FYI, I've just pushed a merge of the changes you pulled in today > > in order to resolve the one merge conflict that arose. > > Well, I merged infiniband, and that caused more conflicts. I fixed them > up, but people need to double-check my fixes. Will do. -- 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/