From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@kernel•org>,
Guenter Roeck <linux@roeck-us•net>
Cc: Hans Verkuil <hverkuil-cisco@xs4all•nl>,
Jonas Malaco <jonas@protocubo•io>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mauro Carvalho Chehab <mchehab+huawei@kernel•org>,
Mirela Rabulea <mirela.rabulea@nxp•com>
Subject: linux-next: manual merge of the v4l-dvb tree with the hwmon-staging tree
Date: Tue, 23 Mar 2021 10:52:51 +1100 [thread overview]
Message-ID: <20210323105251.3532acea@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1537 bytes --]
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.
--
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
+ NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
+ M: Mirela Rabulea <mirela.rabulea@nxp•com>
+ R: NXP Linux Team <linux-imx@nxp•com>
+ L: linux-media@vger•kernel.org
+ S: Maintained
+ F: Documentation/devicetree/bindings/media/imx8-jpeg.yaml
+ F: drivers/media/platform/imx-jpeg
+
+NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
+M: Jonas Malaco <jonas@protocubo•io>
+L: linux-hwmon@vger•kernel.org
+S: Maintained
+F: Documentation/hwmon/nzxt-kraken2.rst
+F: drivers/hwmon/nzxt-kraken2.c
+
OBJAGG
M: Jiri Pirko <jiri@nvidia•com>
L: netdev@vger•kernel.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2021-03-22 23:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210323105251.3532acea@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hverkuil-cisco@xs4all$(echo .)nl \
--cc=jonas@protocubo$(echo .)io \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@roeck-us$(echo .)net \
--cc=mchehab+huawei@kernel$(echo .)org \
--cc=mchehab@kernel$(echo .)org \
--cc=mirela.rabulea@nxp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox