Repository : ssh://git@diktynna/batman-adv On branches: ecsv/pu,main,main

commit c14c19af09d593a8948dcfd4a75ad6eef943ae3e Author: Jakub Kicinski kuba@kernel.org Date: Fri Mar 29 10:57:10 2024 -0700

batman-adv: remove linux/genetlink.h

genetlink.h is a shell of what used to be a combined uAPI and kernel header over a decade ago. It has fewer than 10 lines of code. Merge it into net/genetlink.h. In some ways it'd be better to keep the combined header under linux/ but it would make looking through git history harder.

Link: https://lore.kernel.org/r/20240329175710.291749-4-kuba@kernel.org Signed-off-by: Jakub Kicinski kuba@kernel.org Signed-off-by: Sven Eckelmann sven@narfation.org

c14c19af09d593a8948dcfd4a75ad6eef943ae3e net/batman-adv/main.c | 2 +- net/batman-adv/netlink.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 75119f1f..8e0f44c7 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -14,7 +14,6 @@ #include <linux/crc32c.h> #include <linux/device.h> #include <linux/errno.h> -#include <linux/genetlink.h> #include <linux/gfp.h> #include <linux/if_ether.h> #include <linux/if_vlan.h> @@ -38,6 +37,7 @@ #include <linux/string.h> #include <linux/workqueue.h> #include <net/dsfield.h> +#include <net/genetlink.h> #include <net/rtnetlink.h> #include <uapi/linux/batadv_packet.h> #include <uapi/linux/batman_adv.h> diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 6aff7cc1..3f0003fc 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -15,7 +15,6 @@ #include <linux/cache.h> #include <linux/err.h> #include <linux/errno.h> -#include <linux/genetlink.h> #include <linux/gfp.h> #include <linux/if_ether.h> #include <linux/if_vlan.h>