From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751797AbdKMFYw (ORCPT ); Mon, 13 Nov 2017 00:24:52 -0500 Received: from ozlabs.org ([103.22.144.67]:40031 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751232AbdKMFYu (ORCPT ); Mon, 13 Nov 2017 00:24:50 -0500 Date: Mon, 13 Nov 2017 16:24:47 +1100 From: Stephen Rothwell To: Greg KH , Mauro Carvalho Chehab Cc: Mark Brown , Aishwarya Pant , Branislav Radocaj , Sakari Ailus , Linux-Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the staging tree with the media tree Message-ID: <20171113162433.3ad70a11@canb.auug.org.au> In-Reply-To: <20171009182653.5phanxtnwwtrx34e@sirena.co.uk> References: <20171009182653.5phanxtnwwtrx34e@sirena.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, On Mon, 9 Oct 2017 19:26:54 +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. Just a reminder that this conflict still exists. -- Cheers, Stephen Rothwell