From: Mauro Carvalho Chehab <mchehab+samsung@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Steve Longerbeam <steve_longerbeam@mentor•com>,
Dave Airlie <airlied@linux•ie>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
DRI <dri-devel@lists•freedesktop.org>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel•org>
Subject: Re: linux-next: manual merge of the drm tree with the v4l-dvb tree
Date: Fri, 27 Jul 2018 07:32:42 -0300 [thread overview]
Message-ID: <20180727073242.4b18aa05@coco.lan> (raw)
In-Reply-To: <20180727143640.4dc3fa54@canb.auug.org.au>
Em Fri, 27 Jul 2018 14:36:40 +1000
Stephen Rothwell <sfr@canb•auug.org.au> escreveu:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/ipu-v3/ipu-cpmem.c
>
> between commit:
>
> 343b23a7c6b6 ("media: gpu: ipu-v3: Allow negative offsets for interlaced scanning")
>
> from the v4l-dvb tree and commit:
>
> 4e3c5d7e05be ("gpu: ipu-v3: Allow negative offsets for interlaced scanning")
>
> from the drm tree.
>
> I fixed it up (I just used the drm tree version) 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.
My mistake. Not sure why media ML was c/c on this patch. As the author
is an usual media contributor and we have an IPU3 driver that has being
taking some discussions those days, I ended by merging it without
noticing that it was for the gpu driver.
I'll remove it from my tree in order to avoid conflicts.
Thanks,
Mauro
_______________________________________________
dri-devel mailing list
dri-devel@lists•freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-07-27 10:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 4:36 linux-next: manual merge of the drm tree with the v4l-dvb tree Stephen Rothwell
2018-07-27 7:57 ` Philipp Zabel
2018-07-27 10:32 ` Mauro Carvalho Chehab [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-01 1:20 Stephen Rothwell
2017-04-11 0:27 Stephen Rothwell
2016-07-19 1:21 Stephen Rothwell
2016-07-13 2:25 Stephen Rothwell
2015-04-15 3:49 Stephen Rothwell
2015-04-15 9:00 ` Philipp Zabel
2015-04-15 3:33 Stephen Rothwell
2015-04-15 9:09 ` Philipp Zabel
2015-04-17 3:07 ` Dave Airlie
2015-04-17 17:12 ` Philipp Zabel
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=20180727073242.4b18aa05@coco.lan \
--to=mchehab+samsung@kernel$(echo .)org \
--cc=airlied@linux$(echo .)ie \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@kernel$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=steve_longerbeam@mentor$(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