From patchwork Thu Mar 1 15:26:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130267 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2950907edc; Thu, 1 Mar 2018 07:37:16 -0800 (PST) X-Google-Smtp-Source: AG47ELvx2SJDQcKOFLKS5RYcjgZ/wTBW3zSWc8SV4bP2c51IwmnwmdhtpJh5ZxPANTOYNox0YTLY X-Received: by 10.98.36.25 with SMTP id r25mr2391521pfj.106.1519918636786; Thu, 01 Mar 2018 07:37:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918636; cv=none; d=google.com; s=arc-20160816; b=Pc/vY9HWCIdLPH/rQqwwn1xj1VQ78wNhRPYmx+LCHPEVoT88Gv9llxzfZDA+q0mNif qLNHeUXrWh+R8HYWutF4/AXo++D+qBYrOtD7rOdAV2s4egaHwF8ahkF08hjMhGWGt4HC e1hsSps8Z4ilWTtWQ058Kz0HCfvb83WYnYqs2hyq+p2AFaY+TmEyAjikF10pI5YUFWJD ZXssaTrM7s0PHtgApH/bolAKHuFDErLZvY32YRqebMNDtZ4uL1JW2N+l5xVRZY9OaIwD +Y85fASO3mNDTWbUcKtQV4gl6V5hBS1L3GIXqIbToFW0aiaZli1m16U1KyxT6ofTwSJO xOnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=sBvBKb28F+HWs1c92jx8lGFUIWWYUEPfh8x6dW4TrzI=; b=Ze6tIknjne56P7ToVSCyxRkTXVeg9rHT27E07iuZOTyVFU0xyR6haTDgoBnq4e/P+F zBlZCfvLH9+eOBN1v+WHWFu7Nas9p3PU5OvJt3XDcBcfgo77luImV4dklFKH916EnEwF mghyeAGYBg0lkxuKr18ZxKsaKjtmsJvNfx8b7e/oyyatvGOWoKMbvuy69zvv+lR2SeZi +xrSZ5m7McAKpQ5dta/SYErX9axNTB5yoDefTdWtbqn5HvFTqbXf/qxNfk9giV14BTHK Uk0djff0knbvGdY9RFTNDXipGsLftOXKl2z65onQKoVbXVDyvhy/VY+POxVEjAMj4I+W UQAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=agwlEQgR; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g10-v6si2863008plk.730.2018.03.01.07.37.16; Thu, 01 Mar 2018 07:37:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=agwlEQgR; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032253AbeCAPhP (ORCPT + 10 others); Thu, 1 Mar 2018 10:37:15 -0500 Received: from mail-cys01nam02on0123.outbound.protection.outlook.com ([104.47.37.123]:45620 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032312AbeCAPhG (ORCPT ); Thu, 1 Mar 2018 10:37:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=sBvBKb28F+HWs1c92jx8lGFUIWWYUEPfh8x6dW4TrzI=; b=agwlEQgRDOEOc+l5NrxHJoCUYKKQo10sRappmSnFhKKIUFUExUVJrpxSGBlkKdRD9nU7A0VgcmCtJHwPiuaeRwnLbbzI0/L7wkOr1RPzdUHFstUoshjNNCVuBz9wS/qKtAVWGm5cnyudKtwj0lbxpG1OuR6WdWhoc+/KSng72qo= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1014.namprd21.prod.outlook.com (52.132.133.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.3; Thu, 1 Mar 2018 15:36:58 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:36:58 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Will Deacon , Jonathan Corbet , Sasha Levin Subject: [added to the 4.1 stable tree] scripts/kernel-doc: Don't fail with status != 0 if error encountered with -none Thread-Topic: [added to the 4.1 stable tree] scripts/kernel-doc: Don't fail with status != 0 if error encountered with -none Thread-Index: AQHTsXG6a1Ga/3kRgEKkl99aaxqsHw== Date: Thu, 1 Mar 2018 15:26:53 +0000 Message-ID: <20180301152116.1486-410-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1014; 7:kAbf1eHv8GESDSHqn5Ky+kkpevSmGV2NHPUSjbO8gviMC/RPfXMtCIMMmnCqdxdZ1z3XOTKjJE8u5Gr4iUVmV5Rh1J6JHmNcVoLlJLI8w0CeZ4Y3I7ggU8kjVI+Pt8wrf/CxnorO8b9KmHwWAOGnoB4FH/h92lJOlQ9k5TsfmAUjF80w/25oMajLnMTN+sIAFnWOZutzRaAYlaRuImSfPktBIEt3VwdG1qcuzu+8Asw6pTvvO3E5lFaaqDsZdB5l x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 3fc5d607-4d59-4d5c-2c22-08d57f8a4530 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1014; x-ms-traffictypediagnostic: DM5PR2101MB1014: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501228)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB1014; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1014; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(346002)(39860400002)(376002)(396003)(199004)(189003)(53936002)(2906002)(3280700002)(6436002)(6486002)(3846002)(6512007)(2900100001)(6116002)(2950100002)(107886003)(6666003)(72206003)(5660300001)(36756003)(10090500001)(3660700001)(14454004)(7736002)(305945005)(97736004)(1076002)(22452003)(26005)(6506007)(105586002)(86362001)(59450400001)(478600001)(68736007)(102836004)(4326008)(6346003)(54906003)(110136005)(81156014)(81166006)(86612001)(8936002)(186003)(10290500003)(8676002)(76176011)(316002)(2501003)(66066001)(25786009)(5250100002)(106356001)(99286004)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1014; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: U4op5BYqscDsInOHTtZn0/olRX/GvsWH4ipW13Q03hUu1o1RDcEjJGkaDDJAje22BrUmoUWWcnARwSlsTWwKL5RQfGxmmidw4OMeiJlBR7EVsDx2h/gVIYrPDDGENR5QsW4xP7BLXYlLBZCpWVnxGKtow2f/7FGTukNgON6rlmo= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3fc5d607-4d59-4d5c-2c22-08d57f8a4530 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:26:53.8635 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1014 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit e814bccbafece52a24e152d2395b5d49eef55841 ] My bisect scripts starting running into build failures when trying to compile 4.15-rc1 with the builds failing with things like: drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:2078: error: Cannot parse struct or union! The line in question is actually just a #define, but after some digging it turns out that my scripts pass W=1 and since commit 3a025e1d1c2ea ("Add optional check for bad kernel-doc comments") that results in kernel-doc running on each source file. The file in question has a badly formatted comment immediately before the #define: /** * struct brcmf_skbuff_cb reserves first two bytes in sk_buff::cb for * bus layer usage. */ which causes the regex in dump_struct to fail (lack of braces following struct declaration) and kernel-doc returns 1, which causes the build to fail. Fix the issue by always returning 0 from kernel-doc when invoked with -none. It successfully generates no documentation, and prints out any issues. Cc: Matthew Wilcox Cc: Jonathan Corbet Signed-off-by: Will Deacon Signed-off-by: Jonathan Corbet Signed-off-by: Sasha Levin --- scripts/kernel-doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 9922e66883a5..f936d9e5db91 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -2616,4 +2616,4 @@ if ($verbose && $warnings) { print STDERR "$warnings warnings\n"; } -exit($errors); +exit($output_mode eq "none" ? 0 : $errors);