summaryrefslogtreecommitdiffstats
path: root/kernel/bpf/inode.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-26 11:16:46 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-26 11:16:46 +0200
commitd842bc6c0579ca7643eed029beabab3ac562a335 (patch)
tree6e1f1521efe88b095b14a759ea15aa81e7b0e33f /kernel/bpf/inode.c
parent8e6cb5d27e8246d9c986ec162d066a502d2b602b (diff)
parentff1176468d368232b684f75e82563369208bc371 (diff)
downloadlinux-d842bc6c0579ca7643eed029beabab3ac562a335.tar.bz2
Merge v5.14-rc3 into usb-next
We need the fixes in here, and this resolves a merge issue with drivers/usb/dwc3/gadget.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/bpf/inode.c')
0 files changed, 0 insertions, 0 deletions