linux-merge January 2016

linux-merge@lists.open-mesh.org

3 participants
124 discussions

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

28 Jan '16

--- batman-adv_maint.packet.h 2016-01-29 00:05:01.745046073 +0100 +++ batctl_maint.packet.h 2016-01-29 00:05:01.753046607 +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

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

28 Jan '16

--- batman-adv_next.packet.h 2016-01-29 00:05:01.721044469 +0100 +++ batctl_next.packet.h 2016-01-29 00:05:01.749046340 +0100 @@ -26,8 +26,6 @@ * @BATADV_IV_OGM: originator messages for B.A.T.M.A.N. IV * @BATADV_BCAST: broadcast packets carrying broadcast payload * @BATADV_CODED: network coded packets - * @BATADV_ELP: echo location packets for B.A.T.M.A.N. V - * @BATADV_OGM2: originator messages for B.A.T.M.A.N. V * * @BATADV_UNICAST: unicast packets carrying unicast payload traffic * @BATADV_UNICAST_FRAG: unicast packets carrying a fragment of the original @@ -42,8 +40,6 @@ BATADV_IV_OGM = 0x00, BATADV_BCAST = 0x01, BATADV_CODED = 0x02, - BATADV_ELP = 0x03, - BATADV_OGM2 = 0x04, /* 0x40 - 0x7f: unicast */ #define BATADV_UNICAST_MIN 0x40 BATADV_UNICAST = 0x40, @@ -239,51 +235,6 @@ #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) /** - * struct batadv_ogm2_packet - ogm2 (routing protocol) packet - * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the general header - * @ttl: time to live for this packet, part of the general header - * @flags: reseved for routing relevant flags - currently always 0 - * @seqno: sequence number - * @orig: originator mac address - * @tvlv_len: length of the appended tvlv buffer (in bytes) - * @throughput: the currently flooded path throughput - */ -struct batadv_ogm2_packet { - u8 packet_type; - u8 version; - u8 ttl; - u8 flags; - __be32 seqno; - u8 orig[ETH_ALEN]; - __be16 tvlv_len; - __be32 throughput; - /* __packed is not needed as the struct size is divisible by 4, - * and the largest data type in this struct has a size of 4. - */ -}; - -#define BATADV_OGM2_HLEN sizeof(struct batadv_ogm2_packet) - -/** - * struct batadv_elp_packet - elp (neighbor discovery) packet - * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @orig: originator mac address - * @seqno: sequence number - * @elp_interval: currently used ELP sending interval in ms - */ -struct batadv_elp_packet { - u8 packet_type; - u8 version; - u8 orig[ETH_ALEN]; - __be32 seqno; - __be32 elp_interval; -}; - -#define BATADV_ELP_HLEN sizeof(struct batadv_elp_packet) - -/** * struct batadv_icmp_header - common members among all the ICMP packets * @packet_type: batman-adv packet type, part of the general header * @version: batman-adv protocol version, part of the genereal header

1 0

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

28 Jan '16

