Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 12 Jul 2022 17:39:56 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>,
        Jens Axboe <axboe@kernel.dk>,
        Masahiro Yamada <masahiroy@kernel.org>
Cc:     Nick Desaulniers <ndesaulniers@google.com>,
        Adam Bratschi-Kaye <ark.email@gmail.com>,
        Alex Gaynor <alex.gaynor@gmail.com>,
        Antonio Terceiro <antonio.terceiro@linaro.org>,
        Boqun Feng <boqun.feng@gmail.com>,
        Boris-Chengbiao Zhou <bobo1239@web.de>,
        Daniel Xu <dxu@dxuuu.xyz>,
        Dariusz Sosnowski <dsosnowski@dsosnowski.pl>,
        David Gow <davidgow@google.com>,
        Douglas Su <d0u9.su@outlook.com>, Finn Behrens <me@kloenk.de>,
        Gary Guo <gary@garyguo.net>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Miguel Cano <macanroj@gmail.com>,
        Miguel Ojeda <ojeda@kernel.org>,
        Sven Van Asbroeck <thesven73@gmail.com>,
        Wedson Almeida Filho <wedsonaf@google.com>
Subject: linux-next: manual merge of the rust tree with the block and kbuild
 trees
Message-ID: <20220712173956.540d3baa@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/7=sBkLwJ/gULgrXoA7AXD_V";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/7=sBkLwJ/gULgrXoA7AXD_V
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  Makefile

between commit:

  239b2db7c7ca ("io_uring: move to separate directory")

