linux-merge March 2016

linux-merge@lists.open-mesh.org

3 participants
83 discussions

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

10 Mar '16

--- batman-adv_maint.packet.h 2016-03-10 00:05:01.625819452 +0100 +++ batctl_maint.packet.h 2016-03-10 00:05:01.633819987 +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-03-09
by postmaster＠open-mesh.org 09 Mar '16

09 Mar '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 ------------------------------------------- net/batman-adv/Kconfig | 2 +- net/batman-adv/bat_iv_ogm.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 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 09 Mar '16

09 Mar '16

--- batman-adv_maint.packet.h 2016-03-09 00:05:01.260672375 +0100 +++ batctl_maint.packet.h 2016-03-09 00:05:01.268672910 +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-03-08
by postmaster＠open-mesh.org 08 Mar '16

08 Mar '16

1 0

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

08 Mar '16

--- batman-adv_maint.packet.h 2016-03-08 00:05:01.191120543 +0100 +++ batctl_maint.packet.h 2016-03-08 00:05:01.275126103 +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-03-07
by postmaster＠open-mesh.org 07 Mar '16

07 Mar '16

1 0

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

07 Mar '16

--- batman-adv_maint.packet.h 2016-03-07 00:05:01.702480302 +0100 +++ batctl_maint.packet.h 2016-03-07 00:05:01.710480925 +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-03-06
by postmaster＠open-mesh.org 06 Mar '16

06 Mar '16

1 0

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

06 Mar '16

--- batman-adv_maint.packet.h 2016-03-06 00:05:01.584104209 +0100 +++ batctl_maint.packet.h 2016-03-06 00:05:01.592104646 +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-03-05
by postmaster＠open-mesh.org 05 Mar '16

05 Mar '16

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge March 2016