linux-stable.git/Makefile, branch linux-6.18.y

Linux 6.18.33

2026-05-23T11:07:21+00:00

Link: https://lore.kernel.org/r/20260520162134.554764788@linuxfoundation.org
Tested-by: Florian Fainelli 
Tested-by: Wentao Guan 
Tested-by: Pavel Machek (CIP) 
Tested-by: Jon Hunter 
Tested-by: Peter Schneider 
Tested-by: Mark Brown 
Tested-by: Brett A C Sheffield 
Tested-by: Ron Economos 
Signed-off-by: Greg Kroah-Hartman

kbuild: Never respect CONFIG_WERROR / W=e to fixdep

2026-05-23T11:07:06+00:00

[ Upstream commit 75f7c47ccd78c947cf1b6ddb18ea453ff0555716 ]

The fixdep hostprog may be built multiple times during a single build.
Once during the configuration phase and later during the regular phase.
As only the regular build phase respects CONFIG_WERROR / W=e, the
compiler flags might change between the phases, leading to rebuilds.

Example, the rebuilds will happen twice on each invocation of the build:

  $ make allyesconfig prepare
  make[1]: Entering directory '/tmp/deleteme'
    HOSTCC  scripts/basic/fixdep
  #
  # No change to .config
  #
    HOSTCC  scripts/basic/fixdep
    DESCEND objtool
    INSTALL libsubcmd_headers
  make[1]: Leaving directory '/tmp/deleteme'

Fix the compilation flags used for scripts/basic/ before
scripts/Makefile.warn is evaluated to stop CONFIG_WERROR / W=e
influencing the fixdep build to avoid the spurious rebuilds.

Fixes: 7ded7d37e5f5 ("scripts/Makefile.extrawarn: Respect CONFIG_WERROR / W=e for hostprogs")
Signed-off-by: Thomas Weißschuh 
Reviewed-by: Nathan Chancellor 
Link: https://patch.msgid.link/20260422-kbuild-scripts-basic-werror-v1-1-8c6912ff22e0@weissschuh.net
Signed-off-by: Nicolas Schier 
Signed-off-by: Sasha Levin

Linux 6.18.32

2026-05-17T15:15:37+00:00

Link: https://lore.kernel.org/r/20260515154657.309489048@linuxfoundation.org
Tested-by: Florian Fainelli 
Tested-by: Pavel Machek (CIP) 
Tested-by: Shuah Khan 
Tested-by: Miguel Ojeda 
Tested-by: Mark Brown 
Tested-by: Brett A C Sheffield 
Link: https://lore.kernel.org/r/20260516102236.209957148@linuxfoundation.org
Tested-by: Brett A C Sheffield 
Tested-by: Ron Economos 
Tested-by: Peter Schneider 
Tested-by: Miguel Ojeda 
Tested-by: Wentao Guan 
Signed-off-by: Greg Kroah-Hartman

Linux 6.18.31

2026-05-15T12:52:18+00:00

Signed-off-by: Greg Kroah-Hartman

Linux 6.18.30

2026-05-14T13:30:26+00:00

Link: https://lore.kernel.org/r/20260512173938.452574370@linuxfoundation.org
Tested-by: Pavel Machek (CIP) 
Tested-by: Peter Schneider 
Tested-by: Brett A C Sheffield 
Tested-by: Mark Brown 
Tested-by: Shuah Khan 
Link: https://lore.kernel.org/r/20260513153744.746440810@linuxfoundation.org
Tested-by: Brett A C Sheffield 
Tested-by: Florian Fainelli 
Tested-by: Ron Economos 
Tested-by: Mark Brown 
Tested-by: Barry K. Nathan 
Tested-by: Miguel Ojeda 
Signed-off-by: Greg Kroah-Hartman

rust: allow `clippy::collapsible_if` globally

2026-05-14T13:30:15+00:00

commit 2adc8664018c1cc595c7c0c98474a33c7fe32a85 upstream.

Similar to `clippy::collapsible_match` (globally allowed in the previous
commit), the `clippy::collapsible_if` lint [1] can make code harder to
read in certain cases.

