From: Florian Mickler <florian@mickler.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
James Bottomley <James.Bottomley@suse.de>,
mark gross <markgross@thegnar.org>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the suspend tree with the net tree
Date: Wed, 4 Aug 2010 07:23:02 +0200 [thread overview]
Message-ID: <20100804072302.44b6ec30@schatten.dmk.lab> (raw)
In-Reply-To: <20100804131411.85975b86.sfr@canb.auug.org.au>
Hi,
On Wed, 4 Aug 2010 13:14:11 +1000
Stephen Rothwell <sfr@canb.auug.org.au> 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
WARNING: multiple messages have this Message-ID (diff)
From: Florian Mickler <florian@mickler.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
James Bottomley <James.Bottomley@suse.de>,
mark gross <markgross@thegnar.org>,
David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Subject: Re: linux-next: manual merge of the suspend tree with the net tree
Date: Wed, 4 Aug 2010 07:23:02 +0200 [thread overview]
Message-ID: <20100804072302.44b6ec30@schatten.dmk.lab> (raw)
In-Reply-To: <20100804131411.85975b86.sfr@canb.auug.org.au>
Hi,
On Wed, 4 Aug 2010 13:14:11 +1000
Stephen Rothwell <sfr@canb.auug.org.au> 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
next prev parent reply other threads:[~2010-08-04 5:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-04 3:14 linux-next: manual merge of the suspend tree with the net tree Stephen Rothwell
2010-08-04 3:14 ` Stephen Rothwell
2010-08-04 5:23 ` Florian Mickler [this message]
2010-08-04 5:23 ` Florian Mickler
2010-08-04 6:42 ` Stephen Rothwell
2010-08-04 6:42 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-04-29 2:05 Stephen Rothwell
2011-04-29 2:05 ` Stephen Rothwell
2011-04-29 20:36 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100804072302.44b6ec30@schatten.dmk.lab \
--to=florian@mickler.org \
--cc=James.Bottomley@suse.de \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=markgross@thegnar.org \
--cc=netdev@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.