From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Eric Dumazet <eric.dumazet@gmail.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the suspend tree with the net tree
Date: Fri, 29 Apr 2011 22:36:19 +0200 [thread overview]
Message-ID: <201104292236.19986.rjw@sisk.pl> (raw)
In-Reply-To: <20110429120541.c27998c2.sfr@canb.auug.org.au>
On Friday, April 29, 2011, Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the suspend tree got a conflict in
> arch/x86/Kconfig between commit 0a14842f5a3c ("net: filter: Just In Time
> compiler for x86-64") from the tree and commit d9f1ce017fcf ("PM: Remove
> sysdev suspend, resume and shutdown operations") from the suspend tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Please do, thanks a lot!
Rafael
next prev parent reply other threads:[~2011-04-29 20:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-29 2:05 linux-next: manual merge of the suspend tree with the net tree Stephen Rothwell
2011-04-29 2:05 ` Stephen Rothwell
2011-04-29 20:36 ` Rafael J. Wysocki [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-08-04 3:14 Stephen Rothwell
2010-08-04 3:14 ` Stephen Rothwell
2010-08-04 5:23 ` Florian Mickler
2010-08-04 5:23 ` Florian Mickler
2010-08-04 6:42 ` Stephen Rothwell
2010-08-04 6:42 ` Stephen Rothwell
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=201104292236.19986.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--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.