Hi all,
On Mon, 4 May 2020 13:16:55 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 tree and commit:
>
> 631ec151fd96 ("Add sample notification program")
>
> from the keys tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc samples/Kconfig
> index 5005f74ac0eb,5c31971a5745..000000000000
> --- a/samples/Kconfig
> +++ b/samples/Kconfig
> @@@ -205,8 -190,11 +205,15 @@@ config SAMPLE_INTEL_ME
> help
> Build a sample program to work with mei device.
>
> +config SAMPLE_WATCHDOG
> + bool "watchdog sample"
> + depends on CC_CAN_LINK
> +
> + config SAMPLE_WATCH_QUEUE
> + bool "Build example /dev/watch_queue notification consumer"
> + depends on HEADERS_INSTALL
> + help
> + Build example userspace program to use the new mount_notify(),
> + sb_notify() syscalls and the KEYCTL_WATCH_KEY keyctl() function.
> +
> endif # SAMPLES
> diff --cc samples/Makefile
> index 29c66aadd954,8617edf7f19a..000000000000
> --- a/samples/Makefile
> +++ b/samples/Makefile
> @@@ -26,4 -24,4 +26,5 @@@ obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l
> obj-y += vfio-mdev/
> subdir-$(CONFIG_SAMPLE_VFS) += vfs
> obj-$(CONFIG_SAMPLE_INTEL_MEI) += mei/
> +subdir-$(CONFIG_SAMPLE_WATCHDOG) += watchdog
5fb5efa63ea4 ("samples: watchdog: use 'userprogs' syntax")> + subdir-$(CONFIG_SAMPLE_WATCH_QUEUE) += watch_queue
This is now a conflict between commit
5fb5efa63ea4 ("samples: watchdog: use 'userprogs' syntax")
from the kbuild tree and commit
b8c9527a31b0 ("Add sample notification program")
from the notifications tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpmvBXEu9IEg.pgp
Description: OpenPGP digital signature
