diff options
author | Ingo Molnar <[email protected]> | 2024-02-22 10:11:38 +0100 |
---|---|---|
committer | Ingo Molnar <[email protected]> | 2024-02-22 10:16:53 +0100 |
commit | f14df823a61e45db6a92e1caf552d5ec64e06b1e (patch) | |
tree | 61d480a97a060998c0c3e7da44bc3933d3924683 /lib/test_fortify/write_overflow-strncpy-src.c | |
parent | b388e57d4628eb22782bdad4cd5b83ca87a1b7c9 (diff) | |
parent | 289d0a475c3e5be42315376d08e0457350fb8e9c (diff) |
Merge branch 'x86/vdso' into x86/core, to resolve conflict and to prepare for dependent changes
Conflicts:
arch/x86/entry/vdso/Makefile
We also want to change arch/x86/entry/vdso/Makefile in a followup
commit, so merge the trees for this.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'lib/test_fortify/write_overflow-strncpy-src.c')
0 files changed, 0 insertions, 0 deletions