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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 D4673C433DB for ; Mon, 22 Mar 2021 23:53:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB596619A5 for ; Mon, 22 Mar 2021 23:53:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231349AbhCVXxZ (ORCPT ); Mon, 22 Mar 2021 19:53:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231375AbhCVXw7 (ORCPT ); Mon, 22 Mar 2021 19:52:59 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25F39C061574; Mon, 22 Mar 2021 16:52:58 -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 4F4BBr4sYlz9sW1; Tue, 23 Mar 2021 10:52:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1616457173; bh=MJi017oQotYoOildABLQeMibodaWQ4ZO3V5ZD6wZvrA=; h=Date:From:To:Cc:Subject:From; b=jC4hbi9EMy1UH1hRO7SyE4CZTq5A/KA7y+Tes6VSkuBH53ZoZZhlYsxj6rNwwg3AE VI9O5Vg2OReyyHFIQf/3HUlH45u2Qbz2/WdreNMBWAPUr7+aZZGOGLpEiwkCgIvjVB WL+YhuRMIfmfKcE0kqjyc8mgbzuFYfRnrN96l9zZYLjSsAySB642m4tyzXBOuIX6Bo 6TIOL8GPO9BM4EFvziNeqPrDpPdIXCqBUIWAokQvh2RHZx47y2XaJmnGBXbG/3VL2M ntZahBAWhM3xFl83TQLx4aeh/dGf0w5r0pChpg36vKkC7Fc5Tetqc0U1HJQJ9YsFpv BxA6MmYbZkuiw== Date: Tue, 23 Mar 2021 10:52:51 +1100 From: Stephen Rothwell To: Mauro Carvalho Chehab , Guenter Roeck Cc: Hans Verkuil , Jonas Malaco , Linux Kernel Mailing List , Linux Next Mailing List , Mauro Carvalho Chehab , Mirela Rabulea Subject: linux-next: manual merge of the v4l-dvb tree with the hwmon-staging tree Message-ID: <20210323105251.3532acea@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/P15woK9_pXrb171nAFb+RFk"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/P15woK9_pXrb171nAFb+RFk Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the v4l-dvb tree got a conflict in: MAINTAINERS between commit: 38f15506d965 ("hwmon: add driver for NZXT Kraken X42/X52/X62/X72") from the hwmon-staging tree and commit: be157db0a3d8 ("media: Add maintainer for IMX jpeg v4l2 driver") from the v4l-dvb 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. --=20 Cheers, Stephen Rothwell diff --cc MAINTAINERS index dda782e9e578,04e6df934eb0..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -12941,13 -12910,14 +12941,21 @@@ L: linux-nfc@lists.01.org (moderated = fo S: Supported F: drivers/nfc/nxp-nci =20 + NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER + M: Mirela Rabulea + R: NXP Linux Team + L: linux-media@vger.kernel.org + S: Maintained + F: Documentation/devicetree/bindings/media/imx8-jpeg.yaml + F: drivers/media/platform/imx-jpeg +=20 +NZXT-KRAKEN2 HARDWARE MONITORING DRIVER +M: Jonas Malaco +L: linux-hwmon@vger.kernel.org +S: Maintained +F: Documentation/hwmon/nzxt-kraken2.rst +F: drivers/hwmon/nzxt-kraken2.c + OBJAGG M: Jiri Pirko L: netdev@vger.kernel.org --Sig_/P15woK9_pXrb171nAFb+RFk Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmBZLdMACgkQAVBC80lX 0GyYQAf/RygOCF8VnQJtn7NxjWMGYO14vMKBJW7MAYQ4jNC6wb827QqVSHTiXdmL UBqHn2N0bAPHtIZ/8VXVqs5DKokwQ+ou7dFXEKzTEhDBuTc2rB0eA0o2J5uwR7I9 LhlBUJqGaI5zziOu6xuIM4hy5iPcEvxkwaWdkhFnq7M6S0+6+twwzV5hTjzJB4s/ f2veS+oMy2aKHG/YTpOBUCiVWzG9NUckW19ZVKEJkHlj7Cs319q5rfKAbhE7aWqI weXLD7ZBSm+PTqqs2tSshKc4wBbGXl1dWTBByKOKOuwG+ffeZb+D17W5+IIPukVB pH7lJEnwukzssWt6bc52sKrxErZkgg== =XYet -----END PGP SIGNATURE----- --Sig_/P15woK9_pXrb171nAFb+RFk--