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 S1751151AbdKLSux (ORCPT <rfc822;w@1wt.eu>);
        Sun, 12 Nov 2017 13:50:53 -0500
Received: from imap1.codethink.co.uk ([176.9.8.82]:37850 "EHLO
        imap1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750926AbdKLSuv (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Sun, 12 Nov 2017 13:50:51 -0500
Message-ID: <1510512643.2465.65.camel@codethink.co.uk>
Subject: Re: [PATCH 4.4 41/46] uapi: fix linux/rds.h userspace compilation
 errors
From: Ben Hutchings <ben.hutchings@codethink.co.uk>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Sasha Levin <alexander.levin@verizon.com>
Cc: stable@vger.kernel.org, "Dmitry V. Levin" <ldv@altlinux.org>,
        "David S. Miller" <davem@davemloft.net>,
        LKML <linux-kernel@vger.kernel.org>
Date: Sun, 12 Nov 2017 18:50:43 +0000
In-Reply-To: <20171019134847.753402053@linuxfoundation.org>
References: <20171019134845.293630834@linuxfoundation.org>
         <20171019134847.753402053@linuxfoundation.org>
Organization: Codethink Ltd.
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.22.6-1+deb9u1 
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, 2017-10-19 at 15:49 +0200, Greg Kroah-Hartman wrote:
> 4.4-stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: "Dmitry V. Levin" <ldv@altlinux.org>
> 
> 
> [ Upstream commit feb0869d90e51ce8b6fd8a46588465b1b5a26d09 ]
> 
> Consistently use types from linux/types.h to fix the following
> linux/rds.h userspace compilation errors:
[...]
> --- a/include/uapi/linux/rds.h
> +++ b/include/uapi/linux/rds.h
> @@ -35,6 +35,7 @@
>  #define _LINUX_RDS_H
>  
>  #include <linux/types.h>
> +#include <linux/socket.h>		/* For __kernel_sockaddr_storage. */
>  
>  #define RDS_IB_ABI_VERSION		0x301
>  
> @@ -223,7 +224,7 @@ struct rds_get_mr_args {
>  };
>  
>  struct rds_get_mr_for_dest_args {
> -	struct sockaddr_storage	dest_addr;
> +	struct __kernel_sockaddr_storage dest_addr;
>  	struct rds_iovec 	vec;
>  	uint64_t		cookie_addr;
>  	uint64_t		flags;

This is a valid fix but not the one that the commit message and
upstream commit hash refer to.  This diff matches:

commit 1786dbf3702e33ce3afd2d3dbe630bd04b1d2e58
Author: Dmitry V. Levin <ldv@altlinux.org>
Date:   Thu Feb 16 18:05:45 2017 +0300

    uapi: fix linux/rds.h userspace compilation error

which has almost the same subject line.

Maybe you should cherry-pick commit
feb0869d90e51ce8b6fd8a46588465b1b5a26d09 for real as well (in all
branches).

Ben.

--  
Ben Hutchings
Software Developer, Codethink Ltd.