linux-kernel - linux-next: build failure after merge of the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230124100249.5ec4512c@canb.auug.org.au>
Date:   Tue, 24 Jan 2023 10:02:49 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Vladimir Oltean <vladimir.oltean@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: build failure after merge of the net-next tree

Hi all,

After merging the net-next tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from net/ethtool/netlink.c:6:
net/ethtool/netlink.h:177:20: error: redefinition of 'ethnl_update_bool'
  177 | static inline void ethnl_update_bool(bool *dst, const struct nlattr *attr,
      |                    ^~~~~~~~~~~~~~~~~
net/ethtool/netlink.h:125:20: note: previous definition of 'ethnl_update_bool' with type 'void(bool *, const struct nlattr *, bool *)' {aka 'void(_Bool *, const struct nlattr *, _Bool *)'}
  125 | static inline void ethnl_update_bool(bool *dst, const struct nlattr *attr,
      |                    ^~~~~~~~~~~~~~~~~

Caused by commit

  dc0b98a1758f ("ethtool: Add and use ethnl_update_bool.")

merging badly with commit

  7c494a7749a7 ("net: ethtool: netlink: introduce ethnl_update_bool()")

from the net tree.

I applied the following merge fix up.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 24 Jan 2023 09:58:16 +1100
Subject: [PATCH] fix up for "ethtool: Add and use ethnl_update_bool."

interacting with "net: ethtool: netlink: introduce ethnl_update_bool()"

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 net/ethtool/netlink.h | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h
index 4992fab0d06b..b01f7cd542c4 100644
--- a/net/ethtool/netlink.h
+++ b/net/ethtool/netlink.h
@@ -111,32 +111,6 @@ static inline void ethnl_update_u8(u8 *dst, const struct nlattr *attr,
 	*mod = true;
 }
 
-/**
- * ethnl_update_bool() - update bool from NLA_U8 attribute
- * @dst:  value to update
- * @attr: netlink attribute with new value or null
- * @mod:  pointer to bool for modification tracking
- *
- * Use the u8 value from NLA_U8 netlink attribute @attr to set bool variable
- * pointed to by @dst to false (if zero) or 1 (if not); do nothing if @attr is
- * null. Bool pointed to by @mod is set to true if this function changed the
- * logical value of *dst, otherwise it is left as is.
- */
-static inline void ethnl_update_bool(bool *dst, const struct nlattr *attr,
-				     bool *mod)
-{
-	u8 val;
-
-	if (!attr)
-		return;
-	val = !!nla_get_u8(attr);
-	if (*dst == val)
-		return;
-
-	*dst = val;
-	*mod = true;
-}
-
 /**
  * ethnl_update_bool32() - update u32 used as bool from NLA_U8 attribute
  * @dst:  value to update
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped