linux-next: manual merge of the vfs tree with the m68k tree

Hi all, Today's linux-next merge of the vfs tree got a conflict in: arch/m68k/Kconfig between commit: dc072012bc94 ("m68k: Sort selects in main Kconfig") from the m68k tree and commit: 5e6e9852d6f7 ("uaccess: add infrastructure for kernel builds with set_fs()") from the vfs tree. I fi

linux-next: manual merge of the vfs tree with the m68k tree

Hi all, Today's linux-next merge of the vfs tree got a conflict in: arch/m68k/Kconfig between commit: dc072012bc94 ("m68k: Sort selects in main Kconfig") Cc: Geert Uytterhoeven from the m68k tree and commit: 0d4ca5778ffd ("uaccess: add infrastructure for kernel builds with set_fs()")