linux-kernel - Re: linux-next: manual merge of the staging tree with the vfs 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] [day] [month] [year] [list]

Message-ID: <20171109083407.GB11420@kroah.com>
Date:   Thu, 9 Nov 2017 09:34:07 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Al Viro <viro@...IV.linux.org.uk>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Srishti Sharma <srishtishar@...il.com>
Subject: Re: linux-next: manual merge of the staging tree with the vfs tree

On Thu, Nov 09, 2017 at 03:01:26PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/pi433/pi433_if.c
> 
> between commit:
> 
>   f81f0b5c9a30 ("pi433: sanitize ioctl")
> 
> from the vfs tree and commit:
> 
>   69af5d92da20 ("Staging: pi433: Fix the position of brace after if")
> 
> from the staging tree.
> 
> I fixed it up (I just used the vfs tree version (for the conflicting bits)
> as suggested by Al) and can carry the fix as necessary.

Sounds like the correct fix, thanks.

greg k-h