Changes in Makefile

c771600c6af14749609b49565ffb4cac2959710d - Merge drm/drm-next into drm-intel-gt-next

Wed, 05 Feb 2025 10:29:14 +0100

Merge drm/drm-next into drm-intel-gt-nextWe need4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")in order to land a i915 PMU simplification and a fix. That landed in 6.12and we are stuck at 6.9 so lets bump things forward.Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/firmware/arm_ffa/Makefile

36ec807b627b4c0a0a382f0ae48eac7187d14b2b - Merge branch 'next' into for-linus

Fri, 20 Sep 2024 10:24:24 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.12 merge window. List of files: /linux/drivers/firmware/arm_ffa/Makefile

f057b57270c2a17d3f45c177e9434fa5745caa48 - Merge branch 'ib/6.11-rc6-matrix-keypad-spitz' into next

Fri, 06 Sep 2024 06:49:07 +0200

Merge branch 'ib/6.11-rc6-matrix-keypad-spitz' into nextBring in changes removing support for platform data from matrix-keypaddriver. List of files: /linux/drivers/firmware/arm_ffa/Makefile

66e72a01b60ae6950ddbb3585fdc1424d303e14b - Merge tag 'v6.11-rc1' into clk-meson-next

Mon, 29 Jul 2024 16:32:02 +0200

Merge tag 'v6.11-rc1' into clk-meson-nextLinux 6.11-rc1 List of files: /linux/drivers/firmware/arm_ffa/Makefile

ee057c8c194b9283f4137b253b70e292693a39f0 - Merge tag 'v6.11-rc3' into trace/ring-buffer/core

Wed, 14 Aug 2024 22:56:42 +0200

Merge tag 'v6.11-rc3' into trace/ring-buffer/coreThe "reserve_mem" kernel command line parameter has been pulled intov6.11. Merge the latest -rc3 to allow the persistent ring buffer memory tobe able to be mapped at the address specified by the "reserve_mem" commandline parameter.Signed-off-by: Steven Rostedt (Google) List of files: /linux/drivers/firmware/arm_ffa/Makefile

c8faf11cd192214e231626c3ee973a35d8fc33f2 - Merge tag 'v6.11-rc1' into for-6.12

Tue, 30 Jul 2024 21:30:11 +0200

Merge tag 'v6.11-rc1' into for-6.12Linux 6.11-rc1 List of files: /linux/drivers/firmware/arm_ffa/Makefile

ed7171ff9fabc49ae6ed42fbd082a576473836fc - Merge drm/drm-next into drm-xe-next

Fri, 16 Aug 2024 19:05:54 +0200

Merge drm/drm-next into drm-xe-nextGet drm-xe-next on v6.11-rc2 and synchronized with drm-intel-next forthe display side. This resolves the current conflict for theenable_display module parameter and allows further pending refactors.Signed-off-by: Lucas De Marchi List of files: /linux/drivers/firmware/arm_ffa/Makefile

5c61f59824b5e46516ea5d0543ad7a8871567416 - Merge drm/drm-next into drm-misc-next

Mon, 12 Aug 2024 14:14:18 +0200

Merge drm/drm-next into drm-misc-nextGet drm-misc-next to the state of v6.11-rc2.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/firmware/arm_ffa/Makefile

3663e2c4bc45fcdc71931fcbfcbfbf9b71f55c83 - Merge drm/drm-next into drm-intel-next

Thu, 01 Aug 2024 12:06:09 +0200

Merge drm/drm-next into drm-intel-nextSync with v6.11-rc1 in general, and specifically get the newBACKLIGHT_POWER_ constants for power states.Signed-off-by: Jani Nikula List of files: /linux/drivers/firmware/arm_ffa/Makefile

4436e6da008fee87d54c038e983e5be9a6baf8fb - Merge branch 'linus' into x86/mm

Fri, 02 Aug 2024 14:10:55 +0200

Merge branch 'linus' into x86/mmBring x86 and selftests up to date List of files: /linux/drivers/firmware/arm_ffa/Makefile

a1ff5a7d78a036d6c2178ee5acd6ba4946243800 - Merge drm/drm-fixes into drm-misc-fixes

Tue, 30 Jul 2024 09:09:23 +0200

Merge drm/drm-fixes into drm-misc-fixesLet's start the new drm-misc-fixes cycle by bringing in 6.11-rc1.Signed-off-by: Maxime Ripard List of files: /linux/drivers/firmware/arm_ffa/Makefile

cc0f7c3f97bc6e888bf4be28a9da9dbd3735d2b4 - Merge tag 'soc-drivers-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Tue, 16 Jul 2024 20:35:27 +0200

