Changes in Makefile

7a0e692a0381254b2f77c54dec100cd3325a6fdf - Merge branch 'next' into for-linus

Tue, 23 Jun 2026 08:10:08 +0200

Merge branch 'next' into for-linusPrepare input updates for 7.2 merge window. List of files: /linux/drivers/android/binder/Makefile

fff88709f9a9153af85b5224b4594caa5387ca60 - Merge tag 'v7.1-rc6' into next

Mon, 01 Jun 2026 04:43:25 +0200

Merge tag 'v7.1-rc6' into nextSync up with mainline to pull in a fix to IMS PCU driver and otherenhancements. List of files: /linux/drivers/android/binder/Makefile

5c8cbca290acdd49a694b36c0af76ba0c00bbf12 - Merge branch '20260507-ubwc-rework-v4-4-c19593d20c1d@oss.qualcomm.com' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into HEAD

Thu, 21 May 2026 22:36:50 +0200

Merge branch '20260507-ubwc-rework-v4-4-c19593d20c1d@oss.qualcomm.com' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into HEADMerge the branch with the soc/qcom changes, required for the next UBWCpatches.Signed-off-by: Dmitry Baryshkov List of files: /linux/drivers/android/binder/Makefile

09d6818d3bdc1ea6e49a425040528cbdbc97bc0a - Merge branch 'linus' into timers/clocksource

Mon, 18 May 2026 11:01:07 +0200

Merge branch 'linus' into timers/clocksource... to bring it up to date for new changes. List of files: /linux/drivers/android/binder/Makefile

658a6021492ad3b1b8a6e9a83963a1fad35a2af8 - Merge drm/drm-next into drm-intel-next

Fri, 15 May 2026 13:01:15 +0200

Merge drm/drm-next into drm-intel-nextSome Display Port Adaptive Sync depends on drm work.Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/android/binder/Makefile

8edf8b09fc44990977b3fbcb708035b1740d0b7e - Merge drm/drm-next into drm-intel-gt-next

Tue, 12 May 2026 10:16:35 +0200

Merge drm/drm-next into drm-intel-gt-nextBackmerging to pull in commit 5401b9adebc9 ("i915: don't usea vma that didn't match the context VM") to revert it.Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/android/binder/Makefile

c53ed3e99920df6a90553c89a1c053aa0776841e - Merge drm/drm-next into drm-xe-next

Fri, 08 May 2026 16:19:45 +0200

Merge drm/drm-next into drm-xe-nextBringing in recent display changes.Signed-off-by: Thomas Hellström List of files: /linux/drivers/android/binder/Makefile

cafac16b6207b88ad92fbba1169ae4f43865cb0d - Merge drm/drm-next into drm-misc-next

Mon, 27 Apr 2026 10:49:13 +0200

Merge drm/drm-next into drm-misc-nextGetting fixes and updates from v7.1-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/android/binder/Makefile

0fc8f6200d2313278fbf4539bbab74677c685531 - Merge drm/drm-fixes into drm-misc-fixes

Mon, 27 Apr 2026 10:26:49 +0200

Merge drm/drm-fixes into drm-misc-fixesGetting fixes and updates from v7.1-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/android/binder/Makefile

26ff969926a08eee069767ddbbbc301adbcd9676 - Merge tag 'rust-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux

Mon, 13 Apr 2026 18:54:20 +0200

