Merge branches 'adfs', 'arm-fault-handling' and 'misc' into for-next