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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110822123705.d947c6a2548082168df9c86a@canb.auug.org.au>
Date:	Mon, 22 Aug 2011 12:37:05 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Rafael J. Wysocki" <rjw@...k.pl>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tejun Heo <tj@...nel.org>,
	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>
Subject: linux-next: manual merge of the pm tree with the s390 tree

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