Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752217AbbERRKx (ORCPT ); Mon, 18 May 2015 13:10:53 -0400 Received: from mail-ie0-f172.google.com ([209.85.223.172]:33536 "EHLO mail-ie0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751288AbbERRKu (ORCPT ); Mon, 18 May 2015 13:10:50 -0400 MIME-Version: 1.0 In-Reply-To: <20150518093150.GC21418@twins.programming.kicks-ass.net> References: <20150517185041.GA5897@dhcp22.suse.cz> <20150518073046.GO17717@twins.programming.kicks-ass.net> <20150518090336.GA6393@dhcp22.suse.cz> <20150518093150.GC21418@twins.programming.kicks-ass.net> Date: Mon, 18 May 2015 10:10:50 -0700 X-Google-Sender-Auth: xU6wld1WXURWuyhp1VrJVTUsWVo Message-ID: Subject: Re: suspend regression in 4.1-rc1 From: Linus Torvalds To: Peter Zijlstra Cc: Michal Hocko , Stephane Eranian , Ulrich Obergfell , Don Zickus , Ingo Molnar , Andrew Morton , "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson , "linux-pm@vger.kernel.org" , LKML Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 846 Lines: 18 On Mon, May 18, 2015 at 2:31 AM, Peter Zijlstra wrote: > Subject: watchdog: Fix merge 'conflict' > > Two watchdog changes that came through different trees had a non > conflicting conflict, that is, one changed the semantics of a variable > but no actual code conflict happened. So the merge appeared fine, but > the resulting code did not behave as expected. Ok, I see that people are still discussing this, but I'll apply it as-is since I want to get rc4 out the door, and I guess people can tweak this if there's anything else we want to do longer-term. Linus -- 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/