From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Hans Verkuil <hverkuil-cisco@xs4all•nl>
Subject: linux-next: manual merge of the v4l-dvb tree with the v4l-dvb-fixes tree
Date: Thu, 9 Jan 2020 11:10:50 +1100 [thread overview]
Message-ID: <20200109111050.3a547549@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1020 bytes --]
Hi all,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
drivers/media/usb/pulse8-cec/pulse8-cec.c
between commit:
21d116949e95 ("Revert "media: pulse8-cec: fix lost cec_transmit_attempt_done() call"")
from the v4l-dvb-fixes tree and commit:
c4e8f760581b ("media: pulse8-cec: fix lost cec_transmit_attempt_done() call")
and some other commits from the v4l-dvb tree. The conflicts arise
mostly because the above commit was cherry-picked into Linus' tree
(before being reverted above).
I fixed it up (I just used the vl4-dvb tree version on the assumption that
you will fix it up properly) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-01-09 0:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-09 0:10 Stephen Rothwell [this message]
2020-01-09 7:05 ` linux-next: manual merge of the v4l-dvb tree with the v4l-dvb-fixes tree Mauro Carvalho Chehab
-- strict thread matches above, loose matches on Subject: below --
2022-09-27 12:34 broonie
2020-11-06 0:19 Stephen Rothwell
2017-06-05 2:03 Stephen Rothwell
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=20200109111050.3a547549@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hverkuil-cisco@xs4all$(echo .)nl \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@kernel$(echo .)org \
/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