Message ID | 2410594.BZ40g7jear@bentobox (mailing list archive) |
---|---|
State | RFC, archived |
Headers |
Return-Path: <b.a.t.m.a.n-bounces@lists.open-mesh.org> X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 7C65F816E7; Tue, 2 Aug 2016 15:39:23 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=narfation.org Authentication-Results: open-mesh.org; dkim=fail reason="verification failed; unprotected key" header.d=narfation.org header.i=@narfation.org header.b=sKc028cn; dkim-adsp=fail (unprotected policy); dkim-atps=neutral Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=79.140.41.39; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=pass header.from=narfation.org Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 5B005815AC for <b.a.t.m.a.n@lists.open-mesh.org>; Tue, 2 Aug 2016 15:38:02 +0200 (CEST) Received: from bentobox.localnet (p2003007C6F75E8FE2890BAB0CC92E293.dip0.t-ipconnect.de [IPv6:2003:7c:6f75:e8fe:2890:bab0:cc92:e293]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id B80A21100E7; Tue, 2 Aug 2016 15:38:01 +0200 (CEST) Authentication-Results: v3-1039.vlinux.de; dmarc=none header.from=narfation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1470145081; bh=t22dUPmhmazfKTFNrZIm+PLuycmXdkKTsXUdHDjSFPU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sKc028cntMDBo4kJtHffL6lvTdKCHRiKNQd+hFBMfxRpNq5Qd//qGzocNzSQcz+6P ks3OitcbLjUun/APjh/YWajewHsJmiiw4K8TvyJL04kgFPOUkR+he0BykYxYadcYX/ qhVYmHPupLrdPu0+ZqD3OYrb2i4akKMEaqDmFDt0= From: Sven Eckelmann <sven@narfation.org> To: b.a.t.m.a.n@lists.open-mesh.org Date: Tue, 02 Aug 2016 15:38:00 +0200 Message-ID: <2410594.BZ40g7jear@bentobox> User-Agent: KMail/5.2.3 (Linux/4.6.0-1-amd64; KDE/5.23.0; x86_64; ; ) In-Reply-To: <20160802121513.22526-1-baolex.ni@intel.com> References: <20160802121513.22526-1-baolex.ni@intel.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart3017057.9hDxvFLKKV"; micalg="pgp-sha512"; protocol="application/pgp-signature" X-Mailman-Approved-At: Tue, 02 Aug 2016 15:39:21 +0200 Cc: aarcange@redhat.com, k.kozlowski@samsung.com, mhocko@suse.com, mareklindner@neomailbox.ch, a@unstable.cc, jiangshanlai@gmail.com, linux-kernel@vger.kernel.org, chuansheng.liu@intel.com, Baole Ni <baolex.ni@intel.com>, kyungmin.park@samsung.com, netdev@vger.kernel.org, gregkh@linuxfoundation.org, aryabinin@virtuozzo.com, gang.chen.5i5j@gmail.com, m.szyprowski@samsung.com, davem@davemloft.net, koct9i@gmail.com, m.chehab@samsung.com Subject: Re: [B.A.T.M.A.N.] [PATCH 1086/1285] Replace numeric parameter like 0444 with macro X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n.lists.open-mesh.org> List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe> List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n/> List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org> List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help> List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe> Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n@lists.open-mesh.org> Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" <b.a.t.m.a.n-bounces@lists.open-mesh.org> |
Commit Message
Sven Eckelmann
Aug. 2, 2016, 1:38 p.m. UTC
On Dienstag, 2. August 2016 20:15:13 CEST Baole Ni wrote: [...] > diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c > index 5f2974b..25759b9 100644 > --- a/net/batman-adv/main.c > +++ b/net/batman-adv/main.c > @@ -1313,7 +1313,7 @@ static struct kparam_string batadv_param_string_ra = { > }; > > module_param_cb(routing_algo, &batadv_param_ops_ra, &batadv_param_string_ra, > - 0644); > + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); > module_init(batadv_init); > module_exit(batadv_exit); Doesn't seem to apply on current net-next: $ git am -3 16577.patch Applying: Replace numeric parameter like 0444 with macro Using index info to reconstruct a base tree... M net/batman-adv/main.c Falling back to patching base and 3-way merge... Auto-merging net/batman-adv/main.c CONFLICT (content): Merge conflict in net/batman-adv/main.c error: Failed to merge in the changes. Patch failed at 0001 Replace numeric parameter like 0444 with macro The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". The code for it can now be found at net/batman-adv/bat_algo.c Also the prefix "batman-adv: " is missing in the subject and you should include <linux/stat.h> in net/batman-adv/bat_algo.c to make sure that these macros are actually defined before you use them. So you would end up with something more like: Kind regards, Sven
--- a/net/batman-adv/bat_algo.c +++ b/net/batman-adv/bat_algo.c @@ -22,6 +22,7 @@ #include <linux/moduleparam.h> #include <linux/printk.h> #include <linux/seq_file.h> +#include <linux/stat.h> #include <linux/stddef.h> #include <linux/string.h> @@ -137,4 +138,4 @@ static struct kparam_string batadv_param_string_ra = { }; module_param_cb(routing_algo, &batadv_param_ops_ra, &batadv_param_string_ra, - 0644); + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);