Re: linux-next: manual merge of the kbuild tree with the input-current tree

Hi Stephen, 2017-03-28 7:55 GMT+09:00 Stephen Rothwell : > Hi Masahiro, > > Today's linux-next merge of the kbuild tree got a conflict in: > > include/uapi/linux/Kbuild > > between commit: > > 5659495a7a14 ("uapi: add missing install of userio.h") > > from the input-current tree and commit: >

linux-next: manual merge of the kbuild tree with the input-current tree

Hi Masahiro, Today's linux-next merge of the kbuild tree got a conflict in: include/uapi/linux/Kbuild between commit: 5659495a7a14 ("uapi: add missing install of userio.h") from the input-current tree and commit: 65017bab8a9e ("uapi: export all headers under uapi directories") from the