diff options
| author | Greg Kroah-Hartman <[email protected]> | 2024-04-23 13:24:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2024-04-23 13:24:45 +0200 |
| commit | 660a708098569a66a47d0abdad998e29e1259de6 (patch) | |
| tree | 513d7f3cda11cb65f91a6f55b72308accf079c8d /lib/memory-notifier-error-inject.c | |
| parent | f70f95b485d78838ad28dbec804b986d11ad7bb0 (diff) | |
| parent | ed30a4a51bb196781c8058073ea720133a65596f (diff) | |
Merge 6.9-rc5 into tty-next
We want the tty fixes in here as well, and it resolves a merge conflict
in:
drivers/tty/serial/serial_core.c
as well.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'lib/memory-notifier-error-inject.c')
0 files changed, 0 insertions, 0 deletions