* linux-next: manual merge of the pm tree with the s390 tree
@ 2011-10-25 7:20 Stephen Rothwell
2011-10-25 8:39 ` Rafael J. Wysocki
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-10-25 7:20 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-next, linux-kernel, Martin Schwidefsky, Heiko Carstens
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/s390/kernel/suspend.c
index 4f0fd55,b6f9afe..0000000
--- a/arch/s390/kernel/suspend.c
+++ b/arch/s390/kernel/suspend.c
@@@ -7,7 -7,7 +7,8 @@@
*/
#include <linux/pfn.h>
+#include <linux/suspend.h>
+ #include <linux/mm.h>
#include <asm/system.h>
/*
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pm tree with the s390 tree
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
0 siblings, 1 reply; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-10-25 8:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Martin Schwidefsky, Heiko Carstens
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).
Thanks,
Rafael
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pm tree with the s390 tree
2011-10-25 8:39 ` Rafael J. Wysocki
@ 2011-10-25 8:40 ` Martin Schwidefsky
2011-10-25 8:44 ` Rafael J. Wysocki
0 siblings, 1 reply; 6+ messages in thread
From: Martin Schwidefsky @ 2011-10-25 8:40 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Stephen Rothwell, linux-next, linux-kernel, Heiko Carstens
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.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pm tree with the s390 tree
2011-10-25 8:40 ` Martin Schwidefsky
@ 2011-10-25 8:44 ` Rafael J. Wysocki
0 siblings, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-10-25 8:44 UTC (permalink / raw)
To: Martin Schwidefsky
Cc: Stephen Rothwell, linux-next, linux-kernel, Heiko Carstens
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the pm tree with the s390 tree
@ 2011-08-22 2:37 Stephen Rothwell
2011-08-22 6:20 ` Rafael J. Wysocki
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-08-22 2:37 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-next, linux-kernel, Tejun Heo, Martin Schwidefsky,
Heiko Carstens
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) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/s390/include/asm/thread_info.h
index f9a9a10,589708a..0000000
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@@ -117,8 -116,7 +116,7 @@@ static inline struct thread_info *curre
#define _TIF_SIE (1<<TIF_SIE)
#define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
#define _TIF_31BIT (1<<TIF_31BIT)
-#define _TIF_SINGLE_STEP (1<<TIF_FREEZE)
+#define _TIF_SINGLE_STEP (1<<TIF_SINGLE_STEP)
- #define _TIF_FREEZE (1<<TIF_FREEZE)
#ifdef CONFIG_64BIT
#define is_32bit_task() (test_thread_flag(TIF_31BIT))
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pm tree with the s390 tree
2011-08-22 2:37 Stephen Rothwell
@ 2011-08-22 6:20 ` Rafael J. Wysocki
0 siblings, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-08-22 6:20 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Tejun Heo, Martin Schwidefsky,
Heiko Carstens
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-10-25 8:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
-- strict thread matches above, loose matches on Subject: below --
2011-08-22 2:37 Stephen Rothwell
2011-08-22 6:20 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox