Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 14 Nov 2017 23:25:20 -0200
From:   Mauro Carvalho Chehab <mchehab@s-opensource.com>
To:     Sakari Ailus <sakari.ailus@linux.intel.com>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
        Mark Brown <broonie@kernel.org>,
        Aishwarya Pant <aishpant@gmail.com>,
        Branislav Radocaj <branislav@radocaj.org>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the staging tree with the media
 tree
Message-ID: <20171114232520.1079a5c3@vento.lan>
In-Reply-To: <20171114232805.vvb5jbpf4fuwkw76@kekkonen.localdomain>
References: <20171009182653.5phanxtnwwtrx34e@sirena.co.uk>
        <20171113162433.3ad70a11@canb.auug.org.au>
        <20171114232805.vvb5jbpf4fuwkw76@kekkonen.localdomain>
Organization: Samsung
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Em Wed, 15 Nov 2017 01:28:06 +0200
Sakari Ailus <sakari.ailus@linux.intel.com> escreveu:

> Hi Stephen, Greg, others,
> 
> On Mon, Nov 13, 2017 at 04:24:47PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > On Mon, 9 Oct 2017 19:26:54 +0100 Mark Brown <broonie@kernel.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.  
> 
> Both patches essentially contain the same change, the difference is in the
> indentation only. There's a number of atomisp patches in the media tree,
> how about simply reverting the patch in the staging tree?

Today morning I merged the changeset from staging tree that Greg 
sent to Linux (and that was already merged upstream), solving the conflict.

So, except if something else pops up, the conflict at -next will
cease to exist after it gets merged back there :-)

Regards,
Mauro

From 1584091724889495460@xxx Wed Nov 15 00:59:52 +0000 2017
X-GM-THRID: 1580805590539767632
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread