linux-next: manual merge of the rust tree with the coresight tree

linux-next: manual merge of the rust tree with the coresight tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2083 bytes --]

Hi all,

Today's linux-next merge of the rust tree got conflicts in:

  samples/Kconfig
  samples/Makefile

between commit:

  ede5bab874f5 ("coresight: syscfg: Example CoreSight configuration loadable module")

from the coresight tree and commit:

  2218f3460793 ("samples: add Rust examples")

from the rust 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 22cc921ae291,8cbd6490823f..000000000000
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@@ -241,19 -223,6 +241,21 @@@ config SAMPLE_WATCH_QUEU
  	  Build example userspace program to use the new mount_notify(),
  	  sb_notify() syscalls and the KEYCTL_WATCH_KEY keyctl() function.
  
 +config SAMPLE_CORESIGHT_SYSCFG
 +	tristate "Build example loadable module for CoreSight config"
 +	depends on CORESIGHT && m
 +	help
 +	  Build an example loadable module that adds new CoreSight features
 +	  and configuration using the CoreSight system configuration API.
 +	  This demonstrates how a user may create their own CoreSight
 +	  configurations and easily load them into the system at runtime.
 +
+ source "samples/rust/Kconfig"
+ 
  endif # SAMPLES
 +
 +config HAVE_SAMPLE_FTRACE_DIRECT
 +	bool
 +
 +config HAVE_SAMPLE_FTRACE_DIRECT_MULTI
 +	bool
diff --cc samples/Makefile
index 1ae4de99c983,291663e56a3c..000000000000
--- a/samples/Makefile
+++ b/samples/Makefile
@@@ -32,4 -30,4 +32,5 @@@ obj-$(CONFIG_SAMPLE_INTEL_MEI)		+= mei
  subdir-$(CONFIG_SAMPLE_WATCHDOG)	+= watchdog
  subdir-$(CONFIG_SAMPLE_WATCH_QUEUE)	+= watch_queue
  obj-$(CONFIG_DEBUG_KMEMLEAK_TEST)	+= kmemleak/
 +obj-$(CONFIG_SAMPLE_CORESIGHT_SYSCFG)	+= coresight/
+ obj-$(CONFIG_SAMPLES_RUST)		+= rust/

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the rust tree with the coresight tree

[Miguel Ojeda]

On Tue, Nov 30, 2021 at 4:06 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.

ACK -- looks good to me. Thanks!

Cheers,
Miguel

Re: linux-next: manual merge of the rust tree with the coresight tree

[Mathieu Poirier]

On Mon, 29 Nov 2021 at 20:06, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the rust tree got conflicts in:
>
>   samples/Kconfig
>   samples/Makefile
>
> between commit:
>
>   ede5bab874f5 ("coresight: syscfg: Example CoreSight configuration loadable module")
>
> from the coresight tree and commit:
>
>   2218f3460793 ("samples: add Rust examples")
>
> from the rust 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.

Stephen: Thanks for addressing this.

Miguel: I have created an immutable branch that you can pull from [1].

Regards,
Mathieu

[1]. https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git/log/?h=next-immutable

>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc samples/Kconfig
> index 22cc921ae291,8cbd6490823f..000000000000
> --- a/samples/Kconfig
> +++ b/samples/Kconfig
> @@@ -241,19 -223,6 +241,21 @@@ config SAMPLE_WATCH_QUEU
>           Build example userspace program to use the new mount_notify(),
>           sb_notify() syscalls and the KEYCTL_WATCH_KEY keyctl() function.
>
>  +config SAMPLE_CORESIGHT_SYSCFG
>  +      tristate "Build example loadable module for CoreSight config"
>  +      depends on CORESIGHT && m
>  +      help
>  +        Build an example loadable module that adds new CoreSight features
>  +        and configuration using the CoreSight system configuration API.
>  +        This demonstrates how a user may create their own CoreSight
>  +        configurations and easily load them into the system at runtime.
>  +
> + source "samples/rust/Kconfig"
> +
>   endif # SAMPLES
>  +
>  +config HAVE_SAMPLE_FTRACE_DIRECT
>  +      bool
>  +
>  +config HAVE_SAMPLE_FTRACE_DIRECT_MULTI
>  +      bool
> diff --cc samples/Makefile
> index 1ae4de99c983,291663e56a3c..000000000000
> --- a/samples/Makefile
> +++ b/samples/Makefile
> @@@ -32,4 -30,4 +32,5 @@@ obj-$(CONFIG_SAMPLE_INTEL_MEI)                += mei
>   subdir-$(CONFIG_SAMPLE_WATCHDOG)      += watchdog
>   subdir-$(CONFIG_SAMPLE_WATCH_QUEUE)   += watch_queue
>   obj-$(CONFIG_DEBUG_KMEMLEAK_TEST)     += kmemleak/
>  +obj-$(CONFIG_SAMPLE_CORESIGHT_SYSCFG) += coresight/
> + obj-$(CONFIG_SAMPLES_RUST)            += rust/