Merge tag 'soc-drivers-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/socPull SoC driver updates from Arnd Bergmann: "The updates to the mediatek, allwinner, ti, tegra, microchip, stm32, samsung, imx, zynq and amlogic platoforms are fairly small maintenance changes, either addressing minor mistakes or enabling additional hardware. The qualcomm platform changes add a number of features and are larger than the other ones combined, introducing the use of linux/cleanup.h across several drivers, adding support for Snapdragon X1E and other SoCs in platform drivers, a new "protection domain mapper" driver, and a "shared memory bridge" driver. The cznic "turris omnia" router based on Marvell Armada gets a platform driver that talks to the board specific microcontroller. The reset and cache subsystems get a few minor updates to SoC specific drivers, while the ff-a, scmi and optee firmware drivers get some code refactoring and new features"* tag 'soc-drivers-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (122 commits) firmware: turris-mox-rwtm: Initialize completion before mailbox firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout() firmware: turris-mox-rwtm: Do not complete if there are no waiters MAINTAINERS: drop riscv list from cache controllers platform: cznic: turris-omnia-mcu: fix Kconfig dependencies bus: sunxi-rsb: Constify struct regmap_bus soc: sunxi: sram: Constify struct regmap_config platform: cznic: turris-omnia-mcu: Depend on WATCHDOG platform: cznic: turris-omnia-mcu: Depend on OF soc: samsung: exynos-pmu: add support for PMU_ALIVE non atomic registers arm64: stm32: enable scmi regulator for stm32 firmware: qcom: tzmem: blacklist more platforms for SHM Bridge soc: qcom: wcnss: simplify with cleanup.h soc: qcom: pdr: simplify with cleanup.h soc: qcom: ocmem: simplify with cleanup.h soc: qcom: mdt_loader: simplify with cleanup.h soc: qcom: llcc: simplify with cleanup.h firmware: qcom: tzmem: simplify returning pointer without cleanup soc: qcom: socinfo: Add PM6350 PMIC arm64: dts: renesas: rz-smarc: Replace fixed regulator for USB VBUS ... List of files: /linux/drivers/firmware/arm_ffa/Makefile

87dcb2f0791bbbbe7e22ccc4321b81b8d3636ef4 - Merge tag 'ffa-updates-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into soc/drivers

Thu, 27 Jun 2024 16:41:41 +0200

Merge tag 'ffa-updates-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into soc/driversArm FF-A driver updates for v6.11The main addition is the split of bus and driver into distinct modulesThe FF-A bus module is initialized at subsys_initcall level when builtin.FF-A drivers initialization is now changed to module_init level so thatpKVM ffa proxy is all setup and running in case pKVM hypervisor needs totrap and handle FF-A calls.One of the reason for not having this split from the beginning is theneed to workaround the FF-A v1.0 NULL UUID. The FF-A bus layer calledinto FF-A driver and populated the device UUID if it matches with thedriver attempting to match. Moving the workaround away from the FF-Abus layer to the FF-A core driver as a bus notifier will help to removethe dependency.* tag 'ffa-updates-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: firmware: arm_ffa: Split bus and driver into distinct modules firmware: arm_ffa: Move the FF-A v1.0 NULL UUID workaround to bus notifierLink: https://lore.kernel.org/r/20240624103451.2870146-1-sudeep.holla@arm.comSigned-off-by: Arnd Bergmann List of files: /linux/drivers/firmware/arm_ffa/Makefile

18c250bd7ed0fc6917bad13560851ef0f519778d - firmware: arm_ffa: Split bus and driver into distinct modules

Wed, 15 May 2024 11:40:28 +0200

firmware: arm_ffa: Split bus and driver into distinct modulesMake the FF-A bus on its own as a distinct module initialized atsubsys_initcall level when builtin.Keep the FF-A driver core stack, together with any configured transport,in a different module initialized as module_init level.FF-A drivers initialization is now changed to module_init level.Acked-by: Sebastian Ene Link: https://lore.kernel.org/r/20240515094028.1947976-2-sudeep.holla@arm.comSigned-off-by: Sudeep Holla List of files: /linux/drivers/firmware/arm_ffa/Makefile

762f99f4f3cb41a775b5157dd761217beba65873 - Merge branch 'next' into for-linus

Sat, 15 Jan 2022 21:09:44 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.17 merge window. List of files: /linux/drivers/firmware/arm_ffa/Makefile

5d8dfaa71d87f742c53309b95cb6a8b274119027 - Merge tag 'v5.15' into next

Thu, 09 Dec 2021 08:43:50 +0100

Merge tag 'v5.15' into nextSync up with the mainline to get the latest APIs and DT bindings. List of files: /linux/drivers/firmware/arm_ffa/Makefile

71af75b6929458d85f63c0649dc26d6f4c19729e - Merge branch 'for-5.15-printk-index' into for-linus

Mon, 30 Aug 2021 14:56:06 +0200

Merge branch 'for-5.15-printk-index' into for-linus List of files: /linux/drivers/firmware/arm_ffa/Makefile

46466ae3a105d9620e1355e33125a413b8c6ce18 - Merge branch 'perf/urgent' into perf/core, to pick up fixes

Thu, 26 Aug 2021 09:14:05 +0200

Merge branch 'perf/urgent' into perf/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/firmware/arm_ffa/Makefile

c87866ede44ad7da6b296d732221dc34ce1b154d - Merge tag 'v5.14-rc6' into locking/core, to pick up fixes

Tue, 17 Aug 2021 16:16:29 +0200

Merge tag 'v5.14-rc6' into locking/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/firmware/arm_ffa/Makefile

ca31fef11dc83e672415d5925a134749761329bd - Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Tue, 27 Jul 2021 12:48:17 +0200

Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-nextRequired bump from v5.13-rc3 to v5.14-rc3, and to pick up sysfb compilation fixes.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/firmware/arm_ffa/Makefile