From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754816Ab0EUFqh (ORCPT ); Fri, 21 May 2010 01:46:37 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:37866 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754476Ab0EUFqf (ORCPT ); Fri, 21 May 2010 01:46:35 -0400 Date: Thu, 20 May 2010 22:46:44 -0700 (PDT) Message-Id: <20100520.224644.21290162.davem@davemloft.net> To: sfr@canb.auug.org.au Cc: linville@tuxdriver.com, torvalds@linux-foundation.org, rjw@sisk.pl, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Helmut.Schaa@gmx.de, netdev@vger.kernel.org Subject: Re: linux-next: build failure after merge of the suspend tree From: David Miller In-Reply-To: <20100521102913.ae4e8cd2.sfr@canb.auug.org.au> References: <20100507130821.3fb72c9d.sfr@canb.auug.org.au> <201005080413.24465.rjw@sisk.pl> <20100521102913.ae4e8cd2.sfr@canb.auug.org.au> X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) 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 From: Stephen Rothwell Date: Fri, 21 May 2010 10:29:13 +1000 > On Sat, 8 May 2010 04:13:24 +0200 "Rafael J. Wysocki" wrote: >> >> On Friday 07 May 2010, Stephen Rothwell wrote: >> Both trees are based on Linus' current and I don't see a good way of fixing >> this issue in any of them individually. > > The suspend tree has been merged into Linus' tree, so this patch is > needed in the net tree before it is merged (or as part of the merge). Since the net tree is still on it's way to Linus, we'll just have to wait for him to do that merge. Then we can sort this out. I don't want to touch a tree that is already on it's way. Thanks Stephen.