Merge tag 'rust-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linuxPull Rust updates from Miguel Ojeda: "Toolchain and infrastructure: - Bump the minimum Rust version to 1.85.0 (and 'bindgen' to 0.71.1). As proposed in LPC 2025 and the Maintainers Summit [1], we are going to follow Debian Stable's Rust versions as our minimum versions. Debian Trixie was released on 2025-08-09 with a Rust 1.85.0 and 'bindgen' 0.71.1 toolchain, which is a fair amount of time for e.g. kernel developers to upgrade. Other major distributions support a Rust version that is high enough as well, including: + Arch Linux. + Fedora Linux. + Gentoo Linux. + Nix. + openSUSE Slowroll and openSUSE Tumbleweed. + Ubuntu 25.10 and 26.04 LTS. In addition, 24.04 LTS using their versioned packages. The merged patch series comes with the associated cleanups and simplifications treewide that can be performed thanks to both bumps, as well as documentation updates. In addition, start using 'bindgen''s '--with-attribute-custom-enum' feature to set the 'cfi_encoding' attribute for the 'lru_status' enum used in Binder. Link: https://lwn.net/Articles/1050174/ [1] - Add experimental Kconfig option ('CONFIG_RUST_INLINE_HELPERS') that inlines C helpers into Rust. Essentially, it performs a step similar to LTO, but just for the helpers, i.e. very local and fast. It relies on 'llvm-link' and its '--internalize' flag, and requires a compatible LLVM between Clang and 'rustc' (i.e. same major version, 'CONFIG_RUSTC_CLANG_LLVM_COMPATIBLE'). It is only enabled for two architectures for now. The result is a measurable speedup in different workloads that different users have tested. For instance, for the null block driver, it amounts to a 2%. - Support global per-version flags. While we already have per-version flags in many places, we didn't have a place to set global ones that depend on the compiler version, i.e. in 'rust_common_flags', which sometimes is needed to e.g. tweak the lints set per version. Use that to allow the 'clippy::precedence' lint for Rust < 1.86.0, since it had a change in behavior. - Support overriding the crate name and apply it to Rust Binder, which wanted the module to be called 'rust_binder'. - Add the remaining '__rust_helper' annotations (started in the previous cycle). 'kernel' crate: - Introduce the 'const_assert!' macro: a more powerful version of 'static_assert!' that can refer to generics inside functions or implementation bodies, e.g.: fn f() { const_assert!(N > 1); } fn g() { const_assert!(size_of::() > 0, "T cannot be ZST"); } In addition, reorganize our set of build-time assertion macros ('{build,const,static_assert}!') to live in the 'build_assert' module. Finally, improve the docs as well to clarify how these are different from one another and how to pick the right one to use, and their equivalence (if any) to the existing C ones for extra clarity. - 'sizes' module: add 'SizeConstants' trait. This gives us typed 'SZ_*' constants (avoiding casts) for use in device address spaces where the address width depends on the hardware (e.g. 32-bit MMIO windows, 64-bit GPU framebuffers, etc.), e.g.: let gpu_heap = 14 * u64::SZ_1M; let mmio_window = u32::SZ_16M; - 'clk' module: implement 'Send' and 'Sync' for 'Clk' and thus simplify the users in Tyr and PWM. - 'ptr' module: add 'const_align_up'. - 'str' module: improve the documentation of the 'c_str!' macro to explain that one should only use it for non-literal cases (for the other case we instead use C string literals, e.g. 'c"abc"'). - Disallow the use of 'CStr::{as_ptr,from_ptr}' and clean one such use in the 'task' module. - 'sync' module: finish the move of 'ARef' and 'AlwaysRefCounted' outside of the 'types' module, i.e. update the last remaining instances and finally remove the re-exports. - 'error' module: clarify that 'from_err_ptr' can return 'Ok(NULL)', including runtime-tested examples. The intention is to hopefully prevent UB that assumes the result of the function is not 'NULL' if successful. This originated from a case of UB I noticed in 'regulator' that created a 'NonNull' on it. Timekeeping: - Expand the example section in the 'HrTimer' documentation. - Mark the 'ClockSource' trait as unsafe to ensure valid values for 'ktime_get()'. - Add 'Delta::from_nanos()'. 'pin-init' crate: - Replace the 'Zeroable' impls for 'Option' with impls of 'ZeroableOption' for 'NonZero*'. - Improve feature gate handling for unstable features. - Declutter the documentation of implementations of 'Zeroable' for tuples. - Replace uses of 'addr_of[_mut]!' with '&raw [mut]'. rust-analyzer: - Add type annotations to 'generate_rust_analyzer.py'. - Add support for scripts written in Rust ('generate_rust_target.rs', 'rustdoc_test_builder.rs', 'rustdoc_test_gen.rs'). - Refactor 'generate_rust_analyzer.py' to explicitly identify host and target crates, improve readability, and reduce duplication. And some other fixes, cleanups and improvements"* tag 'rust-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux: (79 commits) rust: sizes: add SizeConstants trait for device address space constants rust: kernel: update `file_with_nul` comment rust: kbuild: allow `clippy::precedence` for Rust < 1.86.0 rust: kbuild: support global per-version flags rust: declare cfi_encoding for lru_status docs: rust: general-information: use real example docs: rust: general-information: simplify Kconfig example docs: rust: quick-start: remove GDB/Binutils mention docs: rust: quick-start: remove Nix "unstable channel" note docs: rust: quick-start: remove Gentoo "testing" note docs: rust: quick-start: add Ubuntu 26.04 LTS and remove subsection title docs: rust: quick-start: update minimum Ubuntu version docs: rust: quick-start: update Ubuntu versioned packages docs: rust: quick-start: openSUSE provides `rust-src` package nowadays rust: kbuild: remove "dummy parameter" workaround for `bindgen` < 0.71.1 rust: kbuild: update `bindgen --rust-target` version and replace comment rust: rust_is_available: remove warning for `bindgen` < 0.69.5 && libclang >= 19.1 rust: rust_is_available: remove warning for `bindgen` 0.66.[01] rust: bump `bindgen` minimum supported version to 0.71.1 (Debian Trixie) rust: block: update `const_refs_to_static` MSRV TODO comment ... List of files: /linux/drivers/android/binder/Makefile