Name of failed tests ==================== * difference between net-next and batadv next * sparse next linux-2.6.29 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-2.6.29 cfg: BLA=y DAT=n DEBUG=y NC=y MCAST=n BATMAN_V=n * sparse next linux-2.6.29 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=n * sparse next linux-2.6.30 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-2.6.30 cfg: BLA=y DAT=n DEBUG=y NC=y MCAST=n BATMAN_V=n * sparse next linux-2.6.30 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=n * sparse next linux-2.6.31 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-2.6.31 cfg: BLA=y DAT=n DEBUG=y NC=y MCAST=n BATMAN_V=n * sparse next linux-2.6.31 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=n * sparse next linux-2.6.32 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-2.6.32 cfg: BLA=y DAT=n DEBUG=y NC=y MCAST=n BATMAN_V=n * sparse next linux-2.6.32 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=n * wrong namespace symbols next linux-2.6.29 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.29 cfg: BLA=y DAT=n DEBUG=y NC=y MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.29 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=n * wrong namespace symbols next linux-2.6.30 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.30 cfg: BLA=y DAT=n DEBUG=y NC=y MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.30 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=n * wrong namespace symbols next linux-2.6.31 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.31 cfg: BLA=y DAT=n DEBUG=y NC=y MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.31 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=n * wrong namespace symbols next linux-2.6.32 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.32 cfg: BLA=y DAT=n DEBUG=y NC=y MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.32 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=n Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- Documentation/ABI/testing/sysfs-class-net-batman-adv | 17 Documentation/networking/batman-adv.txt | 2 net/batman-adv/Kconfig | 16 net/batman-adv/Makefile | 5 net/batman-adv/bat_algo.h | 30 net/batman-adv/bat_iv_ogm.c | 115 - net/batman-adv/bat_v.c | 347 ---- net/batman-adv/bat_v_elp.c | 513 ------ 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/bitarray.c | 14 net/batman-adv/bitarray.h | 14 net/batman-adv/bridge_loop_avoidance.c | 329 +-- net/batman-adv/bridge_loop_avoidance.h | 2 net/batman-adv/debugfs.c | 8 net/batman-adv/debugfs.h | 2 net/batman-adv/distributed-arp-table.c | 100 - net/batman-adv/distributed-arp-table.h | 2 net/batman-adv/fragmentation.c | 34 net/batman-adv/fragmentation.h | 4 net/batman-adv/gateway_client.c | 127 - net/batman-adv/gateway_client.h | 2 net/batman-adv/gateway_common.c | 8 net/batman-adv/gateway_common.h | 4 net/batman-adv/hard-interface.c | 54 net/batman-adv/hard-interface.h | 30 net/batman-adv/hash.c | 2 net/batman-adv/hash.h | 24 net/batman-adv/icmp_socket.c | 10 net/batman-adv/icmp_socket.h | 2 net/batman-adv/main.c | 112 - net/batman-adv/main.h | 39 net/batman-adv/multicast.c | 44 net/batman-adv/multicast.h | 4 net/batman-adv/network-coding.c | 171 -- net/batman-adv/network-coding.h | 2 net/batman-adv/originator.c | 360 ++-- net/batman-adv/originator.h | 19 net/batman-adv/packet.h | 68 net/batman-adv/routing.c | 112 - net/batman-adv/routing.h | 5 net/batman-adv/send.c | 98 - net/batman-adv/send.h | 16 net/batman-adv/soft-interface.c | 73 net/batman-adv/soft-interface.h | 4 net/batman-adv/sysfs.c | 162 - net/batman-adv/sysfs.h | 2 net/batman-adv/translation-table.c | 349 +--- net/batman-adv/translation-table.h | 2 net/batman-adv/types.h | 160 - 51 files changed, 1008 insertions(+), 3513 deletions(-) sparse next linux-2.6.32 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=n ------------------------------------------------------------------------- In file included from /home/build_test/build_env/tmp/net/batman-adv/types.h:25:0, from /home/build_test/build_env/tmp/net/batman-adv/main.h:187, from /home/build_test/build_env/tmp/net/batman-adv/bat_iv_ogm.c:19: /home/build_test/build_env/tmp/net/batman-adv/types.h: In function 'ewma_throughput_init': /home/build_test/build_env/tmp/compat-include/linux/average.h:37:47: error: implicit declaration of function 'BUILD_BUG_ON_NOT_POWER_OF_2' [-Werror=implicit-function-declaration] static inline void ewma_##name##_init(struct ewma_##name *e) \ ^ /home/build_test/build_env/tmp/net/batman-adv/types.h:386:1: note: in expansion of macro 'DECLARE_EWMA' DECLARE_EWMA(throughput, 1024, 8) ^ cc1: some warnings being treated as errors make[2]: *** [/home/build_test/build_env/tmp/net/batman-adv/bat_iv_ogm.o] Error 1 make[1]: *** [_module_/home/build_test/build_env/tmp/net/batman-adv] Error 2 make: *** [all] Error 2 wrong namespace symbols next linux-2.6.32 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=n --------------------------------------------------------------------------- nm: './net/batman-adv/*.o': No such file

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160127
by batman＠open-mesh.org 27 Jan '16

27 Jan '16

