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,
Tejun Heo <tj@kernel•org>,
Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Subject: Re: linux-next: manual merge of the pm tree with the s390 tree
Date: Mon, 22 Aug 2011 08:20:29 +0200 [thread overview]
Message-ID: <201108220820.29739.rjw@sisk.pl> (raw)
In-Reply-To: <20110822123705.d947c6a2548082168df9c86a@canb.auug.org.au>
On Monday, August 22, 2011, Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> arch/s390/include/asm/thread_info.h between commit 5f67c275efe7 ("[S390]
> fix _TIF_SINGLE_STEP definition") from the s390 tree and commit
> c9ff4d7b50c4 ("freezer: remove now unused TIF_FREEZE") from the pm tree.
>
> I fixed it up (see below)
Thanks!
> and can carry the fix as necessary.
Please do that.
Rafael
next prev parent reply other threads:[~2011-08-22 6:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-22 2:37 linux-next: manual merge of the pm tree with the s390 tree Stephen Rothwell
2011-08-22 6:20 ` Rafael J. Wysocki [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-10-25 7:20 Stephen Rothwell
2011-10-25 8:39 ` Rafael J. Wysocki
2011-10-25 8:40 ` Martin Schwidefsky
2011-10-25 8:44 ` 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=201108220820.29739.rjw@sisk.pl \
--to=rjw@sisk$(echo .)pl \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox