From patchwork Tue May 23 00:43:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 97681 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1831234vqo; Mon, 22 May 2023 18:43:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4sZCGXb5rWcb9Um7tgauPHjATB+FZ0i4eooEUIhRUluAMfo5xp0XISYRP4D5XL8k/0+3vL X-Received: by 2002:a05:6a21:7899:b0:10b:cc13:5ac8 with SMTP id bf25-20020a056a21789900b0010bcc135ac8mr4403941pzc.27.1684806195468; Mon, 22 May 2023 18:43:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684806195; cv=none; d=google.com; s=arc-20160816; b=NUiirBo5cYorHkM/iYxHrMWWcBZPxjiI9uKUUsXXo9/8iauWmZOSkPyFh2kCcO5kfm bHdlJ/TcfE0HYiqQbJICc4Z57qJLAn7IJbdRpd96/tVGRI1yFcC2sD2EN0WA4qxMVXGT teWru9c9uG0/B1yts957Vdp5SuZm/r0BNsoe+JU+AcJtVN4oECD1H6sHbkkfVl1eZ+WM SHYBFbNBaKuiqzXkz5sqq0+UWZIoqRV8UGloqLk2imSGWZ4Xt0uEGRFHeCzSascJil/o 4At7dhOIhRBSRkDPqW4E17N+nk3mh90cBdHPZvMFSJDBjGSdYldYT4oIuf0ObGSE5k4s PjHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=wR7JFpABtkHvbbbYe13yOqB8fGX0TUQ0Yg/dvCpATgQ=; b=CwG+oueVDzFZMiVq3oDEscqpIJsOiFc/Dx6XzY8rOFPiUgqRnM4IQCudcHUFRZnDMD lrFRnq/EyT9sCXRx9+AiFyTvVEJuZzYA9NsfoyyZ1Ipy+JWT9eoQoV1c4XFJbHzXBoh3 xmBxixbcH1F3depHoOiRcpE2LluFEwA6QPUf93rnJd3c557JmeYywPIgDVvqMrx/Xjja UBEGILIu5p/aa4GGNL6ydCvsFUgqV3dT7wWKhkt4jYaH+jJM0Xo+mCNXznyC/+ssqHMo yrkmJ4qY3yfAmrWJmPM3WwfL+dU7uOMy7fb15NA6vWn+lzciKH2e9Y8rLJNi2D3XBW5J Trxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=aiVkLfrq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 24-20020a631258000000b0051b5c9dd1ffsi5608279pgs.66.2023.05.22.18.43.03; Mon, 22 May 2023 18:43:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=aiVkLfrq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234005AbjEWAwY (ORCPT + 99 others); Mon, 22 May 2023 20:52:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235208AbjEWAv5 (ORCPT ); Mon, 22 May 2023 20:51:57 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B1071702; Mon, 22 May 2023 17:45:20 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QQFt63zXKz4x48; Tue, 23 May 2023 10:43:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1684802607; bh=wR7JFpABtkHvbbbYe13yOqB8fGX0TUQ0Yg/dvCpATgQ=; h=Date:From:To:Cc:Subject:From; b=aiVkLfrqtzR/YRF1FRXNPa5R0Wo+GriJRGMXbmjmcDt4w8A8idVfKqd2K2hL4Ufn0 GtazcmuCp0h5Kq12941imoEtNR2zvBO7VE0xuOxUfI+6KJhcJueSWCCcC/zMk4sd5V fcJy5xl/IIMLeEE1uKUxz5v7Sxnl0gpipGAIYznJsuvNaQfbsDX7HuUeNWJIIIkq0m ify3NYx7rOR1wzdIR7UeCoEbdj00ebmPaJsMWaR/yw6BogXIAOvVU7ZKJCRki7fakb w22uOVC8LM+Nm236sidFl7vfUCcNITaCvNaCAiYmQqnUFUhMKSWRLuHkq7exBHesF8 Eo/f67ksSTPjA== Date: Tue, 23 May 2023 10:43:24 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: Artur Weber , Linus Torvalds , Linux Kernel Mailing List , Linux Next Mailing List , Neil Armstrong Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20230523104324.602c426a@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766647341244791049?= X-GMAIL-MSGID: =?utf-8?q?1766647341244791049?= Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: MAINTAINERS between commit: 80e62bc8487b ("MAINTAINERS: re-sort all entries and fields") from Linus' tree and commit: 0dd53308f74f ("MAINTAINERS: Add entry for Samsung S6D7AA0 LCD panel controller driver") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc MAINTAINERS index 8e18bbafa740,7cc2bfa4af6f..000000000000 --- a/MAINTAINERS