The following commit has been merged in the master branch: commit 772950ed21c36f4157ff34e7d10fb61975f64558 Merge: 587198ba5206cdf0d30855f7361af950a4172cd6 01b9b0b28626db4a47d7f48744d70abca9914ef1 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Sun Jan 24 12:31:12 2016 -0800 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 Pull SMB3 fixes from Steve French: "A collection of CIFS/SMB3 fixes. It includes a couple bug fixes, a few for improved debugging of cifs.ko and some improvements to the way cifs does key generation. I do have some additional bug fixes I expect in the next week or two (to address a problem found by xfstest, and some fixes for SMB3.11 dialect, and a couple patches that just came in yesterday that I am reviewing)" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: cifs_dbg() outputs an uninitialized buffer in cifs_readdir() cifs: fix race between call_async() and reconnect() Prepare for encryption support (first part). Add decryption and encryption key generation. Thanks to Metze for helping with this. cifs: Allow using O_DIRECT with cache=loose cifs: Make echo interval tunable cifs: Check uniqueid for SMB2+ and return -ESTALE if necessary Print IP address of unresponsive server cifs: Ratelimit kernel log messages diff --combined fs/cifs/cifsfs.c index e24ca79,565a4c0..c48ca13 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@@ -507,6 -507,8 +507,8 @@@ cifs_show_options(struct seq_file *s, s seq_printf(s, ",rsize=%u", cifs_sb->rsize); seq_printf(s, ",wsize=%u", cifs_sb->wsize); + seq_printf(s, ",echo_interval=%lu", + tcon->ses->server->echo_interval / HZ); /* convert actimeo and display it in seconds */ seq_printf(s, ",actimeo=%lu", cifs_sb->actimeo / HZ); @@@ -640,9 -642,9 +642,9 @@@ cifs_get_root(struct smb_vol *vol, stru while (*s && *s != sep) s++; - mutex_lock(&dir->i_mutex); + inode_lock(dir); child = lookup_one_len(p, dentry, s - p); - mutex_unlock(&dir->i_mutex); + inode_unlock(dir); dput(dentry); dentry = child; } while (!IS_ERR(dentry)); @@@ -752,6 -754,9 +754,9 @@@ cifs_loose_read_iter(struct kiocb *iocb ssize_t rc; struct inode *inode = file_inode(iocb->ki_filp); + if (iocb->ki_filp->f_flags & O_DIRECT) + return cifs_user_readv(iocb, iter); + rc = cifs_revalidate_mapping(inode); if (rc) return rc; @@@ -766,6 -771,18 +771,18 @@@ static ssize_t cifs_file_write_iter(str ssize_t written; int rc; + if (iocb->ki_filp->f_flags & O_DIRECT) { + written = cifs_user_writev(iocb, from); + if (written > 0 && CIFS_CACHE_READ(cinode)) { + cifs_zap_mapping(inode); + cifs_dbg(FYI, + "Set no oplock for inode=%p after a write operation\n", + inode); + cinode->oplock = 0; + } + return written; + } + written = cifs_get_writer(cinode); if (written) return written; @@@ -1092,7 -1109,7 +1109,7 @@@ cifs_init_inodecache(void cifs_inode_cachep = kmem_cache_create("cifs_inode_cache", sizeof(struct cifsInodeInfo), 0, (SLAB_RECLAIM_ACCOUNT| - SLAB_MEM_SPREAD), + SLAB_MEM_SPREAD|SLAB_ACCOUNT), cifs_init_once); if (cifs_inode_cachep == NULL) return -ENOMEM; -- LinuxNextTracking

1 0

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

27 Jan '16

--- batman-adv_master.packet.h 2016-01-28 00:05:01.182623779 +0100 +++ batctl_master.packet.h 2016-01-28 00:05:01.190624311 +0100 @@ -26,8 +26,6 @@ * @BATADV_IV_OGM: originator messages for B.A.T.M.A.N. IV * @BATADV_BCAST: broadcast packets carrying broadcast payload * @BATADV_CODED: network coded packets - * @BATADV_ELP: echo location packets for B.A.T.M.A.N. V - * @BATADV_OGM2: originator messages for B.A.T.M.A.N. V * * @BATADV_UNICAST: unicast packets carrying unicast payload traffic * @BATADV_UNICAST_FRAG: unicast packets carrying a fragment of the original @@ -42,8 +40,6 @@ BATADV_IV_OGM = 0x00, BATADV_BCAST = 0x01, BATADV_CODED = 0x02, - BATADV_ELP = 0x03, - BATADV_OGM2 = 0x04, /* 0x40 - 0x7f: unicast */ #define BATADV_UNICAST_MIN 0x40 BATADV_UNICAST = 0x40, @@ -239,51 +235,6 @@ #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) /** - * struct batadv_ogm2_packet - ogm2 (routing protocol) packet - * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the general header - * @ttl: time to live for this packet, part of the general header - * @flags: reseved for routing relevant flags - currently always 0 - * @seqno: sequence number - * @orig: originator mac address - * @tvlv_len: length of the appended tvlv buffer (in bytes) - * @throughput: the currently flooded path throughput - */ -struct batadv_ogm2_packet { - u8 packet_type; - u8 version; - u8 ttl; - u8 flags; - __be32 seqno; - u8 orig[ETH_ALEN]; - __be16 tvlv_len; - __be32 throughput; - /* __packed is not needed as the struct size is divisible by 4, - * and the largest data type in this struct has a size of 4. - */ -}; - -#define BATADV_OGM2_HLEN sizeof(struct batadv_ogm2_packet) - -/** - * struct batadv_elp_packet - elp (neighbor discovery) packet - * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @orig: originator mac address - * @seqno: sequence number - * @elp_interval: currently used ELP sending interval in ms - */ -struct batadv_elp_packet { - u8 packet_type; - u8 version; - u8 orig[ETH_ALEN]; - __be32 seqno; - __be32 elp_interval; -}; - -#define BATADV_ELP_HLEN sizeof(struct batadv_elp_packet) - -/** * struct batadv_icmp_header - common members among all the ICMP packets * @packet_type: batman-adv packet type, part of the general header * @version: batman-adv protocol version, part of the genereal header

1 0

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

27 Jan '16

--- batman-adv_next.packet.h 2016-01-28 00:05:01.186624045 +0100 +++ batctl_next.packet.h 2016-01-28 00:05:01.194624577 +0100 @@ -26,8 +26,6 @@ * @BATADV_IV_OGM: originator messages for B.A.T.M.A.N. IV * @BATADV_BCAST: broadcast packets carrying broadcast payload * @BATADV_CODED: network coded packets - * @BATADV_ELP: echo location packets for B.A.T.M.A.N. V - * @BATADV_OGM2: originator messages for B.A.T.M.A.N. V * * @BATADV_UNICAST: unicast packets carrying unicast payload traffic * @BATADV_UNICAST_FRAG: unicast packets carrying a fragment of the original @@ -42,8 +40,6 @@ BATADV_IV_OGM = 0x00, BATADV_BCAST = 0x01, BATADV_CODED = 0x02, - BATADV_ELP = 0x03, - BATADV_OGM2 = 0x04, /* 0x40 - 0x7f: unicast */ #define BATADV_UNICAST_MIN 0x40 BATADV_UNICAST = 0x40, @@ -239,51 +235,6 @@ #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) /** - * struct batadv_ogm2_packet - ogm2 (routing protocol) packet - * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the general header - * @ttl: time to live for this packet, part of the general header - * @flags: reseved for routing relevant flags - currently always 0 - * @seqno: sequence number - * @orig: originator mac address - * @tvlv_len: length of the appended tvlv buffer (in bytes) - * @throughput: the currently flooded path throughput - */ -struct batadv_ogm2_packet { - u8 packet_type; - u8 version; - u8 ttl; - u8 flags; - __be32 seqno; - u8 orig[ETH_ALEN]; - __be16 tvlv_len; - __be32 throughput; - /* __packed is not needed as the struct size is divisible by 4, - * and the largest data type in this struct has a size of 4. - */ -}; - -#define BATADV_OGM2_HLEN sizeof(struct batadv_ogm2_packet) - -/** - * struct batadv_elp_packet - elp (neighbor discovery) packet - * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @orig: originator mac address - * @seqno: sequence number - * @elp_interval: currently used ELP sending interval in ms - */ -struct batadv_elp_packet { - u8 packet_type; - u8 version; - u8 orig[ETH_ALEN]; - __be32 seqno; - __be32 elp_interval; -}; - -#define BATADV_ELP_HLEN sizeof(struct batadv_elp_packet) - -/** * struct batadv_icmp_header - common members among all the ICMP packets * @packet_type: batman-adv packet type, part of the general header * @version: batman-adv protocol version, part of the genereal header

1 0

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

27 Jan '16

--- batman-adv_maint.packet.h 2016-01-28 00:05:01.186624045 +0100 +++ batctl_maint.packet.h 2016-01-28 00:05:01.198624844 +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-01-27
by postmaster＠open-mesh.org 27 Jan '16

27 Jan '16

Name of failed tests ==================== * difference between net-next and batadv next * sparse master linux-2.6.29 cfg: BLA=n DAT=n DEBUG=n NC=y MCAST=y BATMAN_V=n * sparse master linux-2.6.29 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=y BATMAN_V=n * sparse master linux-2.6.30 cfg: BLA=n DAT=n DEBUG=n NC=y MCAST=y BATMAN_V=n * sparse master linux-2.6.30 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=y BATMAN_V=n * sparse master linux-2.6.31 cfg: BLA=n DAT=n DEBUG=n NC=y MCAST=y BATMAN_V=n * sparse master linux-2.6.31 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=y BATMAN_V=n * sparse master linux-2.6.32 cfg: BLA=n DAT=n DEBUG=n NC=y MCAST=y BATMAN_V=n * sparse master linux-2.6.32 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=y BATMAN_V=n * sparse next linux-2.6.29 cfg: BLA=n DAT=n DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse next linux-2.6.29 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse next linux-2.6.30 cfg: BLA=n DAT=n DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse next linux-2.6.30 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse next linux-2.6.31 cfg: BLA=n DAT=n DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse next linux-2.6.31 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse next linux-2.6.32 cfg: BLA=n DAT=n DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse next linux-2.6.32 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * wrong namespace symbols master linux-2.6.29 cfg: BLA=n DAT=n DEBUG=n NC=y MCAST=y BATMAN_V=n * wrong namespace symbols master linux-2.6.29 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=y BATMAN_V=n * wrong namespace symbols master linux-2.6.30 cfg: BLA=n DAT=n DEBUG=n NC=y MCAST=y BATMAN_V=n * wrong namespace symbols master linux-2.6.30 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=y BATMAN_V=n * wrong namespace symbols master linux-2.6.31 cfg: BLA=n DAT=n DEBUG=n NC=y MCAST=y BATMAN_V=n * wrong namespace symbols master linux-2.6.31 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=y BATMAN_V=n * wrong namespace symbols master linux-2.6.32 cfg: BLA=n DAT=n DEBUG=n NC=y MCAST=y BATMAN_V=n * wrong namespace symbols master linux-2.6.32 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=y BATMAN_V=n * wrong namespace symbols next linux-2.6.29 cfg: BLA=n DAT=n DEBUG=y NC=n MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.29 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.30 cfg: BLA=n DAT=n DEBUG=y NC=n MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.30 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.31 cfg: BLA=n DAT=n DEBUG=y NC=n MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.31 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.32 cfg: BLA=n DAT=n DEBUG=y NC=n MCAST=n BATMAN_V=n * wrong namespace symbols next linux-2.6.32 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- Documentation/ABI/testing/sysfs-class-net-batman-adv | 17 Documentation/networking/batman-adv.txt | 2 net/batman-adv/Kconfig | 16 net/batman-adv/Makefile | 5 net/batman-adv/bat_algo.h | 30 net/batman-adv/bat_iv_ogm.c | 115 - net/batman-adv/bat_v.c | 347 ---- net/batman-adv/bat_v_elp.c | 513 ------ 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/bitarray.c | 14 net/batman-adv/bitarray.h | 14 net/batman-adv/bridge_loop_avoidance.c | 329 +-- net/batman-adv/bridge_loop_avoidance.h | 2 net/batman-adv/debugfs.c | 8 net/batman-adv/debugfs.h | 2 net/batman-adv/distributed-arp-table.c | 100 - net/batman-adv/distributed-arp-table.h | 2 net/batman-adv/fragmentation.c | 34 net/batman-adv/fragmentation.h | 4 net/batman-adv/gateway_client.c | 127 - net/batman-adv/gateway_client.h | 2 net/batman-adv/gateway_common.c | 8 net/batman-adv/gateway_common.h | 4 net/batman-adv/hard-interface.c | 54 net/batman-adv/hard-interface.h | 30 net/batman-adv/hash.c | 2 net/batman-adv/hash.h | 24 net/batman-adv/icmp_socket.c | 10 net/batman-adv/icmp_socket.h | 2 net/batman-adv/main.c | 112 - net/batman-adv/main.h | 39 net/batman-adv/multicast.c | 44 net/batman-adv/multicast.h | 4 net/batman-adv/network-coding.c | 171 -- net/batman-adv/network-coding.h | 2 net/batman-adv/originator.c | 360 ++-- net/batman-adv/originator.h | 19 net/batman-adv/packet.h | 68 net/batman-adv/routing.c | 112 - net/batman-adv/routing.h | 5 net/batman-adv/send.c | 98 - net/batman-adv/send.h | 16 net/batman-adv/soft-interface.c | 73 net/batman-adv/soft-interface.h | 4 net/batman-adv/sysfs.c | 162 - net/batman-adv/sysfs.h | 2 net/batman-adv/translation-table.c | 349 +--- net/batman-adv/translation-table.h | 2 net/batman-adv/types.h | 160 - 51 files changed, 1008 insertions(+), 3513 deletions(-) sparse next linux-2.6.32 cfg: BLA=n DAT=n DEBUG=y NC=n MCAST=n BATMAN_V=n ------------------------------------------------------------------------- In file included from /home/build_test/build_env/tmp/net/batman-adv/types.h:25:0, from /home/build_test/build_env/tmp/net/batman-adv/main.h:187, from /home/build_test/build_env/tmp/net/batman-adv/bat_iv_ogm.c:19: /home/build_test/build_env/tmp/net/batman-adv/types.h: In function 'ewma_throughput_init': /home/build_test/build_env/tmp/compat-include/linux/average.h:37:47: error: implicit declaration of function 'BUILD_BUG_ON_NOT_POWER_OF_2' [-Werror=implicit-function-declaration] static inline void ewma_##name##_init(struct ewma_##name *e) \ ^ /home/build_test/build_env/tmp/net/batman-adv/types.h:386:1: note: in expansion of macro 'DECLARE_EWMA' DECLARE_EWMA(throughput, 1024, 8) ^ cc1: some warnings being treated as errors make[2]: *** [/home/build_test/build_env/tmp/net/batman-adv/bat_iv_ogm.o] Error 1 make[1]: *** [_module_/home/build_test/build_env/tmp/net/batman-adv] Error 2 make: *** [all] Error 2 wrong namespace symbols next linux-2.6.32 cfg: BLA=n DAT=n DEBUG=y NC=n MCAST=n BATMAN_V=n --------------------------------------------------------------------------- nm: './net/batman-adv/*.o': No such file

1 0

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

26 Jan '16

--- batman-adv_master.packet.h 2016-01-27 00:05:02.109013194 +0100 +++ batctl_master.packet.h 2016-01-27 00:05:02.117013732 +0100 @@ -26,8 +26,6 @@ * @BATADV_IV_OGM: originator messages for B.A.T.M.A.N. IV * @BATADV_BCAST: broadcast packets carrying broadcast payload * @BATADV_CODED: network coded packets - * @BATADV_ELP: echo location packets for B.A.T.M.A.N. V - * @BATADV_OGM2: originator messages for B.A.T.M.A.N. V * * @BATADV_UNICAST: unicast packets carrying unicast payload traffic * @BATADV_UNICAST_FRAG: unicast packets carrying a fragment of the original @@ -42,8 +40,6 @@ BATADV_IV_OGM = 0x00, BATADV_BCAST = 0x01, BATADV_CODED = 0x02, - BATADV_ELP = 0x03, - BATADV_OGM2 = 0x04, /* 0x40 - 0x7f: unicast */ #define BATADV_UNICAST_MIN 0x40 BATADV_UNICAST = 0x40, @@ -239,51 +235,6 @@ #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) /** - * struct batadv_ogm2_packet - ogm2 (routing protocol) packet - * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the general header - * @ttl: time to live for this packet, part of the general header - * @flags: reseved for routing relevant flags - currently always 0 - * @seqno: sequence number - * @orig: originator mac address - * @tvlv_len: length of the appended tvlv buffer (in bytes) - * @throughput: the currently flooded path throughput - */ -struct batadv_ogm2_packet { - u8 packet_type; - u8 version; - u8 ttl; - u8 flags; - __be32 seqno; - u8 orig[ETH_ALEN]; - __be16 tvlv_len; - __be32 throughput; - /* __packed is not needed as the struct size is divisible by 4, - * and the largest data type in this struct has a size of 4. - */ -}; - -#define BATADV_OGM2_HLEN sizeof(struct batadv_ogm2_packet) - -/** - * struct batadv_elp_packet - elp (neighbor discovery) packet - * @packet_type: batman-adv packet type, part of the general header - * @version: batman-adv protocol version, part of the genereal header - * @orig: originator mac address - * @seqno: sequence number - * @elp_interval: currently used ELP sending interval in ms - */ -struct batadv_elp_packet { - u8 packet_type; - u8 version; - u8 orig[ETH_ALEN]; - __be32 seqno; - __be32 elp_interval; -}; - -#define BATADV_ELP_HLEN sizeof(struct batadv_elp_packet) - -/** * struct batadv_icmp_header - common members among all the ICMP packets * @packet_type: batman-adv packet type, part of the general header * @version: batman-adv protocol version, part of the genereal header

1 0

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

26 Jan '16

--- batman-adv_maint.packet.h 2016-01-27 00:05:02.113013463 +0100 +++ batctl_maint.packet.h 2016-01-27 00:05:02.121014001 +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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge January 2016