From: David S. Miller <davem@davemloft.net>
Date: Wed, 10 Mar 2021 02:07:05 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
X-Git-Tag: accepted/tizen/unified/20230118.172025~7335^2~619
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1acda9807e2bbe1d2026b44f37d959d6d8266c8;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./linux/kernel/git/bpf/bpf-next

Alexei Starovoitov says:

====================
pull-request: bpf-next 2021-03-09

The following pull-request contains BPF updates for your *net-next* tree.

We've added 90 non-merge commits during the last 17 day(s) which contain
a total of 114 files changed, 5158 insertions(+), 1288 deletions(-).

The main changes are:

1) Faster bpf_redirect_map(), from Björn.

2) skmsg cleanup, from Cong.

3) Support for floating point types in BTF, from Ilya.

4) Documentation for sys_bpf commands, from Joe.

5) Support for sk_lookup in bpf_prog_test_run, form Lorenz.

6) Enable task local storage for tracing programs, from Song.

7) bpf_for_each_map_elem() helper, from Yonghong.
====================

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

c1acda9807e2bbe1d2026b44f37d959d6d8266c8
diff --cc include/linux/netdevice.h
index 5b67ea89,6cef47b..b379d08
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -1583,13 -1587,8 +1587,14 @@@ enum netdev_priv_flags 
  #define IFF_FAILOVER_SLAVE		IFF_FAILOVER_SLAVE
  #define IFF_L3MDEV_RX_HANDLER		IFF_L3MDEV_RX_HANDLER
  #define IFF_LIVE_RENAME_OK		IFF_LIVE_RENAME_OK
+ #define IFF_TX_SKB_NO_LINEAR		IFF_TX_SKB_NO_LINEAR
  
 +/* Specifies the type of the struct net_device::ml_priv pointer */
 +enum netdev_ml_priv_type {
 +	ML_PRIV_NONE,
 +	ML_PRIV_CAN,
 +};
 +
  /**
   *	struct net_device - The DEVICE structure.
   *