from the block tree, commit:

  b63a0c3e51a4 ("kbuild: drop support for CONFIG_CC_OPTIMIZE_FOR_PERFORMANC=
E_O3")

from the kbuild tree and commit:

  0ea4b9a1bece ("Kbuild: add Rust support")

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 Makefile
index ffc170d3d0ce,ce17ec71f89b..000000000000
--- a/Makefile
+++ b/Makefile
@@@ -436,7 -445,7 +445,8 @@@ els
  HOSTCC	=3D gcc
  HOSTCXX	=3D g++
  endif
 +HOSTPKG_CONFIG	=3D pkg-config
+ HOSTRUSTC =3D rustc
 =20
  KBUILD_USERHOSTCFLAGS :=3D -Wall -Wmissing-prototypes -Wstrict-prototypes=
 \
  			 -O2 -fomit-frame-pointer -std=3Dgnu11 \
@@@ -534,7 -580,23 +581,23 @@@ KBUILD_LDFLAGS_MODULE :
  KBUILD_LDFLAGS :=3D
  CLANG_FLAGS :=3D
 =20
+ ifeq ($(KBUILD_CLIPPY),1)
+ 	RUSTC_OR_CLIPPY_QUIET :=3D CLIPPY
+ 	RUSTC_OR_CLIPPY =3D $(CLIPPY_DRIVER)
+ else
+ 	RUSTC_OR_CLIPPY_QUIET :=3D RUSTC
+ 	RUSTC_OR_CLIPPY =3D $(RUSTC)
+ endif
+=20
+ ifdef RUST_LIB_SRC
+ 	export RUST_LIB_SRC
+ endif
+=20
+ export RUSTC_BOOTSTRAP :=3D 1
+=20
 -export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMP=
ILE LD CC
 +export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMP=
ILE LD CC HOSTPKG_CONFIG
+ export RUSTC RUSTDOC RUSTFMT RUSTC_OR_CLIPPY_QUIET RUSTC_OR_CLIPPY BINDGE=
N CARGO
+ export HOSTRUSTC KBUILD_HOSTRUSTFLAGS
  export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX =
YACC AWK INSTALLKERNEL
  export PERL PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX
  export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD
@@@ -755,9 -818,27 +819,24 @@@ KBUILD_CFLAGS	+=3D $(call cc-disable-warn
 =20
  ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
  KBUILD_CFLAGS +=3D -O2
+ KBUILD_RUSTFLAGS_OPT_LEVEL_MAP :=3D 2
 -else ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3
 -KBUILD_CFLAGS +=3D -O3
 -KBUILD_RUSTFLAGS_OPT_LEVEL_MAP :=3D 3
  else ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
  KBUILD_CFLAGS +=3D -Os
- endif
+ KBUILD_RUSTFLAGS_OPT_LEVEL_MAP :=3D s
+ endif
+=20
+ # Always set `debug-assertions` and `overflow-checks` because their defau=
lt
+ # depends on `opt-level` and `debug-assertions`, respectively.
+ KBUILD_RUSTFLAGS +=3D -Cdebug-assertions=3D$(if $(CONFIG_RUST_DEBUG_ASSER=
TIONS),y,n)
+ KBUILD_RUSTFLAGS +=3D -Coverflow-checks=3D$(if $(CONFIG_RUST_OVERFLOW_CHE=
CKS),y,n)
+ KBUILD_RUSTFLAGS +=3D -Copt-level=3D$\
+ 	$(if $(CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C),$(KBUILD_RUSTFLAGS=
_OPT_LEVEL_MAP))$\
+ 	$(if $(CONFIG_RUST_OPT_LEVEL_0),0)$\
+ 	$(if $(CONFIG_RUST_OPT_LEVEL_1),1)$\
+ 	$(if $(CONFIG_RUST_OPT_LEVEL_2),2)$\
+ 	$(if $(CONFIG_RUST_OPT_LEVEL_3),3)$\
+ 	$(if $(CONFIG_RUST_OPT_LEVEL_S),s)$\
+ 	$(if $(CONFIG_RUST_OPT_LEVEL_Z),z)
 =20
  # Tell gcc to never replace conditional load with a non-conditional one
  ifdef CONFIG_CC_IS_GCC
@@@ -786,9 -867,11 +865,12 @@@ stackp-flags-$(CONFIG_STACKPROTECTOR_ST
  KBUILD_CFLAGS +=3D $(stackp-flags-y)
 =20
  KBUILD_CFLAGS-$(CONFIG_WERROR) +=3D -Werror
 +KBUILD_CFLAGS-$(CONFIG_CC_NO_ARRAY_BOUNDS) +=3D -Wno-array-bounds
  KBUILD_CFLAGS +=3D $(KBUILD_CFLAGS-y) $(CONFIG_CC_IMPLICIT_FALLTHROUGH)
 =20
+ KBUILD_RUSTFLAGS-$(CONFIG_WERROR) +=3D -Dwarnings
+ KBUILD_RUSTFLAGS +=3D $(KBUILD_RUSTFLAGS-y)
+=20
  ifdef CONFIG_CC_IS_CLANG
  KBUILD_CPPFLAGS +=3D -Qunused-arguments
  # The kernel builds with '-std=3Dgnu11' so use of GNU extensions is accep=
table.
@@@ -804,11 -887,9 +886,12 @@@ endi
  KBUILD_CFLAGS +=3D $(call cc-disable-warning, unused-but-set-variable)
  KBUILD_CFLAGS +=3D $(call cc-disable-warning, unused-const-variable)
 =20
 +# These result in bogus false positives
 +KBUILD_CFLAGS +=3D $(call cc-disable-warning, dangling-pointer)
 +
  ifdef CONFIG_FRAME_POINTER
  KBUILD_CFLAGS	+=3D -fno-omit-frame-pointer -fno-optimize-sibling-calls
+ KBUILD_RUSTFLAGS +=3D -Cforce-frame-pointers=3Dy
  else
  # Some targets (ARM with Thumb2, for example), can't be built with frame
  # pointers.  For those, we don't have FUNCTION_TRACER automatically
@@@ -1095,7 -1180,7 +1183,8 @@@ export MODULES_NSDEPS :=3D $(extmod_prefi
  ifeq ($(KBUILD_EXTMOD),)
  core-y			+=3D kernel/ certs/ mm/ fs/ ipc/ security/ crypto/
  core-$(CONFIG_BLOCK)	+=3D block/
 +core-$(CONFIG_IO_URING)	+=3D io_uring/
+ core-$(CONFIG_RUST)	+=3D rust/
 =20
  vmlinux-dirs	:=3D $(patsubst %/,%,$(filter %/, \
  		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \

--Sig_/7=sBkLwJ/gULgrXoA7AXD_V
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLNJUwACgkQAVBC80lX
0GyCyAf/fppBTj0/vBshvRg18VgE9Akjn965TMgLrokt3sE1+3YkX27DLBJw0AwH
fOkBVnrY1+pl4MvS5WcxCIGDr+oH2xGv9j7wYHQWDuVJKfrJQfmckCDqKiEXeOsk
bTqDRneHRSMGIS6Kp8qWqmzBNKajiswgABZBsH3DnrncoKZ++D4BzofvKqVwKgkM
p5xm5EOyUMtzRLb7gWwzL2JrI9N7DA/QTuK74T2BmvRr2sGGPSBDmWjSHCRL5GGa
knQx/Lg4kJ91QvIWWWOPokBQ82hMVhIZ1oePaSmt/OFc8k7+GAFyUzSC+YONBNAK
75kQOi+KxmL56KeC07ZRJoVk8k8bUg==
=b0SA
-----END PGP SIGNATURE-----

--Sig_/7=sBkLwJ/gULgrXoA7AXD_V--