From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753762AbbHXBK6 (ORCPT ); Sun, 23 Aug 2015 21:10:58 -0400 Received: from ozlabs.org ([103.22.144.67]:60023 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753614AbbHXBK5 (ORCPT ); Sun, 23 Aug 2015 21:10:57 -0400 Date: Mon, 24 Aug 2015 11:10:54 +1000 From: Stephen Rothwell To: Chris Zankel , Catalin Marinas , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Max Filippov Subject: linux-next: manual merge of the xtensa tree with the arm64 and tip trees Message-ID: <20150824111054.4bad5fba@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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@canb.auug.org.au