From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966855AbcHBNsY (ORCPT ); Tue, 2 Aug 2016 09:48:24 -0400 Received: from narfation.org ([79.140.41.39]:46270 "EHLO v3-1039.vlinux.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966612AbcHBNrY (ORCPT ); Tue, 2 Aug 2016 09:47:24 -0400 Authentication-Results: v3-1039.vlinux.de; dmarc=none header.from=narfation.org From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Cc: Baole Ni , mareklindner@neomailbox.ch, sw@simonwunderlich.de, a@unstable.cc, davem@davemloft.net, jiangshanlai@gmail.com, m.chehab@samsung.com, gregkh@linuxfoundation.org, m.szyprowski@samsung.com, kyungmin.park@samsung.com, k.kozlowski@samsung.com, aarcange@redhat.com, mhocko@suse.com, gang.chen.5i5j@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, aryabinin@virtuozzo.com, chuansheng.liu@intel.com, koct9i@gmail.com Subject: Re: [B.A.T.M.A.N.] [PATCH 1086/1285] Replace numeric parameter like 0444 with macro 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" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --nextPart3017057.9hDxvFLKKV Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" 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 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: --- a/net/batman-adv/bat_algo.c +++ b/net/batman-adv/bat_algo.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -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); Kind regards, Sven --nextPart3017057.9hDxvFLKKV Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCgAGBQJXoKI4AAoJEF2HCgfBJntGpJAQAJ81kA4Lzqsn/xWGR0D4+17/ pVqP/EOkedAfVjBjV7QShJd8e/CJKoApxiQsKwtKiezWYSFrDE8bEV0mdNS5XVuQ Jj0IP++MXGmLJkpQIuAK08CLNp5+Ev8Z+UswEFfcP8/yPc6fcQ9bl9FGJaSTza6W 938jrVT001iuN1/F9+gFXbb5ZmeSs03AVrbHKOYUYTBBZEZua8hSyiGImkzGBIuy yHislKXRayPyd5Xogkx+5WRwKJgHBJsWm0u2MBQVubVPJ8iX/vupCSpudKLUSbVM HFGrCZTffRvBwXNozuTURyVMi7f+5SHPYYIrHeiIuW0Rzv2evf1aJpJ7xLHuDv/A hP9AKM1UtGabkELhvqcCAjFcUp3WP/J9kFQ3GvlZfTt5pz0FwnGBMkwE62ZOeR6F vYgl3Vn1x5nb4PmaaeJpQaHJn/KFj43ijaexZikYUO7BUdpDhbR3BZ4MQ5fM7Tm2 4LYvla+QYCSFiAE3M8YhJSHWLbJVdqZ6ZEAmTt8QIGwotNQWBihNiIHvdm63vKcj RqTCP71ZzPckn81oq6dKCMQi5HqMmqvqzonvNYZbJy1bTiKSczVtwRhE89dyXxWk 31D1d8n0h/CW8zh2/0B0RYKWtnadoQXHIWO5rzzkahHxQ3I+TGmBj8jv8djzH9i1 NYizHKWGycjLXLzhoHEU =4CGD -----END PGP SIGNATURE----- --nextPart3017057.9hDxvFLKKV--