Thus just let developers decide on their own.

In addition, remove the existing `expect` we had.

Cc: stable@vger.kernel.org # Needed in 6.12.y and later (Rust is pinned in older LTSs).
Suggested-by: Gary Guo 
Link: https://lore.kernel.org/rust-for-linux/DGROP5CHU1QZ.1OKJRAUZXE9WC@garyguo.net/
Link: https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if [1]
Reviewed-by: Gary Guo 
Link: https://patch.msgid.link/20260426144201.227108-2-ojeda@kernel.org
Signed-off-by: Miguel Ojeda 
Signed-off-by: Greg Kroah-Hartman

rust: allow `clippy::collapsible_match` globally

2026-05-14T13:30:14+00:00

commit 838d852da8503372f3a1779bfbd1ccb93153ab4e upstream.

The `clippy::collapsible_match` lint [1] can make code harder to read
in certain cases [2], e.g.

      CLIPPY P rust/libmacros.so - due to command line change
    warning: this `if` can be collapsed into the outer `match`
      --> rust/pin-init/internal/src/helpers.rs:91:17
       |
    91 | /                 if nesting == 1 {
    92 | |                     impl_generics.push(tt.clone());
    93 | |                     impl_generics.push(tt);
    94 | |                     skip_until_comma = false;
    95 | |                 }
       | |_________________^
       |
       = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_match
       = note: `-W clippy::collapsible-match` implied by `-W clippy::all`
       = help: to override `-W clippy::all` add `#[allow(clippy::collapsible_match)]`
    help: collapse nested if block
       |
    90 ~             TokenTree::Punct(p) if skip_until_comma && p.as_char() == ','
    91 ~                 && nesting == 1 => {
    92 |                     impl_generics.push(tt.clone());
    93 |                     impl_generics.push(tt);
    94 |                     skip_until_comma = false;
    95 ~                 }
       |

The lint does not have much upside -- when the suggestion may be a good
one, it would still read fine when nested anyway. And it is the kind of
lint that may easily bias people to just apply the suggestion instead
of allowing it.

[ In addition, as Gary points out [3], the suggestion is also wrong [4] and
  in the process of being fixed [5], possibly for Rust 1.97.0:

  Link: https://lore.kernel.org/rust-for-linux/DI3YV94TH9I3.1SOHW51552497@garyguo.net/ [3]
  Link: https://github.com/rust-lang/rust-clippy/issues/16875 [4]
  Link: https://github.com/rust-lang/rust-clippy/pull/16878 [5]

    - Miguel ]

Thus just let developers decide on their own.

Cc: stable@vger.kernel.org # Needed in 6.12.y and later (Rust is pinned in older LTSs).
Link: https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_match [1]
Link: https://lore.kernel.org/rust-for-linux/CANiq72nWYJna_hdFxjQCQZK6yJBrr1Mb86iKavivV0U0BgufeA@mail.gmail.com/ [2]
Reviewed-by: Gary Guo 
Link: https://patch.msgid.link/20260426144201.227108-1-ojeda@kernel.org
Signed-off-by: Miguel Ojeda 
Signed-off-by: Greg Kroah-Hartman

Linux 6.18.29

2026-05-11T06:20:52+00:00

Signed-off-by: Greg Kroah-Hartman

Linux 6.18.28

2026-05-08T06:40:23+00:00

Signed-off-by: Greg Kroah-Hartman

Linux 6.18.27

2026-05-07T04:12:03+00:00

Link: https://lore.kernel.org/r/20260504135142.929052779@linuxfoundation.org
Tested-by: Brett A C Sheffield 
Tested-by: Peter Schneider 
Tested-by: Wentao Guan 
Tested-by: Florian Fainelli 
Tested-by: Ron Economos 
Tested-by: Miguel Ojeda 
Tested-by: Mark Brown 
Tested-by: Shuah Khan 
Tested-by: Dileep Malepu 
Signed-off-by: Greg Kroah-Hartman