From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754294AbdJITFZ (ORCPT ); Mon, 9 Oct 2017 15:05:25 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:40743 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754018AbdJITFX (ORCPT ); Mon, 9 Oct 2017 15:05:23 -0400 X-ME-Sender: X-Sasl-enc: 6u4XVYY53mQPp+K+BuWpSEdANL87R2qBBn1x9WrzbRoE 1507575922 Date: Mon, 9 Oct 2017 21:05:32 +0200 From: Greg KH To: Mark Brown Cc: Aishwarya Pant , Branislav Radocaj , Sakari Ailus , Mauro Carvalho Chehab , Linux-Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the staging tree with the media tree Message-ID: <20171009190532.GA4335@kroah.com> References: <20171009182653.5phanxtnwwtrx34e@sirena.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171009182653.5phanxtnwwtrx34e@sirena.co.uk> User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 09, 2017 at 07:26:54PM +0100, Mark Brown 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. What fix? :(