From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751177AbcFRTjd (ORCPT ); Sat, 18 Jun 2016 15:39:33 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:36741 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750899AbcFRTjc (ORCPT ); Sat, 18 Jun 2016 15:39:32 -0400 Subject: Re: linux-next: manual merge of the akpm-current tree with the tip tree To: Stephen Rothwell , Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra References: <20160615152318.164b1ebd@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org From: Manfred Spraul Message-ID: <6107746f-e1b2-7de3-549f-1e422163c345@colorfullife.com> Date: Sat, 18 Jun 2016 21:39:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 In-Reply-To: <20160615152318.164b1ebd@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 06/15/2016 07:23 AM, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > ipc/sem.c > > between commit: > > 33ac279677dc ("locking/barriers: Introduce smp_acquire__after_ctrl_dep()") > > from the tip tree and commit: > > a1c58ea067cb ("ipc/sem.c: Fix complex_count vs. simple op race") > > from the akpm-current tree. Just in case, I have created a rediff of my patch against -tip. And the patch with hysteresis would be ready as well. I will send both patches. More testers would be welcome, I can only test it on my laptop. -- Manfred