Merge 5.2-rc6 into for-5.3/block, so we get the same page merge leak fix. Otherwise we end up having conflicts with future patches between for-5.3/block and master that touch this area. In particular, it makes the bio_full() fix hard to backport to stable. * tag 'v5.2-rc6': (482 commits) Linux 5.2-rc6 Revert "iommu/vt-d: Fix lock inversion between iommu->lock and device_domain_lock" Bluetooth: Fix regression with minimum encryption key size alignment tcp: refine memory limit test in tcp_fragment() x86/vdso: Prevent segfaults due to hoisted vclock reads SUNRPC: Fix a credential refcount leak Revert "SUNRPC: Declare RPC timers as TIMER_DEFERRABLE" net :sunrpc :clnt :Fix xps refcount imbalance on the error path NFS4: Only set creation opendata if O_CREAT ARM: 8867/1: vdso: pass --be8 to linker if necessary KVM: nVMX: reorganize initial steps of vmx_set_nested_state KVM: PPC: Book3S HV: Invalidate ERAT when flushing guest TLB entries habanalabs: use u64_to_user_ptr() for reading user pointers nfsd: replace Jeff by Chuck as nfsd co-maintainer inet: clear num_timeout reqsk_alloc() PCI/P2PDMA: Ignore root complex whitelist when an IOMMU is present net: mvpp2: debugfs: Add pmap to fs dump ipv6: Default fib6_type to RTN_UNICAST when not set net: hns3: Fix inconsistent indenting net/af_iucv: always register net_device notifier ...
Showing the changes to include/uapi/linux (4 of 5558 files). Show all
Unified · Split
| @@ -192,6 +192,8 @@ enum bpf_attach_type { · 191 unmodified lines | ||
| 192 | 192 | BPF_LIRC_MODE2, |
| 193 | 193 | BPF_FLOW_DISSECTOR, |
| 194 | 194 | BPF_CGROUP_SYSCTL, |
| 195 | + BPF_CGROUP_UDP4_RECVMSG, | |
| 196 | + BPF_CGROUP_UDP6_RECVMSG, | |
| 195 | 197 | __MAX_BPF_ATTACH_TYPE |
| 196 | 198 | }; |
| 197 | 199 | |
| @@ -3376,8 +3378,8 @@ struct bpf_raw_tracepoint_args { · 3178 unmodified lines | ||
| 3376 | 3378 | /* DIRECT: Skip the FIB rules and go to FIB table associated with device |
| 3377 | 3379 | * OUTPUT: Do lookup from egress perspective; default is ingress |
| 3378 | 3380 | */ |
| 3379 | −#define BPF_FIB_LOOKUP_DIRECT BIT(0) | |
| 3380 | −#define BPF_FIB_LOOKUP_OUTPUT BIT(1) | |
| 3381 | +#define BPF_FIB_LOOKUP_DIRECT (1U << 0) | |
| 3382 | +#define BPF_FIB_LOOKUP_OUTPUT (1U << 1) | |
| 3381 | 3383 | |
| 3382 | 3384 | enum { |
| 3383 | 3385 | BPF_FIB_LKUP_RET_SUCCESS, /* lookup successful */ |
| @@ -1,3 +1,4 @@ | ||
| 1 | +/* SPDX-License-Identifier: GPL-2.0-only */ | |
| 1 | 2 | /* |
| 2 | 3 | * Userspace interface for AMD Secure Encrypted Virtualization (SEV) |
| 3 | 4 | * platform management commands. |
| @@ -7,10 +8,6 @@ · 3 unmodified lines | ||
| 7 | 8 | * Author: Brijesh Singh <brijesh.singh@amd.com> |
| 8 | 9 | * |
| 9 | 10 | * SEV API specification is available at: https://developer.amd.com/sev/ |
| 10 | − * | |
| 11 | − * This program is free software; you can redistribute it and/or modify | |
| 12 | − * it under the terms of the GNU General Public License version 2 as | |
| 13 | − * published by the Free Software Foundation. | |
| 14 | 11 | */ |
| 15 | 12 | |
| 16 | 13 | #ifndef __PSP_SEV_USER_H__ |
| @@ -283,6 +283,7 @@ enum · 282 unmodified lines | ||
| 283 | 283 | LINUX_MIB_TCPACKCOMPRESSED, /* TCPAckCompressed */ |
| 284 | 284 | LINUX_MIB_TCPZEROWINDOWDROP, /* TCPZeroWindowDrop */ |
| 285 | 285 | LINUX_MIB_TCPRCVQDROP, /* TCPRcvQDrop */ |
| 286 | + LINUX_MIB_TCPWQUEUETOOBIG, /* TCPWqueueTooBig */ | |
| 286 | 287 | __LINUX_MIB_MAX |
| 287 | 288 | }; |
| 288 | 289 | |
| @@ -1,11 +1,8 @@ | ||
| 1 | +/* SPDX-License-Identifier: GPL-2.0-only */ | |
| 1 | 2 | /* |
| 2 | 3 | * User API methods for ACPI-WMI mapping driver |
| 3 | 4 | * |
| 4 | 5 | * Copyright (C) 2017 Dell, Inc. |
| 5 | − * | |
| 6 | − * This program is free software; you can redistribute it and/or modify | |
| 7 | − * it under the terms of the GNU General Public License version 2 as | |
| 8 | − * published by the Free Software Foundation. | |
| 9 | 6 | */ |
| 10 | 7 | #ifndef _UAPI_LINUX_WMI_H |
| 11 | 8 | #define _UAPI_LINUX_WMI_H |