linux/drivers/net/ethernet/marvell/mvpp2
Jakub Kicinski 44a8c4f33c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
We got slightly different patches removing a double word
in a comment in net/ipv4/raw.c - picked the version from net.

Simple conflict in drivers/net/ethernet/ibm/ibmvnic.c. Use cached
values instead of VNIC login response buffer (following what
commit 507ebe6444 ("ibmvnic: Fix use-after-free of VNIC login
response buffer") did).

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2020-09-04 21:28:59 -07:00
..
Makefile net: mvpp2: add a debugfs interface for the Header Parser 2018-07-16 00:10:00 -07:00
mvpp2_cls.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
mvpp2_cls.h net: mvpp2: cls: Add steering based on vlan Id and priority. 2019-06-18 22:26:05 -04:00
mvpp2_debugfs.c mvpp2: no need to check return value of debugfs_create functions 2019-08-10 15:25:48 -07:00
mvpp2_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-04 21:28:59 -07:00
mvpp2_prs.c net: mvpp2: prs: Don't override the sign bit in SRAM parser shift 2019-06-28 14:44:03 -07:00
mvpp2_prs.h net: mvpp2: debugfs: add hit counter stats for Header Parser entries 2018-07-16 00:10:01 -07:00
mvpp2.h net: mvpp2: convert to phylink pcs operations 2020-09-03 14:52:33 -07:00