linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the staging tree with the media tree
@ 2017-10-09 18:26 Mark Brown
  2017-10-09 19:05 ` Greg KH
  2017-11-13  5:24 ` Stephen Rothwell
  0 siblings, 2 replies; 6+ messages in thread
From: Mark Brown @ 2017-10-09 18:26 UTC (permalink / raw)
  To: Greg KH, Aishwarya Pant, Branislav Radocaj, Sakari Ailus,
	Mauro Carvalho Chehab
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 756 bytes --]

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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-11-15  1:25 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-09 18:26 linux-next: manual merge of the staging tree with the media tree Mark Brown
2017-10-09 19:05 ` Greg KH
2017-10-09 19:12   ` Mark Brown
2017-11-13  5:24 ` Stephen Rothwell
2017-11-14 23:28   ` Sakari Ailus
2017-11-15  1:25     ` Mauro Carvalho Chehab

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).