Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753035AbdDFTF5 (ORCPT ); Thu, 6 Apr 2017 15:05:57 -0400 Received: from gofer.mess.org ([88.97.38.141]:52533 "EHLO gofer.mess.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752194AbdDFTFs (ORCPT ); Thu, 6 Apr 2017 15:05:48 -0400 X-Greylist: delayed 407 seconds by postgrey-1.27 at vger.kernel.org; Thu, 06 Apr 2017 15:05:48 EDT Date: Thu, 6 Apr 2017 19:58:57 +0100 From: Sean Young To: Stephen Rothwell 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: <20170406185857.GA19194@gofer.mess.org> References: <20170406133420.3e231d2a@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170406133420.3e231d2a@canb.auug.org.au> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 813 Lines: 28 On Thu, Apr 06, 2017 at 01:34:20PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the staging tree got conflicts in: > > drivers/staging/media/lirc/lirc_sasem.c > drivers/staging/media/lirc/lirc_sir.c > > between commits: > > e66267161971 ("[media] rc: promote lirc_sir out of staging") > 51bb3fd788cb ("[media] staging: lirc_sasem: remove") > > from the v4l-dvb tree and commit: > > 87ddb91067b9 ("Staging: media: lirc - style fix") There are two commits which do similar things. In the v4l-dvb tree we have 5cd6522 ("[media] staging: lirc: use octal instead of symbolic permission" and in the staging tree there is 87ddb91067b9 ("Staging: media: lirc - style fix") Is it possible to drop the latter from the staging tree? That would resolve the issue. Thanks Sean