linux-merge February 2016

linux-merge@lists.open-mesh.org

2 participants
121 discussions

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 29 Feb '16

29 Feb '16

--- batman-adv_maint.packet.h 2016-03-01 00:05:02.201751800 +0100 +++ batctl_maint.packet.h 2016-03-01 00:05:02.305758737 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-02-29
by postmaster＠open-mesh.org 29 Feb '16

29 Feb '16

Name of failed tests ==================== * difference between net-next and batadv next * headers master Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- Documentation/ABI/testing/sysfs-class-net-batman-adv | 17 net/batman-adv/Kconfig | 14 net/batman-adv/Makefile | 3 net/batman-adv/bat_algo.h | 28 net/batman-adv/bat_iv_ogm.c | 11 net/batman-adv/bat_v.c | 347 ---- net/batman-adv/bat_v_elp.c | 515 ------ net/batman-adv/bat_v_elp.h | 33 net/batman-adv/bat_v_ogm.c | 833 ---------- net/batman-adv/bat_v_ogm.h | 36 net/batman-adv/distributed-arp-table.c | 4 net/batman-adv/fragmentation.c | 8 net/batman-adv/gateway_common.c | 4 net/batman-adv/gateway_common.h | 2 net/batman-adv/icmp_socket.c | 2 net/batman-adv/main.c | 7 net/batman-adv/main.h | 12 net/batman-adv/network-coding.c | 22 net/batman-adv/packet.h | 49 net/batman-adv/send.c | 55 net/batman-adv/send.h | 10 net/batman-adv/sysfs.c | 130 - net/batman-adv/types.h | 93 - 23 files changed, 42 insertions(+), 2193 deletions(-) headers master -------------- diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index f93cbc7..9b191bd 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -21,6 +21,7 @@ #include "main.h" #include <linux/bitops.h> +#include <linux/stddef.h> #include <linux/compiler.h> #include <linux/types.h> diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 417d30a..adc1c65 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -18,9 +18,9 @@ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ -#include "main.h" - +#include <linux/types.h> #include <net/rtnetlink.h> +#include "main.h" struct net_device; struct sk_buff;

1 0

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 28 Feb '16

28 Feb '16

--- batman-adv_maint.packet.h 2016-02-29 00:05:01.915435839 +0100 +++ batctl_maint.packet.h 2016-02-29 00:05:01.923436371 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-02-28
by postmaster＠open-mesh.org 28 Feb '16

28 Feb '16

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- Documentation/ABI/testing/sysfs-class-net-batman-adv | 17 net/batman-adv/Kconfig | 14 net/batman-adv/Makefile | 3 net/batman-adv/bat_algo.h | 28 net/batman-adv/bat_iv_ogm.c | 6 net/batman-adv/bat_v.c | 347 ---- net/batman-adv/bat_v_elp.c | 515 ------ net/batman-adv/bat_v_elp.h | 33 net/batman-adv/bat_v_ogm.c | 833 ---------- net/batman-adv/bat_v_ogm.h | 36 net/batman-adv/distributed-arp-table.c | 4 net/batman-adv/fragmentation.c | 8 net/batman-adv/gateway_common.c | 4 net/batman-adv/gateway_common.h | 2 net/batman-adv/icmp_socket.c | 2 net/batman-adv/main.c | 7 net/batman-adv/main.h | 12 net/batman-adv/network-coding.c | 22 net/batman-adv/packet.h | 49 net/batman-adv/send.c | 55 net/batman-adv/send.h | 10 net/batman-adv/sysfs.c | 130 - net/batman-adv/types.h | 93 - 23 files changed, 40 insertions(+), 2190 deletions(-)

1 0

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 27 Feb '16

27 Feb '16

--- batman-adv_maint.packet.h 2016-02-28 00:05:01.588911215 +0100 +++ batctl_maint.packet.h 2016-02-28 00:05:01.600912016 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-02-27
by postmaster＠open-mesh.org 27 Feb '16

