linux-kernel - Re: linux-next: manual merge of the drm tree with the v4l-dvb tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20180727073242.4b18aa05@coco.lan>
Date:   Fri, 27 Jul 2018 07:32:42 -0300
From:   Mauro Carvalho Chehab <mchehab+samsung@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Dave Airlie <airlied@...ux.ie>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Mauro Carvalho Chehab <mchehab@...nel.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Philipp Zabel <p.zabel@...gutronix.de>,
        Steve Longerbeam <steve_longerbeam@...tor.com>
Subject: Re: linux-next: manual merge of the drm tree with the v4l-dvb tree

Em Fri, 27 Jul 2018 14:36:40 +1000
Stephen Rothwell <sfr@...b.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