From patchwork Thu Jan 5 23:50:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13090716 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 54C87C53210 for ; Thu, 5 Jan 2023 23:50:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 779B510E05B; Thu, 5 Jan 2023 23:50:53 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id F176310E05B; Thu, 5 Jan 2023 23:50:49 +0000 (UTC) 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 4Np3BX0dFyz4xyp; Fri, 6 Jan 2023 10:50:44 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1672962645; bh=gBdBSj5Iy4byy5P3B7qjh7Q4ryrNCeA8npWOwiFvaL0=; h=Date:From:To:Cc:Subject:From; b=MNBjSVtvnV1NkMBbtX5EF1PA0V363PEJGPOXNW+uUM8ciQsZumNnB+iGIjVugpWnV 0WktG4s/WjW85fj8W2QB47l08IWqLNm2ZzVN1CvRZVKMNiK3OorjzPzkx5nYYn+pvG DL3tqC+uuG7TVeDFDnzhN4KDYNExI4u+r+OntTCiqnZp3YiS13raK7Lem+LqLM2mRx LszvPVcE1Oz2f0gcuRMvNeAPz7TbzkdF7owEFVYnnpMHWXzin26Yi8NPgBHBSebqwk AbvrAoz1AsqGi9P7pPlWWAYAoo9WQ2RIHUZ7Gd2Sr/jIwlNYgRN9HXNsst+IF4Mxs2 5aF6tiXT/Mrsw== Date: Fri, 6 Jan 2023 10:50:42 +1100 From: Stephen Rothwell To: Daniel Vetter Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20230106105042.6d7ccb97@canb.auug.org.au> MIME-Version: 1.0 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: Intel Graphics , Linux Kernel Mailing List , DRI , =?utf-8?b?TWHDrXJh?= Canal , Linux Next Mailing List , Thomas Zimmermann , Shuah Khan Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/tests/drm_format_helper_test.c between commit: a52a5451f43b ("kunit: Use KUNIT_EXPECT_MEMEQ macro") from Linus' tree and commits: f21d62c9ce3d ("drm/format-helper: Store RGB565 in little-endian order") 175073d694cd ("drm/format-helper: Add conversion from XRGB8888 to ARGB8888") 56119bfb3914 ("drm/format-helper: Add conversion from XRGB8888 to ARGB2101010") 10cd592e639e ("drm/format-helper: Add conversion from XRGB8888 to 15-bit RGB555 formats") 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 drivers/gpu/drm/tests/drm_format_helper_test.c index 567c71f95edc,f71dc0fe08a1..000000000000 --- a/drivers/gpu/drm/tests/drm_format_helper_test.c