linux-kernel - Re: linux-next: manual merge of the staging tree with the media 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20171113162433.3ad70a11@canb.auug.org.au>
Date:   Mon, 13 Nov 2017 16:24:47 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>,
        Mauro Carvalho Chehab <mchehab@...pensource.com>
Cc:     Mark Brown <broonie@...nel.org>,
        Aishwarya Pant <aishpant@...il.com>,
        Branislav Radocaj <branislav@...ocaj.org>,
        Sakari Ailus <sakari.ailus@...ux.intel.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: 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@...nel.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