Merge branch 'topic/drop-l3' into for-linus