Merge branches 'misc' and 'sa1111-base' into for-linus