Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756612Ab0HDFXV (ORCPT ); Wed, 4 Aug 2010 01:23:21 -0400 Received: from ist.d-labs.de ([213.239.218.44]:58250 "EHLO mx01.d-labs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756227Ab0HDFXU (ORCPT ); Wed, 4 Aug 2010 01:23:20 -0400 Date: Wed, 4 Aug 2010 07:23:02 +0200 From: Florian Mickler To: Stephen Rothwell Cc: "Rafael J. Wysocki" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, James Bottomley , mark gross , David Miller , Subject: Re: linux-next: manual merge of the suspend tree with the net tree Message-ID: <20100804072302.44b6ec30@schatten.dmk.lab> In-Reply-To: <20100804131411.85975b86.sfr@canb.auug.org.au> References: <20100804131411.85975b86.sfr@canb.auug.org.au> X-Mailer: Claws Mail 3.7.5 (GTK+ 2.18.9; x86_64-pc-linux-gnu) 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: 830 Lines: 25 Hi, On Wed, 4 Aug 2010 13:14:11 +1000 Stephen Rothwell wrote: > Hi Rafael, > > Today's linux-next merge of the suspend tree got a conflict in > drivers/net/e1000e/netdev.c between commit > c128ec29208d410568469bd8bb373b4cdc10912a ("e1000e: register pm_qos > request on hardware activation") from the net tree and commit > 82f682514a5df89ffb3890627eebf0897b7a84ec ("pm_qos: Get rid of the > allocation in pm_qos_add_request()") from the suspend tree. > > I fixed it up (see below) and can carry the fix as necessary. This is the right fix. Thx. Cheers, Flo -- 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/