From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753462AbdKMTFP (ORCPT ); Mon, 13 Nov 2017 14:05:15 -0500 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:23604 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751576AbdKMTFH (ORCPT ); Mon, 13 Nov 2017 14:05:07 -0500 From: alexander.levin@verizon.com X-Host: mariner.tdc.vzwcorp.com To: Ben Hutchings CC: Greg Kroah-Hartman , "stable@vger.kernel.org" , "Dmitry V. Levin" , "David S. Miller" , LKML Subject: Re: [PATCH 4.4 41/46] uapi: fix linux/rds.h userspace compilation errors Thread-Topic: [PATCH 4.4 41/46] uapi: fix linux/rds.h userspace compilation errors Thread-Index: AQHTXLIhxG8KUmKlCkayaQoZ+lTxpA== Date: Mon, 13 Nov 2017 19:03:46 +0000 Message-ID: <20171113190344.rr4w44guewiv24ld@sasha-lappy> References: <20171019134845.293630834@linuxfoundation.org> <20171019134847.753402053@linuxfoundation.org> <1510512643.2465.65.camel@codethink.co.uk> In-Reply-To: <1510512643.2465.65.camel@codethink.co.uk> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: NeoMutt/20170113 (1.7.2) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] Content-Type: text/plain; charset="iso-8859-1" Content-ID: MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id vADJ5Kx1011752 On Sun, Nov 12, 2017 at 06:50:43PM +0000, Ben Hutchings wrote: >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" >> >> >> [ 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 >> +#include /* 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 >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). Uh, I'll get scripts + git trees fixed to deal with this issue. I'll send it along with my next pull request to Greg. Thanks Ben! -- Thanks, Sasha