diff options
| author |   Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-06-05 11:10:23 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-06-05 11:10:23 +0100 |
| commit | 9ff17e6bdaa50892dd9bdb1b116cb71b73dd711a (patch) | |
| tree | cbffbccb83865b418a0aabb4487b6e8fe70c590d /scripts/bpf_doc.py | |
| parent | drm/i915/gt: Add workaround 14016712196 (diff) | |
| parent | Merge tag 'drm-misc-next-2023-06-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
| download | linux-rng-9ff17e6bdaa50892dd9bdb1b116cb71b73dd711a.tar.xz linux-rng-9ff17e6bdaa50892dd9bdb1b116cb71b73dd711a.zip | |
Merge drm/drm-next into drm-intel-gt-next
For conflict avoidance we need the following commit:
c9a9f18d3ad8 drm/i915/huc: use const struct bus_type pointers
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'scripts/bpf_doc.py')
| -rwxr-xr-x | scripts/bpf_doc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/bpf_doc.py b/scripts/bpf_doc.py index 38d51e05c7a2..eaae2ce78381 100755 --- a/scripts/bpf_doc.py +++ b/scripts/bpf_doc.py @@ -383,7 +383,7 @@ class PrinterRST(Printer): .. Copyright (C) All BPF authors and contributors from 2014 to present. .. See git log include/uapi/linux/bpf.h in kernel tree for details. .. -.. SPDX-License-Identifier: Linux-man-pages-copyleft +.. SPDX-License-Identifier: Linux-man-pages-copyleft .. .. Please do not edit this file. It was generated from the documentation .. located in file include/uapi/linux/bpf.h of the Linux kernel sources |