7ab26eb5a2b4009344580117ef05981867e0c7d7 - Merge patch series "rust: bump minimum Rust and `bindgen` versions"

Tue, 07 Apr 2026 10:40:11 +0200

Merge patch series "rust: bump minimum Rust and `bindgen` versions"As proposed in the past in e.g. LPC 2025 and the Maintainers Summit [1],we are going to follow Debian Stable's Rust versions as our minimumsupported version.Debian Trixie was released with a Rust 1.85.0 toolchain [2], which itstill uses to this day [3] (i.e. no update to Rust 1.85.1).Debian Trixie was released with `bindgen` 0.71.1, which it also stilluses to this day [4].Debian Trixie's release happened on 2025-08-09 [5], which means that afair amount of time has passed since its release for kernel developersto upgrade.Thus bump the minimum to the new versions, i.e. - Rust: 1.78.0 -> 1.85.0 - bindgen: 0.65.1 -> 0.71.1There are a few main parts to the series, in this order: - A few cleanups that can be performed before the bumps. - The Rust bump (and its cleanups). - The `bindgen` bump (and its cleanups). - Documentation updates. - The `cfi_encoding` patch, added here, which needs the bump. - The per-version flags support and a Clippy cleanup on top.Link: https://lwn.net/Articles/1050174/ [1]Link: https://www.debian.org/releases/trixie/release-notes/whats-new.en.html#desktops-and-well-known-packages [2]Link: https://packages.debian.org/trixie/rustc [3]Link: https://packages.debian.org/trixie/bindgen [4]Link: https://www.debian.org/releases/trixie/ [5]Link: https://patch.msgid.link/20260405235309.418950-1-ojeda@kernel.orgSigned-off-by: Miguel Ojeda List of files: /linux/drivers/android/binder/Makefile

9e5946de3a3876113098dc272873802baff022cc - rust: declare cfi_encoding for lru_status

Mon, 06 Apr 2026 01:53:07 +0200

