Jon Maloy 36c0a9dfc6 tipc: fix rebasing error ...

In commit 2f487712b8 ("tipc: guarantee that group broadcast doesn't
bypass group unicast") there was introduced a last-minute rebasing
error that broke non-group communication.

We fix this here.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2017-10-16 21:28:36 +01:00

..

6lowpan

…

9p

…

802

…

8021q

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-10-05 18:19:22 -07:00

appletalk

…

atm

…

ax25

…

batman-adv

Merge tag 'batadv-next-for-davem-20171006' of git://git.open-mesh.org/linux-merge

2017-10-06 10:12:52 -07:00

bluetooth

Revert "Bluetooth: Add option for disabling legacy ioctl interfaces"

2017-09-28 13:20:32 -07:00

bpf

bpf: add meta pointer for direct access

2017-09-26 13:36:44 -07:00

bridge

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-10-09 20:11:09 -07:00

caif

…

can

…

ceph

libceph: don't allow bidirectional swap of pg-upmap-items

2017-09-19 20:34:29 +02:00

core

net: core: rcu-ify rtnl af_ops

2017-10-16 21:26:40 +01:00

dcb

…

dccp

net: dccp: mark expected switch fall-throughs

2017-10-16 21:15:21 +01:00

decnet

ipv6: only update __use and lastusetime once per jiffy at most

2017-10-16 21:08:30 +01:00

dns_resolver

…

dsa

net: dsa: remove .set_addr

2017-10-14 18:30:06 -07:00

ethernet

…

hsr

…

ieee802154

…

ife

…

ipv4

net: core: rcu-ify rtnl af_ops

2017-10-16 21:26:40 +01:00

ipv6

ipv6: check fn before doing FIB6_SUBTREE(fn)

2017-10-16 21:06:12 +01:00

ipx

…

iucv

…

kcm

kcm: Remove redundant unlikely()

2017-09-26 09:54:06 -07:00

key

…

l2tp

l2tp: fix l2tp_eth module loading

2017-10-01 22:35:07 -07:00

l3mdev

…

lapb

…

llc

…

mac80211

mac80211: don't track HT capability changes

2017-10-13 14:29:02 +02:00

mac802154

mac802154: Fix MAC header and payload encrypted

2017-09-20 13:37:16 +02:00

mpls

ip_tunnel: fix building with NET_IP_TUNNEL=m

2017-10-12 12:21:11 -07:00

ncsi

…

netfilter

netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'

2017-10-09 15:18:04 +02:00

netlabel

…

netlink

netlink: do not set cb_running if dump's start() errs

2017-10-09 10:27:49 -07:00

netrom

…

nfc

net: nfc: llcp_core: use setup_timer() helper.

2017-09-25 13:19:20 -07:00

nsh

…

openvswitch

openvswitch: add ct_clear action

2017-10-10 16:38:34 -07:00

packet

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-10-05 18:19:22 -07:00

phonet

net: phonet: mark phonet_protocol as const

2017-10-07 23:15:08 +01:00

psample

…

qrtr

net: qrtr: Support decoding incoming v2 packets

2017-10-11 15:28:39 -07:00

rds

RDS: IB: Initialize max_items based on underlying device attributes

2017-10-05 21:16:33 -07:00

rfkill

…

rose

…

rxrpc

…

sched

net: sched: propagate q and parent from caller down to tcf_fill_node

2017-10-16 21:00:41 +01:00

sctp

sctp: make array sctp_sched_ops static

2017-10-11 20:18:25 -07:00

smc

net/smc: dev_put for netdev after usage of ib_query_gid()

2017-10-12 12:20:27 -07:00

strparser

…

sunrpc

sunrpc: remove redundant initialization of sock

2017-10-01 18:51:30 -04:00

switchdev

…

tipc

tipc: fix rebasing error

2017-10-16 21:28:36 +01:00

tls

tls: make tls_sw_free_resources static

2017-09-14 09:55:21 -07:00

unix

…

vmw_vsock

VSOCK: add sock_diag interface

2017-10-05 18:44:17 -07:00

wimax

…

wireless

Merge tag 'mac80211-next-for-davem-2017-10-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2017-10-14 18:36:46 -07:00

x25

…

xfrm

xfrm: don't call xfrm_policy_cache_flush under xfrm_state_lock

2017-09-28 09:39:05 +02:00

compat.c

net: compat: assert the size of cmsg copied in is as expected

2017-09-20 15:36:18 -07:00

Kconfig

…

Makefile

…

socket.c

…

sysctl_net.c

…