git.osdn.net Git - tomoyo/tomoyo-test1.git/commit

(root) / tomoyo / tomoyo-test1.git / commit

author	David S. Miller <davem@davemloft.net>
	Fri, 26 Jun 2020 02:29:51 +0000 (19:29 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 26 Jun 2020 02:29:51 +0000 (19:29 -0700)
commit	7bed14551659875e1cd23a7c0266394a29a773b3
tree	2bbd8b1b2b1610d2e48a71bf7bb5f41ac5e1d0ef	tree \| snapshot
parent	b8392808eb3fc28e523e28cb258c81ca246deb9b	commit \| diff
parent	4a21185cda0fbb860580eeeb4f1a70a9cda332a4	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

Minor overlapping changes in xfrm_device.c, between the double
ESP trailing bug fix setting the XFRM_INIT flag and the changes
in net-next preparing for bonding encryption support.

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

31 files changed:

drivers/net/dsa/sja1105/sja1105_vl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/sge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/enetc/enetc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/enetc/enetc_hw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/flower/offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mscc/mscc_macsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phylink.c	diff1 \|	diff2 \|	blob \| history
drivers/of/of_mdio.c	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
include/net/flow_offload.h	diff1 \|	diff2 \|	blob \| history
include/net/xfrm.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_private.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/ioctl.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.h	diff1 \|	diff2 \|	blob \| history
net/sched/act_gate.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_api.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_cake.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_device.c	diff1 \|	diff2 \|	blob \| history

This is a test repository.

RSS Atom

About OSDN

Find Software

Develop Software

Help

drivers/net/dsa/sja1105/sja1105_vl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/sge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/enetc/enetc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/enetc/enetc_hw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/flower/offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mscc/mscc_macsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phylink.c	diff1 \|	diff2 \|	blob \| history
drivers/of/of_mdio.c	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
include/net/flow_offload.h	diff1 \|	diff2 \|	blob \| history
include/net/xfrm.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_private.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/ioctl.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.h	diff1 \|	diff2 \|	blob \| history
net/sched/act_gate.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_api.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_cake.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_device.c	diff1 \|	diff2 \|	blob \| history