diff options
| author | Leon Romanovsky <leon@kernel.org> | 2026-03-30 12:02:58 +0300 |
|---|---|---|
| committer | Leon Romanovsky <leon@kernel.org> | 2026-03-30 20:47:44 +0300 |
| commit | e6fd2491789745ed8c3df86a660dfa7207129d22 (patch) | |
| tree | 62d79e06a87f78a9949c1e695386dec2ad0fcf22 /tools/scripts | |
| parent | adc09d7fbbb9d286057c98675994c445d81c27fa (diff) | |
| parent | 7aaa8047eafd0bd628065b15757d9b48c5f9c07d (diff) | |
| download | linux-e6fd2491789745ed8c3df86a660dfa7207129d22.tar.xz | |
Merge branch 'master' into rdma-next
Let's bring v7.0-rc6 to the -next branch, so we can merge the DMA
attributes fix [1] without merge conflicts.
[1] https://lore.kernel.org/all/20260323-umem-dma-attrs-v1-1-d6890f2e6a1e@nvidia.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
* master: (1688 commits)
Linux 7.0-rc6
...
Diffstat (limited to 'tools/scripts')
| -rw-r--r-- | tools/scripts/syscall.tbl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/scripts/syscall.tbl b/tools/scripts/syscall.tbl index e74868be513c..7a42b32b6577 100644 --- a/tools/scripts/syscall.tbl +++ b/tools/scripts/syscall.tbl @@ -411,3 +411,4 @@ 468 common file_getattr sys_file_getattr 469 common file_setattr sys_file_setattr 470 common listns sys_listns +471 common rseq_slice_yield sys_rseq_slice_yield |