From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753694AbdKIId4 (ORCPT <rfc822;w@1wt.eu>);
        Thu, 9 Nov 2017 03:33:56 -0500
Received: from out4-smtp.messagingengine.com ([66.111.4.28]:53231 "EHLO
        out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S1753443AbdKIIdz (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 9 Nov 2017 03:33:55 -0500
X-ME-Sender: <xms:8hIEWi8GrHMFleJK0DPWfTV4X9sJaUFWUDEzXqfrrtC9J7oR3mcqBQ>
Date: Thu, 9 Nov 2017 09:34:07 +0100
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Srishti Sharma <srishtishar@gmail.com>
Subject: Re: linux-next: manual merge of the staging tree with the vfs tree
Message-ID: <20171109083407.GB11420@kroah.com>
References: <20171109150126.3417da53@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20171109150126.3417da53@canb.auug.org.au>
User-Agent: Mutt/1.9.1 (2017-09-22)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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