| commit | 7bed14551659875e1cd23a7c0266394a29a773b3 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jun 25 19:29:51 2020 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jun 25 19:29:51 2020 -0700 |
| tree | 2bbd8b1b2b1610d2e48a71bf7bb5f41ac5e1d0ef | |
| parent | b8392808eb3fc28e523e28cb258c81ca246deb9b [diff] | |
| parent | 4a21185cda0fbb860580eeeb4f1a70a9cda332a4 [diff] |
Merge git://git.kernel.org/pub/scm/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>