From: "Rafael J. Wysocki" <rjw@sisk•pl>
To: Martin Schwidefsky <schwidefsky@de•ibm.com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Heiko Carstens <heiko.carstens@de•ibm.com>
Subject: Re: linux-next: manual merge of the pm tree with the s390 tree
Date: Tue, 25 Oct 2011 10:44:40 +0200 [thread overview]
Message-ID: <201110251044.40354.rjw@sisk.pl> (raw)
In-Reply-To: <20111025104005.733cd419@de.ibm.com>
On Tuesday, October 25, 2011, Martin Schwidefsky wrote:
> On Tue, 25 Oct 2011 10:39:46 +0200
> "Rafael J. Wysocki" <rjw@sisk•pl> wrote:
>
> > On Tuesday, October 25, 2011, Stephen Rothwell wrote:
> > > Hi Rafael,
> > >
> > > Today's linux-next merge of the pm tree got a conflict in
> > > arch/s390/kernel/suspend.c between commit 4de2166b1804 ("[S390] sparse:
> > > fix sparse warnings about missing prototypes") from the s390 tree and
> > > commit 85055dd805f0 ("PM / Hibernate: Include storage keys in hibernation
> > > image on s390") from the pm tree.
> > >
> > > I fixed it up (see below) and can carry the fix as necessary.
> >
> > The fix looks correct to me, so please carry it going forward (unless
> > Martin decides to pull it into his tree).
>
> I could add the git commit 85055dd805f0 from the pm tree to git390 and fix
> the merge conflict in the new sparse patch. Dunno if it is worthwhile.
Not really. I think the conflict is easy enough to handle at merge time.
Thanks,
Rafael
next prev parent reply other threads:[~2011-10-25 8:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-25 7:20 linux-next: manual merge of the pm tree with the s390 tree 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 [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-22 2:37 Stephen Rothwell
2011-08-22 6:20 ` 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=201110251044.40354.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 \
/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