From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: manual merge of the staging tree with the v4l-dvb tree Date: Thu, 6 Apr 2017 21:19:22 +0200 Message-ID: <20170406191922.GB6631@kroah.com> References: <20170406133420.3e231d2a@canb.auug.org.au> <20170406185857.GA19194@gofer.mess.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from out1-smtp.messagingengine.com ([66.111.4.25]:59335 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756174AbdDFTTd (ORCPT ); Thu, 6 Apr 2017 15:19:33 -0400 Content-Disposition: inline In-Reply-To: <20170406185857.GA19194@gofer.mess.org> Sender: linux-next-owner@vger.kernel.org List-ID: To: Sean Young Cc: Stephen Rothwell , Mauro Carvalho Chehab , Linux-Next Mailing List , Linux Kernel Mailing List , Derek Robson On Thu, Apr 06, 2017 at 07:58:57PM +0100, Sean Young wrote: > 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. I can revert the staging patch, if that really helps anything. Is is really an issue as both patches do the same thing? thanks, greg k-h