Alex Shi 2120557722 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ...

Conflicts:
	arch/arm64/kernel/armv8_deprecated.c
	arch/arm64/kernel/efi.c
	arch/arm64/kernel/entry.S
	arch/arm64/kernel/head.S
	arch/arm64/kernel/hw_breakpoint.c
	arch/arm64/mm/mmu.c
	include/linux/memblock.h
	mm/memblock.c

2017-07-11 16:22:22 +08:00

..

netfilter

netfilter: remove hook owner refcounting

2015-10-16 18:21:39 +02:00

br_device.c

Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common

2016-02-18 00:20:12 +05:30

br_fdb.c

bridge: Don't insert unnecessary local fdb entry on changing mac address

2016-06-24 10:18:17 -07:00

br_forward.c

bridge: set is_local and is_static before fdb entry is added to the fdb hashtable

2015-10-30 12:13:05 +09:00

br_if.c

bridge: defer switchdev fdb del call in fdb_del_external_learn

2015-10-15 06:09:50 -07:00

br_input.c

bridge: drop netfilter fake rtable unconditionally

2017-03-22 12:04:17 +01:00

br_ioctl.c

net: bridge: fix old ioctl unlocked net device walk

2016-05-18 17:06:42 -07:00

br_mdb.c

bridge: vlan: add per-vlan struct and move to rhashtables

2015-09-29 13:36:06 -07:00

br_multicast.c

bridge: multicast: restore perm router ports on multicast enable

2016-11-15 07:46:38 +01:00

br_netfilter_hooks.c

bridge: drop netfilter fake rtable unconditionally

2017-03-22 12:04:17 +01:00

br_netfilter_ipv6.c

bridge: Pass net into br_validate_ipv4 and br_validate_ipv6

2015-09-29 20:21:32 +02:00

br_netlink.c

bridge: netlink: check vlan_default_pvid range

2017-06-07 12:05:58 +02:00

br_nf_core.c

net: Remove protocol from struct dst_ops

2015-03-09 16:06:10 -04:00

br_private_stp.h

net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

br_private.h

Bridge: Fix ipv6 mc snooping if bridge has no ipv6 address

2016-07-11 09:31:11 -07:00

br_stp_bpdu.c

netfilter: Pass net into okfn

2015-09-17 17:18:37 -07:00

br_stp_if.c

net: bridge: start hello timer only if device is up

2017-06-14 13:16:19 +02:00

br_stp_timer.c

bridge: start hello_timer when enabling KERNEL_STP in br_stp_start

2017-06-07 12:05:58 +02:00

br_stp.c

bridge: Allow set bridge ageing time when switchdev disabled

2016-04-20 15:42:05 +09:00

br_sysfs_br.c

bridge: fix gc_timer mod/del race condition

2015-10-13 04:50:17 -07:00

br_sysfs_if.c

bridge: vlan: flush the dynamically learned entries on port vlan delete

2015-06-24 05:40:55 -07:00

br_vlan.c

bridge: vlan: Use rcu_dereference instead of rtnl_dereference

2015-11-02 16:27:39 -05:00

br.c

switchdev: Require RTNL mutex to be held when sending FDB notifications

2016-03-03 15:07:04 -08:00

Kconfig

bridge: Add vlan filtering infrastructure

2013-02-13 19:41:46 -05:00

Makefile

netfilter: bridge: split ipv6 code into separated file

2015-06-18 21:14:21 +02:00