linux-kernel - Re: linux-next: manual merge of the staging tree with the v4l-dvb tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170406191922.GB6631@kroah.com>
Date:   Thu, 6 Apr 2017 21:19:22 +0200
From:   Greg KH <greg@...ah.com>
To:     Sean Young <sean@...s.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Mauro Carvalho Chehab <mchehab@....samsung.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Derek Robson <robsonde@...il.com>
Subject: Re: linux-next: manual merge of the staging tree with the v4l-dvb
 tree

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