Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1474427yba; Wed, 24 Apr 2019 23:50:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqxMrZMeIFXuIorAIJvuJ/y1IeriF/2sN7BHlZEc7P8djJijQECjxdX8+cH6C1ypnnoPV3wx X-Received: by 2002:a17:902:2927:: with SMTP id g36mr35632482plb.6.1556175048128; Wed, 24 Apr 2019 23:50:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556175048; cv=none; d=google.com; s=arc-20160816; b=wzOanOKaIqBghz+/wo8tezoBl5/OCQoOYFmOfIT2JVVA+VilkCddgI6o8g98xsh7MU W40dAub0nt71AfPWOGYKJJCQziXQeGOs+a2yZeEE+VSVCN5ww/dARlLR/GIgRm4xCePc 6KBil+XwnnBNUKw+Tjk+kLvyDphJvgwnWSGyXRY8wsvwv7Gkdzom7dGWGRkaWz7so+kE dflHQDkA1EezzjbMPAlMJHvzTGZWZvv522TJ/kF+p0hsiCJfRxolZskvTzLdzzVsjkcU U1qfYDa/s48j1ocGObhzKP6ta+NVj1EFD8s6+HrwwH91nQ7SPExwrl024TLNXdI5IbyK xl2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=oW3C4eILX/D7yCsVDIg4l1MywdHMYp40Vcl2f9Ap1v4=; b=QgxlqEwY2zTs9kEM6h23JjwBJ/tskDDnNHrct9M2DopZlx5UBTFjcFm1//OFQO4Pb7 J/lvpSYC5MRGZTFSfUhphCg+2qMJya/4JH9n0/XkU1RtTAwTyoSTcPylKwGTYhPpnSMQ xc6R482RjzueL4je8JtAYUSjQTOcB/amoLmRVmzcKzIbYktFi95CNNh8EoMzId9ARL85 Ot4xwdeTwJxq6E11mMzhpi//1qV3WPCQ9W1CBeS9KHYrjvpHyX1PnXYojVEIOkvd+mCG i0p0YPJYfyIeu3ajqygSMTZldoCM9FPiC2/QRfDtQq6tLtM703ZeUgnSfUlHUoIEeb3q oGVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=KDGA4m+u; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e36si5027679pgb.286.2019.04.24.23.50.33; Wed, 24 Apr 2019 23:50:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=KDGA4m+u; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728437AbfDXURF (ORCPT + 99 others); Wed, 24 Apr 2019 16:17:05 -0400 Received: from mail-qt1-f196.google.com ([209.85.160.196]:44829 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725937AbfDXURE (ORCPT ); Wed, 24 Apr 2019 16:17:04 -0400 Received: by mail-qt1-f196.google.com with SMTP id s10so11074339qtc.11 for ; Wed, 24 Apr 2019 13:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=oW3C4eILX/D7yCsVDIg4l1MywdHMYp40Vcl2f9Ap1v4=; b=KDGA4m+uPoZjhiLYsUmBc2H8uOgr2APJ1aGl4CtY+vUrv2OKfsBSjQzTqr7+nDuKuv pVdmQQ2a+TFndViqYMHzFbHhv5iw1mcthHxomTxOUeFjrhEKBAEh2F/tRUY/CzfRI44W 0XpJEowIGuWyjddXT/UWaU1EkdD+U/rU8+BY3wwuOs1anrtZWqvk6VyunhAXfhk6MO6x LUdPvoF73lslB7FzLN9cwKnFIhtgj/fovMcMvqraRoDHGjxi52xUYj7k0L726PihwoAi 1w4wdZ4uRdCDVxrpYDw7C1FJ8isr6+8eArVluvLQ+26ZI0S85s7Qm7T12BUOCWR+uxBW Qr5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=oW3C4eILX/D7yCsVDIg4l1MywdHMYp40Vcl2f9Ap1v4=; b=Fkd1oolAb9tltcxL6FAdUDwOloSpTg8BrCMfG2HgGWxyoT6J1LyZoPD6uC22c5AGyM iYRqdFF+JeuLGvoEgRdDP45zH1w8ffHFv3srUqLQfTFwCK2xJRwCymICLnoho7Q4hwg4 fYKJ+22M67/qbxuEG/iJ3L4bfXYBCRgbx8sbCeRw5rWcnIqlwc3UZZWgMYETWL+9snVv QEK4Eom32Na+7nVotFBcbkL04cvy7pB8Uf5+EgXNFnr42bMYGja40UZWS7g4/d29cE3k CzbaftdDL2oSQpS7e/Aj4FGgx1F6aM043tWPbEHkalbWhIJgCRLOeoBCzFJL8k9HUvrV VN6g== X-Gm-Message-State: APjAAAUIqpQ+cbjQ4mO2gald/Q7VOXv1q69bJN/cqbMmOKJ6qA5mkUkX XKK0iTox0y8Ga4tbWRmGms47YQ0Pox4MFTl11Z0= X-Received: by 2002:ac8:2728:: with SMTP id g37mr3573549qtg.264.1556137023524; Wed, 24 Apr 2019 13:17:03 -0700 (PDT) MIME-Version: 1.0 References: <20190424185617.16865-1-eric@anholt.net> <20190424193548.GT9857@phenom.ffwll.local> In-Reply-To: <20190424193548.GT9857@phenom.ffwll.local> From: Dave Airlie Date: Thu, 25 Apr 2019 06:16:50 +1000 Message-ID: Subject: Re: [PATCH 1/2] drm/doc: Allow new UAPI to be used once it's in the driver's -next. To: Eric Anholt , dri-devel , Dave Airlie , LKML Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 25 Apr 2019 at 05:35, Daniel Vetter wrote: > > On Wed, Apr 24, 2019 at 11:56:16AM -0700, Eric Anholt wrote: > > I was trying to figure out if it was permissible to merge the Mesa > > side of V3D's CSD support yet while it's in drm-misc-next but not > > drm-next, and developers on #dri-devel IRC had differing opinions of > > what the requirement was. Propose a clarification here to see if Dave > > Airlie agrees. > > > > Signed-off-by: Eric Anholt > > --- > > > > Personally, I thought the rule was "has to be in drm-next", but > > assuming our review processes aren't totally broken, this should be > > enough. > > Yeah if you end up with a revert on your hands the process failed much > harder and you get to keep the pieces no matter what. Not sure we should > clarify whether you need a stable sha1 or not (helps with cross > referencing uapi header updates), but imo good as is. And matches what > I've been doing/recommending past few years. > > Reviewed-by: Daniel Vetter > > > > > Documentation/gpu/drm-uapi.rst | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/Documentation/gpu/drm-uapi.rst b/Documentation/gpu/drm-uapi.rst > > index c9fd23efd957..8e5545dfbf82 100644 > > --- a/Documentation/gpu/drm-uapi.rst > > +++ b/Documentation/gpu/drm-uapi.rst > > @@ -92,8 +92,9 @@ leads to a few additional requirements: > > requirements by doing a quick fork. > > > > - The kernel patch can only be merged after all the above requirements are met, > > - but it **must** be merged **before** the userspace patches land. uAPI always flows > > - from the kernel, doing things the other way round risks divergence of the uAPI > > + but it **must** be merged to the driver's -next tree (as documented in > > + MAINTAINERS) **before** the userspace patches land. uAPI always flows from > > + the kernel, doing things the other way round risks divergence of the uAPI > > definitions and header files. I'd rather restrict this to drm-next and drm-misc-next, I frankly don't trust driver trees here to have the review practices in place. I trust drm-misc-next to have at least had someone unrelated look over the new api. Dave.