Merge tag 'v6.18' into next

Sync up with the mainline to bring in the latest APIs.


Author Dmitry Torokhov Date Commit Parent c4b3133c
Diff has more than 3000 files, too many to show.