From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753247AbdBTLoE (ORCPT ); Mon, 20 Feb 2017 06:44:04 -0500 Received: from merlin.infradead.org ([205.233.59.134]:39778 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752961AbdBTLoC (ORCPT ); Mon, 20 Feb 2017 06:44:02 -0500 Date: Mon, 20 Feb 2017 12:18:05 +0100 From: Peter Zijlstra To: Stafford Horne Cc: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Frederic Weisbecker , Stefan Kristiansson Subject: Re: linux-next: manual merge of the tip tree with the openrisc tree Message-ID: <20170220111805.GP6500@twins.programming.kicks-ass.net> References: <20170217124321.7b4b394d@canb.auug.org.au> <20170219072654.GB2379@lianli.shorne-pla.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170219072654.GB2379@lianli.shorne-pla.net> User-Agent: Mutt/1.5.23.1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Feb 19, 2017 at 04:26:54PM +0900, Stafford Horne wrote: > On Fri, Feb 17, 2017 at 12:43:21PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the tip tree got a conflict in: > > > > arch/openrisc/include/asm/Kbuild > > > > between commit: > > > > 157e82f58007 ("openrisc: add cmpxchg and xchg implementations") *groan* branch delay slots... It it typically recommended to implement 1 and 2 byte versions as well. If the architecture doesn't support these natively, you can easily implement them with the 4 byte ll/sc and simply retain the other bits.