From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung•com>,
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@xs4all•nl>,
Daniel Vetter <daniel.vetter@ffwll•ch>
Subject: linux-next: manual merge of the fbdev tree with the v4l-dvb tree
Date: Tue, 25 Jun 2019 12:28:17 +1000 [thread overview]
Message-ID: <20190625122817.1f6657c7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1745 bytes --]
Hi all,
Today's linux-next merge of the fbdev tree got a conflict in:
drivers/media/pci/ivtv/ivtvfb.c
between commit:
2161536516ed ("media: media/pci: set device_caps in struct video_device")
from the v4l-dvb tree and commit:
deb00d2785be ("fbdev: make unregister/unlink functions not fail")
from the fbdev 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 drivers/media/pci/ivtv/ivtvfb.c
index 800b3654cac5,299ff032f528..000000000000
--- a/drivers/media/pci/ivtv/ivtvfb.c
+++ b/drivers/media/pci/ivtv/ivtvfb.c
@@@ -1251,16 -1246,7 +1251,12 @@@ static int ivtvfb_callback_cleanup(stru
struct osd_info *oi = itv->osd_info;
if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
+ itv->streams[IVTV_DEC_STREAM_TYPE_YUV].vdev.device_caps &=
+ ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+ itv->streams[IVTV_DEC_STREAM_TYPE_MPG].vdev.device_caps &=
+ ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+ itv->v4l2_cap &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
- if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) {
- IVTVFB_WARN("Framebuffer %d is in use, cannot unload\n",
- itv->instance);
- return 0;
- }
+ unregister_framebuffer(&itv->osd_info->ivtvfb_info);
IVTVFB_INFO("Unregister framebuffer %d\n", itv->instance);
itv->ivtvfb_restore = NULL;
ivtvfb_blank(FB_BLANK_VSYNC_SUSPEND, &oi->ivtvfb_info);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-06-25 2:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 2:28 Stephen Rothwell [this message]
2019-07-09 0:07 ` linux-next: manual merge of the fbdev tree with the v4l-dvb tree 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=20190625122817.1f6657c7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=b.zolnierkie@samsung$(echo .)com \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=hverkuil@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