Date:   Tue, 30 Nov 2021 14:06:21 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>,
        Mathieu Poirier <mathieu.poirier@linaro.org>
Cc:     Alex Gaynor <alex.gaynor@gmail.com>,
        Ayaan Zaidi <zaidi.ayaan@gmail.com>,
        Boris-Chengbiao Zhou <bobo1239@web.de>,
        Finn Behrens <me@kloenk.de>, Gary Guo <gary@garyguo.net>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Miguel Ojeda <ojeda@kernel.org>,
        Mike Leach <mike.leach@linaro.org>,
        Sven Van Asbroeck <thesven73@gmail.com>,
        Wedson Almeida Filho <wedsonaf@google.com>
Subject: linux-next: manual merge of the rust tree with the coresight tree
Message-ID: <20211130140621.29261096@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/KLz+i/mIm7X77RwIZpztsHL";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/KLz+i/mIm7X77RwIZpztsHL
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 loadabl=
e 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.

--=20
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.
 =20
 +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"
+=20
  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)		+=3D mei
  subdir-$(CONFIG_SAMPLE_WATCHDOG)	+=3D watchdog
  subdir-$(CONFIG_SAMPLE_WATCH_QUEUE)	+=3D watch_queue
  obj-$(CONFIG_DEBUG_KMEMLEAK_TEST)	+=3D kmemleak/
 +obj-$(CONFIG_SAMPLE_CORESIGHT_SYSCFG)	+=3D coresight/
+ obj-$(CONFIG_SAMPLES_RUST)		+=3D rust/

--Sig_/KLz+i/mIm7X77RwIZpztsHL
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmGllS0ACgkQAVBC80lX
0Gw4GAf/SxZuoak7Ref3IZtCE3sUalYZWjborxdyqqhyma3RmXpEpwyoc3Iib5x2
rdIKapj8cubsJrJ2ha7kpvce39nzPiA1IQj6kI33GY6HkRwjd+cNWXxtC26QZvXZ
BNHAg1u9lfjAAil1vzr3ttPoxpgy0Pn+vKS8Qxfr2yj1yDfNYBS9/1C6TZ69d+Y8
Vh7vVa37KYbhnLG0/MlA4fWZzk6ozkPjiIfy+lapsXQDFLX5Ywt3hRWPnKeByanI
i4YH8sx4Zsx1i13PeKOLSvvKwCWaM7G7pfNRbhR6ejdsNU5j6jEy+DTBPOwW+0SY
3v8J0EK0pFC4yvSWXsO0PEfdD/s4lg==
=OMM9
-----END PGP SIGNATURE-----

--Sig_/KLz+i/mIm7X77RwIZpztsHL--