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

2019-08-16 Thread Kees Cook
On Thu, Aug 15, 2019 at 10:21:29PM -0700, Andrii Nakryiko wrote: > On Thu, Aug 15, 2019 at 7:42 PM Stephen Rothwell > wrote: > > > > Hi all, > > > > Today's linux-next merge of the net-next tree got a conflict in: > > > > scripts/link-vmlinux.sh > > > > between commit: > > > > e167191e4a8a ("

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

2019-08-16 Thread Stephen Rothwell
Hi all, On Fri, 16 Aug 2019 16:01:28 +1000 Stephen Rothwell wrote: > > On Thu, 15 Aug 2019 22:21:29 -0700 Andrii Nakryiko > wrote: > > > > Thanks, Stephen! Looks good except one minor issue below. > > Thanks for checking. > > > > vmlinux_link() > > > { > > > + info LD ${2} >

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

2019-08-15 Thread Stephen Rothwell
Hi Andrii, On Thu, 15 Aug 2019 22:21:29 -0700 Andrii Nakryiko wrote: > > Thanks, Stephen! Looks good except one minor issue below. Thanks for checking. > > vmlinux_link() > > { > > + info LD ${2} > > This needs to be ${1}. At least its only an information message and doesn't affe

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

2019-08-15 Thread Andrii Nakryiko
On Thu, Aug 15, 2019 at 7:42 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > scripts/link-vmlinux.sh > > between commit: > > e167191e4a8a ("kbuild: Parameterize kallsyms generation and correct > reporting") > > from the kbuild tr

linux-next: manual merge of the net-next tree with the kbuild tree

2019-08-15 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: scripts/link-vmlinux.sh between commit: e167191e4a8a ("kbuild: Parameterize kallsyms generation and correct reporting") from the kbuild tree and commits: 341dfcf8d78e ("btf: expose BTF info through sysfs") 7fd78

linux-next: manual merge of the net-next tree with the kbuild tree

2017-04-25 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/uapi/linux/Kbuild between commit: 65017bab8a9e ("uapi: export all headers under uapi directories") from the kbuild tree and commit: 0b2e66448ba2 ("VSOCK: Add vsockmon device") from the net-next tree. I fi