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

[Stephen Rothwell]

Hi all,

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

  samples/Makefile

between commit:

  6ee64cc3020b ("fprobe: Add sample program for fprobe")

from the bpf-next tree and commit:

  44d687f85cc3 ("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/Makefile
index 701e912ab5af,fc5e9760ea32..000000000000
--- a/samples/Makefile
+++ b/samples/Makefile
@@@ -34,4 -33,4 +34,5 @@@ subdir-$(CONFIG_SAMPLE_WATCHDOG)	+= wat
  subdir-$(CONFIG_SAMPLE_WATCH_QUEUE)	+= watch_queue
  obj-$(CONFIG_DEBUG_KMEMLEAK_TEST)	+= kmemleak/
  obj-$(CONFIG_SAMPLE_CORESIGHT_SYSCFG)	+= coresight/
 +obj-$(CONFIG_SAMPLE_FPROBE)		+= fprobe/
+ obj-$(CONFIG_SAMPLES_RUST)		+= rust/

Attachment: pgpgIxJU8tChM.pgp
Description: OpenPGP digital signature