Merge branch 'pci/dt-bindings'

[linux.git] / Makefile

diff --git a/Makefile b/Makefile
index 11e74386d909dbce5acf5dc5553cb6cfbbe05b0e..8ad55d6e7b60f270f1806aa53376f2b5b9b5f93a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
-PATCHLEVEL = 10
+PATCHLEVEL = 11
 SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = -rc1
 NAME = Baby Opossum Posse
 
 # *DOCUMENTATION*
@@ -445,17 +445,17 @@ KBUILD_USERLDFLAGS := $(USERLDFLAGS)
 # host programs.
 export rust_common_flags := --edition=2021 \
                            -Zbinary_dep_depinfo=y \
-                           -Dunsafe_op_in_unsafe_fn -Drust_2018_idioms \
-                           -Dunreachable_pub -Dnon_ascii_idents \
+                           -Dunsafe_op_in_unsafe_fn \
+                           -Dnon_ascii_idents \
+                           -Wrust_2018_idioms \
+                           -Wunreachable_pub \
                            -Wmissing_docs \
-                           -Drustdoc::missing_crate_level_docs \
-                           -Dclippy::correctness -Dclippy::style \
-                           -Dclippy::suspicious -Dclippy::complexity \
-                           -Dclippy::perf \
-                           -Dclippy::let_unit_value -Dclippy::mut_mut \
-                           -Dclippy::needless_bitwise_bool \
-                           -Dclippy::needless_continue \
-                           -Dclippy::no_mangle_with_rust_abi \
+                           -Wrustdoc::missing_crate_level_docs \
+                           -Wclippy::all \
+                           -Wclippy::mut_mut \
+                           -Wclippy::needless_bitwise_bool \
+                           -Wclippy::needless_continue \
+                           -Wclippy::no_mangle_with_rust_abi \
                            -Wclippy::dbg_macro
 
 KBUILD_HOSTCFLAGS   := $(KBUILD_USERHOSTCFLAGS) $(HOST_LFS_CFLAGS) \
@@ -493,7 +493,6 @@ RUSTDOC             = rustdoc
 RUSTFMT                = rustfmt
 CLIPPY_DRIVER  = clippy-driver
 BINDGEN                = bindgen
-CARGO          = cargo
 PAHOLE         = pahole
 RESOLVE_BTFIDS = $(objtree)/tools/bpf/resolve_btfids/resolve_btfids
 LEX            = flex
@@ -559,7 +558,7 @@ KBUILD_RUSTFLAGS := $(rust_common_flags) \
                    -Csymbol-mangling-version=v0 \
                    -Crelocation-model=static \
                    -Zfunction-sections=n \
-                   -Dclippy::float_arithmetic
+                   -Wclippy::float_arithmetic
 
 KBUILD_AFLAGS_KERNEL :=
 KBUILD_CFLAGS_KERNEL :=
@@ -587,7 +586,7 @@ endif
 export RUSTC_BOOTSTRAP := 1
 
 export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC HOSTPKG_CONFIG
-export RUSTC RUSTDOC RUSTFMT RUSTC_OR_CLIPPY_QUIET RUSTC_OR_CLIPPY BINDGEN CARGO
+export RUSTC RUSTDOC RUSTFMT RUSTC_OR_CLIPPY_QUIET RUSTC_OR_CLIPPY BINDGEN
 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
@@ -1959,9 +1958,12 @@ quiet_cmd_tags = GEN     $@
 tags TAGS cscope gtags: FORCE
        $(call cmd,tags)
 
-# IDE support targets
+# Generate rust-project.json (a file that describes the structure of non-Cargo
+# Rust projects) for rust-analyzer (an implementation of the Language Server
+# Protocol).
 PHONY += rust-analyzer
 rust-analyzer:
+       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh
        $(Q)$(MAKE) $(build)=rust $@
 
 # Script to generate missing namespace dependencies