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

From: Greg KH
Date: Tue Oct 22 2019 - 13:39:31 EST


On Tue, Oct 22, 2019 at 01:38:04PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got conflicts in:
>
> samples/Kconfig
> samples/Makefile
>
> between commit:
>
> 0b9c31597d81 ("Add sample notification program")
>
> from the keys tree and commit:
>
> 6859eba4f6fb ("samples: mei: use hostprogs kbuild constructs")
>
> from the char-misc 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 d0761f29ccb0,b663d9d24114..000000000000
> --- a/samples/Kconfig
> +++ b/samples/Kconfig
> @@@ -169,11 -169,11 +169,17 @@@ config SAMPLE_VF
> as mount API and statx(). Note that this is restricted to the x86
> arch whilst it accesses system calls that aren't yet in all arches.
>
> +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.
> +
> + config SAMPLE_INTEL_MEI
> + bool "Build example program working with intel mei driver"
> + depends on INTEL_MEI
> + help
> + Build a sample program to work with mei device.
> +
> -
> endif # SAMPLES
> diff --cc samples/Makefile
> index a61a39047d02,d6062ab25347..000000000000
> --- a/samples/Makefile
> +++ b/samples/Makefile
> @@@ -20,4 -20,4 +20,5 @@@ obj-$(CONFIG_SAMPLE_TRACE_PRINTK) += tr
> obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l/
> obj-y += vfio-mdev/
> subdir-$(CONFIG_SAMPLE_VFS) += vfs
> +subdir-$(CONFIG_SAMPLE_WATCH_QUEUE) += watch_queue
> + obj-$(CONFIG_SAMPLE_INTEL_MEI) += mei/


Looks good to me, thanks!

greg k-h