From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 8 Oct 2020 19:05:37 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cfe90f4980ee27ebfa24e4c4b3cd56dc9b67ef42;p=linux.git

Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2020-10-08

The main changes are:

1) Fix "unresolved symbol" build error under CONFIG_NET w/o CONFIG_INET due
   to missing tcp_timewait_sock and inet_timewait_sock BTF, from Yonghong Song.

2) Fix 32 bit sub-register bounds tracking for OR case, from Daniel Borkmann.
====================

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

cfe90f4980ee27ebfa24e4c4b3cd56dc9b67ef42