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

Hi all, On Mon, 4 May 2020 13:16:55 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the keys tree got conflicts in: > > samples/Kconfig > samples/Makefile > > between commit: > > 3ba9c29d1877 ("samples: watchdog: use 'userprogs' syntax") > > from the kbuild t

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

Hi all, Today's linux-next merge of the keys tree got conflicts in: samples/Kconfig samples/Makefile between commit: 3ba9c29d1877 ("samples: watchdog: use 'userprogs' syntax") from the kbuild tree and commit: 631ec151fd96 ("Add sample notification program") from the keys tree. I fix