linux-kernel - linux-next: manual merge of the access

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: <20150805144139.575dbda7@canb.auug.org.au>
Date:	Wed, 5 Aug 2015 14:41:39 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Christian Borntraeger <borntraeger@...ibm.com>,
	Catalin Marinas <catalin.marinas@....com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andrey Konovalov <andreyknvl@...gle.com>,
	Ingo Molnar <mingo@...nel.org>,
	"Peter Zijlstra (Intel)" <peterz@...radead.org>,
	Will Deacon <will.deacon@....com>
Subject: linux-next: manual merge of the access_once tree with the arm64
 tree

Hi Christian,

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

  arch/arm64/include/asm/barrier.h

between commit:

  4b3dc9679cf7 ("arm64: force CONFIG_SMP=y and remove redundant #ifdefs")

from the arm64 tree and commit:

  76695af20c01 ("locking, arch: use WRITE_ONCE()/READ_ONCE() in smp_store_release()/smp_load_acquire()")

from the access_once tree.

I fixed it up (the former removed the code modified by the latter, so I
just did that) 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/