linux-next: manual merge of the pm tree with the s390 tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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))
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/