lkml.org 
[lkml]   [2017]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the staging tree with the media tree
Hi all,

On Mon, 9 Oct 2017 19:26:54 +0100 Mark Brown <broonie@kernel.org> wrote:
>
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
>
> between commit:
>
> 866af46e6ebbc ("media: Staging: atomisp: fix alloc_cast.cocci warnings")
>
> from the media tree and commit:
>
> 4d962df5a7771 ("atomisp2: remove cast from memory allocation")
>
> from the staging 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.

Just a reminder that this conflict still exists.

--
Cheers,
Stephen Rothwell

\
 
 \ /
  Last update: 2017-11-13 06:25    [W:0.097 / U:0.156 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site