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=-10.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 615E3C433E0 for ; Thu, 28 May 2020 06:01:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 25B582071A for ; Thu, 28 May 2020 06:01:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AqgX9832" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 25B582071A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F1566E348; Thu, 28 May 2020 06:01:50 +0000 (UTC) Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6B7F36E348 for ; Thu, 28 May 2020 06:01:48 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id k19so22191480edv.9 for ; Wed, 27 May 2020 23:01:48 -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 :cc; bh=+4G7LztfhKefqislvGUwGcaLm9pBFDOhcjn0F/Q53GA=; b=AqgX98324qc7v88oMBNXmxv6ZIWYQ8Q91wG8IRXL86xb3RDlvEjUyyUIfkNMbTZa87 3aLiJZWfASX81Lh6axF218c69z186jXm1r3nX+w0XFcXm//gwlBuiBQprYUpGvNwtQF1 7v9qN9dRsqT3mC4foN6sj/rLbegA1ZZgbhTAtoCG1a4xApPa1Fm+ADtgnNcVlQQWOGuD EwCNWZtHmuDFiT1pyLNb7gj3n8sCyqCMA/+piGrolDYHymQq+rH0XifEvcbGcFP1JMN3 p3BRLpG9QtrJEBDe2RNTA/efIUT69m16YzqQ4tskKpTEKsB8+wCmAD7hL9rdutuYxP8t GTzA== 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:cc; bh=+4G7LztfhKefqislvGUwGcaLm9pBFDOhcjn0F/Q53GA=; b=Ps6CLKHNGdMGr9qkHnLQjr7UywxPwDWW2VegbqGLkgWdt9dyMOucNgyykXAXfswWIe gwbTUTK7fqqUZEb0soJQLewmwdFa3hQLHIMHpCg+43alqW4aX4L30eDcphWAUs4k8P5B r/IdKDYX5iUXwKymun7hRMRzYgtJj7XiJzAEAnY9+4q5mmeF3Kh0FWJYkMvd2vngnHsJ muPtRV1WtJfURVodeJfO4du8ePs4BlgNybNlKO6x6gtAev/k3zWol2SblOLHwGofxPEa uIHWPqGhAW2xZvr9dQFjhLUEM9hSQt0D4nDDmuPQlJM4V/7uyUxF+6OFiE+KhxvSL5Ca 2VXg== X-Gm-Message-State: AOAM533n8GiTYsNWjedVvRchpOZZg25dlpzDH+JTtoaGvU9vqh9SLcqp JEIm77AVBy3yTyOY7xFflnSfmjcZfYTCOvvPPcA= X-Google-Smtp-Source: ABdhPJwIk1Z2LwvbqGSnf8PWVoUKndg0g1dzxhJ5rxuKA894xH0b5zaDXP/mOvPqmIXLsQ2D8KrHPxM8vVGTDq9e1aA= X-Received: by 2002:a50:9547:: with SMTP id v7mr1564141eda.78.1590645706837; Wed, 27 May 2020 23:01:46 -0700 (PDT) MIME-Version: 1.0 References: <9870ea53-cdd9-e34c-dcbd-f087f5abf619@gmail.com> In-Reply-To: <9870ea53-cdd9-e34c-dcbd-f087f5abf619@gmail.com> From: Dave Airlie Date: Thu, 28 May 2020 16:01:34 +1000 Message-ID: Subject: Re: [GIT PULL v2] mediatek drm next for 5.8 To: Matthias Brugger X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chun-Kuang Hu , Jitao Shi , David Airlie , Bernard Zhao , YueHaibing , DRI Development , "moderated list:ARM/Mediatek SoC support" , Hsin-Yi Wang , Enric Balletbo i Serra , Anand K Mistry Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Sat, 23 May 2020 at 01:58, Matthias Brugger wrote: > > > > On 20/05/2020 07:46, Dave Airlie wrote: > > On Wed, 20 May 2020 at 15:44, Dave Airlie wrote: > >> > >> On Mon, 18 May 2020 at 10:06, Chun-Kuang Hu wrote: > >>> > >>> Hi, Dave & Daniel: > >>> > >>> This include dpi pin mode swap, config mipi_tx current and impedance, > >>> and some fixup. I drop drm_bridge patches in this version. > >>> > >>> The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136: > >>> Linux 5.7-rc1 (2020-04-12 12:35:55 -0700) > >>> are available in the Git repository at: > >>> https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git > >>> tags/mediatek-drm-next-5.8 > >>> for you to fetch changes up to 007d274a017bb4e2ef7b922c2f54f40cf2073664: > >> > >> Did you edit this by hand or pass it through some mailserver that > >> chewed it up, I had to reconstruct this pull from the above bits, I've > >> no idea why it's so messed up in the first place. > > > > and why does it contain an unexplained backmerge? > > > > Merge tag 'v5.7-next-drm-stable' of > > ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux > > into mediatek-drm-next > > > > Please don't ever backmerge fixes into next pull, without a long > > explaination or if you really need it ask us first, > > It's not fixes. I suppose my tagging strategy helps to create confusion. The tag > is v5.7-*next*, which relates to v5.8 (next version after v5.7). Maybe not the > best way to do it. > > We had to merge a series that changed the drivers/gpu/drm, drivers/soc and > drivers/clk. > So I took the series through my branch and Chun-Kuang merged a stable tag in his > branch so that he can take commits on top of this changes. > > Maybe the explanation comes too late, but I just wanted to clarify. Okay so whenever a submaintainer tree has a merge in it, two things need to happen. a) the merge needs a commit msg explaining what it is, why it's there. b) the subsequent pull request should mention it's existence. I'm not used to pulling trees from submaintainers with merges in them and usually it's a red flag that they've backmerged something they shouldn't have. Dave. _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel