Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751788AbbFYXsJ (ORCPT ); Thu, 25 Jun 2015 19:48:09 -0400 Received: from ozlabs.org ([103.22.144.67]:49920 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751426AbbFYXr7 (ORCPT ); Thu, 25 Jun 2015 19:47:59 -0400 Date: Fri, 26 Jun 2015 09:47:51 +1000 From: Stephen Rothwell To: Vineet Gupta Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Zijlstra , Ingo Molnar Subject: linux-next: manual merge of the arc tree with Linus' tree Message-ID: <20150626094751.3c5a6490@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/9Te+I8HsUHBpZRNcrXJM/+k"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2376 Lines: 76 --Sig_/9Te+I8HsUHBpZRNcrXJM/+k Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Vineet, Today's linux-next merge of the arc tree got a conflict in: include/asm-generic/barrier.h between commits: ab3f02fc2372 ("locking/arch: Add WRITE_ONCE() to set_mb()") b92b8b35a2e3 ("locking/arch: Rename set_mb() to smp_store_mb()") from Linus' tree and commit: 470c27e4695a ("arch: conditionally define smp_{mb,rmb,wmb}") from the arc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc include/asm-generic/barrier.h index e6a83d712ef6,270b7c989ea1..000000000000 --- a/include/asm-generic/barrier.h +++ b/include/asm-generic/barrier.h @@@ -66,8 -89,10 +89,10 @@@ #define smp_read_barrier_depends() do { } while (0) #endif =20 + #endif +=20 -#ifndef set_mb -#define set_mb(var, value) do { (var) =3D (value); mb(); } while (0) +#ifndef smp_store_mb +#define smp_store_mb(var, value) do { WRITE_ONCE(var, value); mb(); } wh= ile (0) #endif =20 #ifndef smp_mb__before_atomic --Sig_/9Te+I8HsUHBpZRNcrXJM/+k Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVjJMtAAoJEMDTa8Ir7ZwVZp4QAJQBsamoh6/oVCKnPdcLhSpy OShMbRc0w96gfUyeajjXqETQaRP2+uYnzBS2Fha2Q1b7ObfvEqM0VkJqQQC2jk3d pHfPL02dN8dz2qFfzaCPf2/lgUCa0xtbOu+Py1NL6bmVXY3XZGvUPzTOWrQdXEEG /hUYF7Somq3UEEyJeH6r1XBEGmhv0FQ7XZMpE1yaWFrnJEy5rMTVlQn/nzzubPo3 n9jQcTm8gnZdbuGcJ1nOsHrBdcA2r+1YRmpdIk0/O4o9PNoa/K7UtHQhePzlqxyq ABYzbGVLrDYrgP4ymfRufMkXhIUH3zCj534hr7ZEf24v50jKYVNKTEIHhkIA6rdO 0PNX9h1WAGrnwzoQ50iCvL7cnTptzEdOfhHyKgE8f2kVYrNyBX53Uu8FIrt8GlIM TKvJGZTIVEZBMiDyzuGQQd6e6fLNlr6ikiF/2RFM704UWeXwxznF98ajfvPnqOs2 bgz3u6jXolXWkL1w1h0KA2vlN+2b75vwpAICq5FsMLVV2ADVs2y+E5Oyohhh8/OF WVScszNSJTRY1OsF23csIZMlbkArAa2Vb6OKe1gWzyvsZCAeEnsJYBvkMlE63VVx A3K9tRIbsNNfa6k4TSJDb2/zWh8Ct6b042Ay2N51dv9d8AboMVLOaGFLVA4LJPe9 0he9LpzsO7UOqbpWTiKN =O4AK -----END PGP SIGNATURE----- --Sig_/9Te+I8HsUHBpZRNcrXJM/+k-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/