diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-07-27 14:17:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-07-27 14:17:19 +0200 |
| commit | 0957fbab972a9499626ac457fd924b24491c6315 (patch) | |
| tree | 7bcc650d52219fd090f041b0cac1742ccb7f49d6 /include/linux/zstd_errors.h | |
| parent | 2cedf2272f1bb42471e646868ac572cc5752bd91 (diff) | |
| parent | f5098b6bae761e346ebcd9da7f95622c04733cff (diff) | |
Merge 7.2-rc5 into char-misc-next
We need the char/misc fixes AND this resolves two merge conflicts in:
drivers/android/binder/thread.rs
drivers/misc/nsm.c
Reported-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/zstd_errors.h')
0 files changed, 0 insertions, 0 deletions