kernel/git/next/linux-next.git/samples, branch akpm-base

Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git

2022-06-28T05:41:14+00:00

# Conflicts: # Makefile # include/uapi/linux/android/binder.h

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git

2022-06-28T01:09:17+00:00

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git

2022-06-28T01:09:16+00:00

# Conflicts: # arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts

Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git

2022-06-27T22:56:31+00:00

fprobe, samples: Add module parameter descriptions

2022-06-24T22:23:04+00:00

Add module parameter descriptions for the fprobe_example module. Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/165602349520.56016.1314423560740428008.stgit@devnote2

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2022-06-23T19:33:24+00:00

No conflicts. Signed-off-by: Jakub Kicinski

samples/bpf: fixup some tools to be able to support xdp multibuffer

2022-06-22T01:55:53+00:00

This changes the section name for the bpf program embedded in these files to "xdp.frags" to allow the programs to be loaded on drivers that are using an MTU greater than PAGE_SIZE. Rather than directly accessing the buffers, the packet data is now accessed via xdp helper functions to provide an example for those who may need to write more complex programs. v2: remove new unnecessary variable Signed-off-by: Andy Gospodarek Acked-by: John Fastabend Acked-by: Lorenzo Bianconi Link: https://lore.kernel.org/r/20220621175402.35327-1-gospo@broadcom.com Signed-off-by: Alexei Starovoitov

fprobe, samples: Add use_trace option and show hit/missed counter

2022-06-17T19:53:29+00:00

Add use_trace option to use trace_printk() instead of pr_info() so that the handler doesn't involve the RCU operations. And show the hit and missed counter so that the user can check how many times the probe handler hit and missed. Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Daniel Borkmann Acked-by: Jiri Olsa Link: https://lore.kernel.org/bpf/165461826247.280167.11939123218334322352.stgit@devnote2

samples/bpf: Check detach prog exist or not in xdp_fwd

2022-06-16T00:26:20+00:00

Before detach the prog, we should check detach prog exist or not. Signed-off-by: Zhengchao Shao Signed-off-by: Andrii Nakryiko Reviewed-by: Toke Høiland-Jørgensen Link: https://lore.kernel.org/bpf/20220606005425.261967-1-shaozhengchao@huawei.com

treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 2)

2022-06-10T12:51:36+00:00

Based on the normalized pattern: this program is free software you may redistribute it and/or modify it under the terms of the gnu general public license as published by the free software foundation version 2 of the license the software is provided as is without warranty of any kind express or implied including but not limited to the warranties of merchantability fitness for a particular purpose and noninfringement in no event shall the authors or copyright holders be liable for any claim damages or other liability whether in an action of contract tort or otherwise arising from out of or in connection with the software or the use or other dealings in the software extracted by the scancode license scanner the SPDX license identifier GPL-2.0-only has been chosen to replace the boilerplate/reference. Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman