diff options
| author | Rob Clark <robin.clark@oss.qualcomm.com> | 2025-11-01 05:47:30 -0700 |
|---|---|---|
| committer | Rob Clark <robin.clark@oss.qualcomm.com> | 2025-11-01 05:47:30 -0700 |
| commit | cb9f145f638d7afa633632a9290d6ad06caeb8ee (patch) | |
| tree | 1a4dec3bedfb02c62a08a5ebe95717f53e6ded20 /include/uapi/linux/sysctl.h | |
| parent | f5d079564c44baaeedf5e25f4b943aa042ea0eb1 (diff) | |
| parent | f67d54e96bc9e4e20a927868f02c2e9d1aa09751 (diff) | |
Merge remote-tracking branch 'drm/drm-next' into msm-next-robclark
Back-merge drm-next to get caught up.
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>
Diffstat (limited to 'include/uapi/linux/sysctl.h')
| -rw-r--r-- | include/uapi/linux/sysctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h index 8981f00204db..63d1464cb71c 100644 --- a/include/uapi/linux/sysctl.h +++ b/include/uapi/linux/sysctl.h @@ -573,6 +573,7 @@ enum { NET_IPV6_ACCEPT_RA_FROM_LOCAL=26, NET_IPV6_ACCEPT_RA_RT_INFO_MIN_PLEN=27, NET_IPV6_RA_DEFRTR_METRIC=28, + NET_IPV6_FORCE_FORWARDING=29, __NET_IPV6_MAX }; |