Received: by 10.213.65.68 with SMTP id h4csp1767532imn; Mon, 19 Mar 2018 12:42:22 -0700 (PDT) X-Google-Smtp-Source: AG47ELvp2LnJ/N5TQleqONlNrJBHtfzxGiKiGaTG+DSxdKyS0Q5NBD6Mup5+4rmaqiwx/S3XOUzR X-Received: by 2002:a17:902:6a89:: with SMTP id n9-v6mr13760063plk.51.1521488542764; Mon, 19 Mar 2018 12:42:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521488542; cv=none; d=google.com; s=arc-20160816; b=bOvb6xgCmiEIRg9RG7M8mYrHo3JIN9JHxYJpJLhdJObYR2y0E7U6qlb2TZjWXF+o5J 2uHkYhbZn7/K3YmoKGfgbc4OCI1ixePzLuLNlBwuDq/6FQXD31/w0O3BzzW0P9f5BTs0 YwFF40EA8MUr/hFFQYluLhMmQLD+vdQEKuCKxerGBfFPjMN8ODV1dtyeYP+8Fn+zCILL LnT8xXdbBr5SeVkIVUBwVNmpJwS0UzdJWGsEetm/vGSaJ1R0xlWyi8VhxHJfxVyksvjV fj6mmTRTXVye+Mzv4LXFoqEAS0C7GiH6GwAbLz13VT9y6SP9POB+eJH3raHzUuPf1seu LE8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=oiKnKUTUPFNPnG/kzAs9n4Jsdizeg6iGF8hKnvF65Pc=; b=DbjaXaKZ5WrMlRwEAM/LoCGDr8zf/l1jv4XmV6wewfEostJdo7+5gqu23iJZN+pmi0 4JPxtS7zejHUyf/TJC5loGn+Wh7hC5UgzxPXTokzLJZ8YGEheTG4uB7gcRDNFleP0jw/ rArmZvlEGor2i0giY6nnbfM+wcgNfgRUA+9H0GiB4HA5kjnEXjdlK8FGhk84pl49OvR6 rlq2gjq2IRQSmUOTPQhJwnsDSnB+qhtZhRN8piVgC/JyC2+/DhZMPJuN2iYQNp9keuTJ WE6b/MApkn/wmcxMtghUNJTOXNcGk+vj/9w8+VSKEg7H2+/7WJbcTdi8Seg47JQyFu1Z D1mQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u2-v6si482220plm.476.2018.03.19.12.42.08; Mon, 19 Mar 2018 12:42:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S969562AbeCSTkb (ORCPT + 99 others); Mon, 19 Mar 2018 15:40:31 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:48312 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031163AbeCSSVz (ORCPT ); Mon, 19 Mar 2018 14:21:55 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 566D31284; Mon, 19 Mar 2018 18:21:54 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kbuild test robot , Vincent Cuissard , Tobias Klauser , Samuel Ortiz , Sasha Levin Subject: [PATCH 4.9 090/241] NFC: nfcmrvl: Include unaligned.h instead of access_ok.h Date: Mon, 19 Mar 2018 19:05:55 +0100 Message-Id: <20180319180754.934089300@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tobias Klauser [ Upstream commit d916d923724d59cde99ee588f15eec59dd863bbd ] Including linux/unaligned/access_ok.h causes the allmodconfig build on ia64 (and maybe others) to fail with the following warnings: include/linux/unaligned/access_ok.h:7:19: error: redefinition of 'get_unaligned_le16' include/linux/unaligned/access_ok.h:12:19: error: redefinition of 'get_unaligned_le32' include/linux/unaligned/access_ok.h:17:19: error: redefinition of 'get_unaligned_le64' include/linux/unaligned/access_ok.h:22:19: error: redefinition of 'get_unaligned_be16' include/linux/unaligned/access_ok.h:27:19: error: redefinition of 'get_unaligned_be32' include/linux/unaligned/access_ok.h:32:19: error: redefinition of 'get_unaligned_be64' include/linux/unaligned/access_ok.h:37:20: error: redefinition of 'put_unaligned_le16' include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unaligned_le32' include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unaligned_le64' include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unaligned_be16' include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unaligned_be32' include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unaligned_be64' Fix these by including asm/unaligned.h instead and leave it up to the architecture to decide how to implement unaligned accesses. Fixes: 3194c6870158 ("NFC: nfcmrvl: add firmware download support") Reported-by: kbuild test robot Link: https://lkml.org/lkml/2016/10/22/247 Cc: Vincent Cuissard Signed-off-by: Tobias Klauser Signed-off-by: Samuel Ortiz Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/nfc/nfcmrvl/fw_dnld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/nfc/nfcmrvl/fw_dnld.c +++ b/drivers/nfc/nfcmrvl/fw_dnld.c @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include #include