git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Tue, 14 Jul 2015 00:28:09 +0000 (17:28 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 14 Jul 2015 00:28:09 +0000 (17:28 -0700)
commit	f158dd95ae31513da73a465d9d92dd71630a10ca
tree	606426ab4de84e59c5f50e1e3cce6e24819d45af	tree \| snapshot
parent	9aa282e059ebc500e32a0d95aa6195a416cf29e9	commit \| diff
parent	ca40813f64c42855b9c627a111fb93aedd2e3a19	commit \| diff

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

Conflicts:
net/bridge/br_mdb.c

Minor conflict in br_mdb.c, in 'net' we added a memset of the
on-stack 'ip' variable whereas in 'net-next' we assign a new
member 'vid'.

Signed-off-by: David S. Miller <davem@davemloft.net>

net/bridge/br_mdb.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

net/bridge/br_mdb.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history