27 Feb '16

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- Documentation/ABI/testing/sysfs-class-net-batman-adv | 17 net/batman-adv/Kconfig | 14 net/batman-adv/Makefile | 3 net/batman-adv/bat_algo.h | 28 net/batman-adv/bat_iv_ogm.c | 2 net/batman-adv/bat_v.c | 347 ---- net/batman-adv/bat_v_elp.c | 515 ------ net/batman-adv/bat_v_elp.h | 33 net/batman-adv/bat_v_ogm.c | 833 ---------- net/batman-adv/bat_v_ogm.h | 36 net/batman-adv/distributed-arp-table.c | 4 net/batman-adv/fragmentation.c | 8 net/batman-adv/gateway_common.c | 4 net/batman-adv/gateway_common.h | 2 net/batman-adv/icmp_socket.c | 2 net/batman-adv/main.c | 7 net/batman-adv/main.h | 12 net/batman-adv/network-coding.c | 22 net/batman-adv/packet.h | 49 net/batman-adv/send.c | 55 net/batman-adv/send.h | 10 net/batman-adv/sysfs.c | 130 - net/batman-adv/types.h | 93 - 23 files changed, 37 insertions(+), 2189 deletions(-)

1 0

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 26 Feb '16

26 Feb '16

--- batman-adv_maint.packet.h 2016-02-27 00:05:01.200318458 +0100 +++ batctl_maint.packet.h 2016-02-27 00:05:01.208318990 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-02-26
by postmaster＠open-mesh.org 26 Feb '16

26 Feb '16

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- Documentation/ABI/testing/sysfs-class-net-batman-adv | 17 net/batman-adv/Kconfig | 14 net/batman-adv/Makefile | 3 net/batman-adv/bat_algo.h | 28 net/batman-adv/bat_iv_ogm.c | 2 net/batman-adv/bat_v.c | 347 ---- net/batman-adv/bat_v_elp.c | 515 ------ net/batman-adv/bat_v_elp.h | 33 net/batman-adv/bat_v_ogm.c | 833 ---------- net/batman-adv/bat_v_ogm.h | 36 net/batman-adv/distributed-arp-table.c | 4 net/batman-adv/fragmentation.c | 8 net/batman-adv/gateway_common.c | 4 net/batman-adv/gateway_common.h | 2 net/batman-adv/icmp_socket.c | 2 net/batman-adv/main.c | 7 net/batman-adv/main.h | 12 net/batman-adv/network-coding.c | 22 net/batman-adv/packet.h | 49 net/batman-adv/send.c | 55 net/batman-adv/send.h | 10 net/batman-adv/sysfs.c | 130 - net/batman-adv/types.h | 93 - 23 files changed, 37 insertions(+), 2189 deletions(-)

1 0

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 25 Feb '16

25 Feb '16

--- batman-adv_maint.packet.h 2016-02-26 00:05:01.666957805 +0100 +++ batctl_maint.packet.h 2016-02-26 00:05:01.802966865 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-02-25
by postmaster＠open-mesh.org 25 Feb '16

25 Feb '16

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- Documentation/ABI/testing/sysfs-class-net-batman-adv | 17 net/batman-adv/Kconfig | 14 net/batman-adv/Makefile | 3 net/batman-adv/bat_algo.h | 28 net/batman-adv/bat_iv_ogm.c | 2 net/batman-adv/bat_v.c | 347 ---- net/batman-adv/bat_v_elp.c | 515 ------ net/batman-adv/bat_v_elp.h | 33 net/batman-adv/bat_v_ogm.c | 833 ---------- net/batman-adv/bat_v_ogm.h | 36 net/batman-adv/distributed-arp-table.c | 4 net/batman-adv/fragmentation.c | 8 net/batman-adv/gateway_common.c | 4 net/batman-adv/gateway_common.h | 2 net/batman-adv/icmp_socket.c | 2 net/batman-adv/main.c | 7 net/batman-adv/main.h | 12 net/batman-adv/network-coding.c | 22 net/batman-adv/packet.h | 49 net/batman-adv/send.c | 55 net/batman-adv/send.h | 10 net/batman-adv/sysfs.c | 130 - net/batman-adv/types.h | 93 - 23 files changed, 37 insertions(+), 2189 deletions(-)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge February 2016