mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
f8ddadc4db
There were quite a few overlapping sets of changes here. Daniel's bug fix for off-by-ones in the new BPF branch instructions, along with the added allowances for "data_end > ptr + x" forms collided with the metadata additions. Along with those three changes came veritifer test cases, which in their final form I tried to group together properly. If I had just trimmed GIT's conflict tags as-is, this would have split up the meta tests unnecessarily. In the socketmap code, a set of preemption disabling changes overlapped with the rename of bpf_compute_data_end() to bpf_compute_data_pointers(). Changes were made to the mv88e6060.c driver set addr method which got removed in net-next. The hyperv transport socket layer had a locking change in 'net' which overlapped with a change of socket state macro usage in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| bpf | ||
| flower | ||
| nfpcore | ||
| nic | ||
| Makefile | ||
| nfp_app.c | ||
| nfp_app.h | ||
| nfp_app_nic.c | ||
| nfp_asm.c | ||
| nfp_asm.h | ||
| nfp_devlink.c | ||
| nfp_hwmon.c | ||
| nfp_main.c | ||
| nfp_main.h | ||
| nfp_net.h | ||
| nfp_net_common.c | ||
| nfp_net_ctrl.h | ||
| nfp_net_debugfs.c | ||
| nfp_net_ethtool.c | ||
| nfp_net_main.c | ||
| nfp_net_repr.c | ||
| nfp_net_repr.h | ||
| nfp_net_sriov.c | ||
| nfp_net_sriov.h | ||
| nfp_netvf_main.c | ||
| nfp_port.c | ||
| nfp_port.h | ||