linux-kernel - linux-next: manual merge of the xtensa tree with the arm64 and tip trees

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>] [day] [month] [year] [list]

Message-ID: <20150824111054.4bad5fba@canb.auug.org.au>
Date:	Mon, 24 Aug 2015 11:10:54 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Chris Zankel <chris@...kel.net>,
	Catalin Marinas <catalin.marinas@....com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Max Filippov <jcmvbkbc@...il.com>
Subject: linux-next: manual merge of the xtensa tree with the arm64 and tip
 trees

Hi Chris,

Today's linux-next merge of the xtensa tree got a conflict in:

  arch/xtensa/include/asm/atomic.h

between commit:

  2a3ed90f428c ("xtensa: Provide atomic_{or,xor,and}")

from the arm64 and tip trees and commit:

  38fef73c21d1 ("xtensa: implement fake NMI")

from the xtensa tree.

I fixed it up (I dropped the latter's definitions of
atomic_{set,clear}_mask) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
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/