Merge branch 'for-linus' into for-next

Back-merge of for-linus branch for further API/ABI cleanups.