From: David S. Miller Date: Thu, 19 Dec 2019 22:20:47 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf X-Git-Tag: v5.5-rc3~7^2~18 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0fd260056ef84ede8f444c66a3820811691fe884;p=linux-2.6-block.git Merge git://git./pub/scm/linux/kernel/git/bpf/bpf Daniel Borkmann says: ==================== pull-request: bpf 2019-12-19 The following pull-request contains BPF updates for your *net* tree. We've added 10 non-merge commits during the last 8 day(s) which contain a total of 21 files changed, 269 insertions(+), 108 deletions(-). The main changes are: 1) Fix lack of synchronization between xsk wakeup and destroying resources used by xsk wakeup, from Maxim Mikityanskiy. 2) Fix pruning with tail call patching, untrack programs in case of verifier error and fix a cgroup local storage tracking bug, from Daniel Borkmann. 3) Fix clearing skb->tstamp in bpf_redirect() when going from ingress to egress which otherwise cause issues e.g. on fq qdisc, from Lorenz Bauer. 4) Fix compile warning of unused proc_dointvec_minmax_bpf_restricted() when only cBPF is present, from Alexander Lobakin. ==================== Signed-off-by: David S. Miller --- 0fd260056ef84ede8f444c66a3820811691fe884