Linux 7.1

[linux.git] / Makefile

diff --git a/Makefile b/Makefile
index 9f88dcaae382713e7ec9bed258d9edbe37731633..408f070d49b8e5dbde0a3048693bdc083f741130 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 7
 PATCHLEVEL = 1
 SUBLEVEL = 0
-EXTRAVERSION = -rc2
+EXTRAVERSION =
 NAME = Baby Opossum Posse
 
 # *DOCUMENTATION*
@@ -486,6 +486,8 @@ export rust_common_flags := --edition=2021 \
                            -Wclippy::as_ptr_cast_mut \
                            -Wclippy::as_underscore \
                            -Wclippy::cast_lossless \
+                           -Aclippy::collapsible_if \
+                           -Aclippy::collapsible_match \
                            -Wclippy::ignored_unit_patterns \
                            -Aclippy::incompatible_msrv \
                            -Wclippy::mut_mut \
@@ -605,6 +607,7 @@ KBUILD_RUSTFLAGS := $(rust_common_flags) \
                    -Crelocation-model=static \
                    -Zfunction-sections=n \
                    -Wclippy::float_arithmetic
+KBUILD_RUSTFLAGS_OPTION_CHKS :=
 
 KBUILD_AFLAGS_KERNEL :=
 KBUILD_CFLAGS_KERNEL :=
@@ -641,7 +644,7 @@ export KBUILD_USERCFLAGS KBUILD_USERLDFLAGS
 
 export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS
 export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
-export KBUILD_RUSTFLAGS RUSTFLAGS_KERNEL RUSTFLAGS_MODULE
+export KBUILD_RUSTFLAGS RUSTFLAGS_KERNEL RUSTFLAGS_MODULE KBUILD_RUSTFLAGS_OPTION_CHKS
 export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
 export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_RUSTFLAGS_MODULE KBUILD_LDFLAGS_MODULE
 export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL KBUILD_RUSTFLAGS_KERNEL