linux-next: manual merge of the staging tree with the media tree

[Mark Brown]

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.

Attachment: signature.asc
Description: PGP signature