rust: declare cfi_encoding for lru_statusBy default bindgen will convert 'enum lru_status' into a typedef for aninteger. For the most part, an integer of the same size as the enumresults in the correct ABI, but in the specific case of CFI, that is notthe case. The CFI encoding is supposed to be the same as a struct called'lru_status' rather than the name of the underlying native integer type.To fix this, tell bindgen to generate a newtype and set the CFI typeexplicitly. Note that we need to set the CFI attribute explicitly asbindgen is using repr(transparent), which is otherwise identical to theinner type for ABI purposes.This allows us to remove the page range helper C function in Binderwithout risking a CFI failure when list_lru_walk calls the providedfunction pointer.The --with-attribute-custom-enum argument requires bindgen v0.71 orgreater.[ In particular, the feature was added in 0.71.0 [1][2]. In addition, `feature(cfi_encoding)` has been available since Rust 1.71.0 [3]. Link: https://github.com/rust-lang/rust-bindgen/issues/2520 [1] Link: https://github.com/rust-lang/rust-bindgen/pull/2866 [2] Link: https://github.com/rust-lang/rust/pull/105452 [3] - Miguel ]My testing procedure was to add this to the android17-6.18 branch andverify that rust_shrink_free_page is successfully called without crash,and verify that it does in fact crash when the cfi_encoding is set toother values. Note that I couldn't test this on android16-6.12 as thatbranch uses a bindgen version that is too old.Signed-off-by: Alice Ryhl Link: https://patch.msgid.link/20260223-cfi-lru-status-v2-1-89c6448a63a4@google.com[ Rebased on top of the minimum Rust version bump series which provide the required `bindgen` version. - Miguel ]Reviewed-by: Gary Guo Link: https://patch.msgid.link/20260405235309.418950-32-ojeda@kernel.orgSigned-off-by: Miguel Ojeda List of files: /linux/drivers/android/binder/Makefile

a4a508df2aa34f8650afde54ea804321c618f45f - Merge tag 'v6.18' into next

Sat, 13 Dec 2025 10:18:20 +0100

Merge tag 'v6.18' into nextSync up with the mainline to bring in the latest APIs. List of files: /linux/drivers/android/binder/Makefile

7362b5b493102c6b71827c2da22117b475528f6d - Merge branch 'for-6.19/nintendo' into for-linus

Tue, 02 Dec 2025 14:46:11 +0100

Merge branch 'for-6.19/nintendo' into for-linus- switch to WQ_PERCPU workaueues (Marco Crivellari)- reduce potential initialization blocking time of hid-nintendo (Willy Huang) List of files: /linux/drivers/android/binder/Makefile

cb9f145f638d7afa633632a9290d6ad06caeb8ee - Merge remote-tracking branch 'drm/drm-next' into msm-next-robclark

Sat, 01 Nov 2025 13:47:30 +0100

Merge remote-tracking branch 'drm/drm-next' into msm-next-robclarkBack-merge drm-next to get caught up.Signed-off-by: Rob Clark List of files: /linux/drivers/android/binder/Makefile

82ee50252dc891e3f3b32d923bb4f656d300b772 - Merge drm/drm-next into drm-xe-next

Tue, 14 Oct 2025 11:31:49 +0200

Merge drm/drm-next into drm-xe-nextBackmerging to bring in 6.18-rc1.Signed-off-by: Thomas Hellström List of files: /linux/drivers/android/binder/Makefile

2acee98fcc61052d63fab4539fcb6ee677555645 - Merge drm/drm-next into drm-intel-next

Tue, 14 Oct 2025 09:37:11 +0200

Merge drm/drm-next into drm-intel-nextSync to v6.18-rc1.Signed-off-by: Jani Nikula List of files: /linux/drivers/android/binder/Makefile

9b966ae42235a88eaea714be09ff3d698535bdfe - Merge drm/drm-next into drm-misc-next

Mon, 13 Oct 2025 09:19:19 +0200

Merge drm/drm-next into drm-misc-nextUpdating drm-misc-next to the state of v6.18-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/android/binder/Makefile

39e9d5f63075f4d54e3b59b8238478c32af92755 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf before 6.18-rc1

Sun, 12 Oct 2025 03:27:47 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf before 6.18-rc1Cross-merge BPF and other fixes after downstream PR.No conflicts.Signed-off-by: Alexei Starovoitov List of files: /linux/drivers/android/binder/Makefile

2ace52718376fdb56aca863da2eebe70d7e2ddb1 - Merge branch 'objtool/core'

Fri, 21 Nov 2025 11:21:20 +0100

Merge branch 'objtool/core'Bring in the UDB and objtool data annotations to avoid conflicts while further extending the bug exceptions.Signed-off-by: Peter Zijlstra List of files: /linux/drivers/android/binder/Makefile