From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Lucas Stach <l.stach@pengutronix•de>,
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>,
Steve Longerbeam <slongerbeam@gmail•com>,
Philipp Zabel <p.zabel@pengutronix•de>,
Hans Verkuil <hverkuil-cisco@xs4all•nl>
Subject: Re: linux-next: manual merge of the imx-drm tree with the v4l-vdb tree
Date: Tue, 9 Jul 2019 09:24:12 +1000 [thread overview]
Message-ID: <20190709092412.2e736df3@canb.auug.org.au> (raw)
In-Reply-To: <20190617133629.7c276a67@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2103 bytes --]
Hi all,
On Mon, 17 Jun 2019 13:36:29 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the imx-drm tree got a conflict in:
>
> drivers/staging/media/imx/imx-ic-prpencvf.c
>
> between commits:
>
> 6d01b7ff5233 ("media: staging/imx: Switch to sync registration for IPU subdevs")
> 34ff38745b16 ("media: staging/imx: Pass device to alloc/free_dma_buf")
>
> from the v4l-vdb tree and commit:
>
> f208b26e61df ("gpu: ipu-v3: ipu-ic: Fully describe colorspace conversions")
>
> from the imx-drm 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/staging/media/imx/imx-ic-prpencvf.c
> index 82bba68c554e,f2fe3c11c70e..000000000000
> --- a/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@@ -460,7 -465,18 +461,18 @@@ static int prp_setup_rotation(struct pr
> incc = priv->cc[PRPENCVF_SINK_PAD];
> outcc = vdev->cc;
>
> + ret = ipu_ic_calc_csc(&csc,
> + infmt->ycbcr_enc, infmt->quantization,
> + incc->cs,
> + outfmt->ycbcr_enc, outfmt->quantization,
> + outcc->cs);
> + if (ret) {
> + v4l2_err(&ic_priv->sd, "ipu_ic_calc_csc failed, %d\n",
> + ret);
> + return ret;
> + }
> +
> - ret = imx_media_alloc_dma_buf(priv->md, &priv->rot_buf[0],
> + ret = imx_media_alloc_dma_buf(ic_priv->ipu_dev, &priv->rot_buf[0],
> outfmt->sizeimage);
> if (ret) {
> v4l2_err(&ic_priv->sd, "failed to alloc rot_buf[0], %d\n", ret);
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2019-07-08 23:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 3:36 linux-next: manual merge of the imx-drm tree with the v4l-vdb tree Stephen Rothwell
2019-07-08 23:24 ` Stephen Rothwell [this message]
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=20190709092412.2e736df3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hverkuil-cisco@xs4all$(echo .)nl \
--cc=l.stach@pengutronix$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@kernel$(echo .)org \
--cc=p.zabel@pengutronix$(echo .)de \
--cc=slongerbeam@gmail$(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