Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755574AbdDFVvT (ORCPT ); Thu, 6 Apr 2017 17:51:19 -0400 Received: from ozlabs.org ([103.22.144.67]:37039 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752631AbdDFVvP (ORCPT ); Thu, 6 Apr 2017 17:51:15 -0400 Date: Fri, 7 Apr 2017 07:51:11 +1000 From: Stephen Rothwell To: Sean Young Cc: Greg KH , Mauro Carvalho Chehab , Linux-Next Mailing List , Linux Kernel Mailing List , Derek Robson Subject: Re: linux-next: manual merge of the staging tree with the v4l-dvb tree Message-ID: <20170407075111.5209c0b3@canb.auug.org.au> In-Reply-To: <20170406203905.GA20704@gofer.mess.org> References: <20170406133420.3e231d2a@canb.auug.org.au> <20170406185857.GA19194@gofer.mess.org> <20170406191922.GB6631@kroah.com> <20170406203905.GA20704@gofer.mess.org> 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 Content-Length: 589 Lines: 21 Hi Sean, On Thu, 6 Apr 2017 21:39:05 +0100 Sean Young wrote: > > I think this is happening: > > On the v4l-dvb tree, 5cd6522 modifies both lirc_sasem.c and lirc_sir.c; > then both files are removed. Now 87ddb91067b9 is merged from the staging > tree and both files don't exist any more, so it no longer applies even > though the patch is the same. That is exactly right, but ... > If I drop 87ddb91067b9 from staging-next, I can merge it to v4l-dvb, > otherwise I get merge conflicts. The resolution is trivial, so don't worry about it. -- Cheers, Stephen Rothwell