From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65FD4C433EF for ; Thu, 16 Sep 2021 13:28:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 47A8C6121F for ; Thu, 16 Sep 2021 13:28:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240048AbhIPN3o (ORCPT ); Thu, 16 Sep 2021 09:29:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239964AbhIPN3n (ORCPT ); Thu, 16 Sep 2021 09:29:43 -0400 Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00D20C061574 for ; Thu, 16 Sep 2021 06:28:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=ucgB2Hy9Xb9oPb1gxO7iwQPFqY9KF4YtX7AagAiN27A=; b=gQ93PbpOi4o4sJSoMcD83dOk+q thS39oOFAyTncpoojn3WN+eJ3ZO7xrws5j4XeaIa+jepwKidpJ3/fu9pGVa3oeoukDYFVuMiEKOiJ mmAho9PtRWbbhlwHC40zXObnxN1aTVFITKFm2TUtKgmj85RGe8qIUnoqq+yZfvTAHZQQqEV0n4nyV ohACGJbJrHCtjUesy6hxKg9NNcCrjZsJEsamMphJIYzPYb9FhGkbG4cgCJDXxFutpundsmPKpDQbk ZNqTblF/g9I6YjcjdWUDVb9FmctfA7qNn15RaLlx3aj1jkQ/R7sT6TFAieINXjhiabXq8Pd1joLjl +rX83o0A==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mQrQz-003eye-5N; Thu, 16 Sep 2021 13:28:13 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 68E48300238; Thu, 16 Sep 2021 15:28:11 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id 479A52CE72577; Thu, 16 Sep 2021 15:28:11 +0200 (CEST) Date: Thu, 16 Sep 2021 15:28:11 +0200 From: Peter Zijlstra To: Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ingo Molnar , Will Deacon , Waiman Long , Boqun Feng , Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] kernel/locking: Add context to ww_mutex_trylock. Message-ID: References: <96ab9cf1-250a-8f34-51ec-4a7f66a87b39@linux.intel.com> <205e1591-343b-fb77-cfca-9c16af1484bd@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 16, 2021 at 03:00:39PM +0200, Maarten Lankhorst wrote: > > For merge logistics, can we pls have a stable branch? I expect that the > > i915 patches will be ready for 5.16. > > > > Or send it in for -rc2 so that the interface change doesn't cause needless > > conflicts, whatever you think is best. > Yeah, some central branch drm could pull from, would make upstreaming patches that depends on it easier. :) I think I'll make tip/locking/wwmutex and include that in tip/locking/core, let me have a poke.