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/mtd/spi-nor/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/mtd/spi-nor/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/mtd/spi-nor/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/mtd/spi-nor/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/mtd/spi-nor/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/mtd/spi-nor/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/mtd/spi-nor/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/mtd/spi-nor/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/mtd/spi-nor/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/mtd/spi-nor/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/mtd/spi-nor/Makefile

c43a20e4a520b37c2ef6d4f422de989992c9129f - Merge tag 'mtd/for-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

Sat, 20 Jul 2024 20:52:17 +0200

Merge tag 'mtd/for-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linuxPull MTD updates from Miquel Raynal: "Nothing stands out for this merge window, mostly minor fixes, such as module descriptions, the use of debug macros and Makefile improvements. Raw NAND changes; - The Freescale MXC driver has been converted to the newer '->exec_op()' interface - The meson driver now supports handling the boot ROM area with very specific ECC needs - Support for the iMX8QXP has been added to the GPMI driver - The lpx32xx driver now can get the DMA channels using DT entries - The Qcom binding has been improved to be more future proof by Rob - And then there is the usual load of misc and minor changes SPI-NAND changes: - The Macronix vendor driver has been improved to support an extended ID to avoid conflicting with older devices after an ID reuse issue SPI NOR changes: - Drop support for Xilinx S3AN flashes. These flashes are for the very old Xilinx Spartan 3 FPGAs and they need some awkward code in the core to support. Drop support for these flashes, along with the special handling we needed for them in the core like non-power-of-2 page size handling and the .setup() callback. - Fix regression for old w25q128 flashes without SFDP tables. Commit 83e824a4a595 ("mtd: spi-nor: Correct flags for Winbond w25q128") dropped support for such devices under the assumption that they aren't being used anymore. Users have now surfaced [0] so fix the regression by supporting both kind of devices. - Core cleanups including removal of SPI_NOR_NO_FR flag and simplification of spi_nor_get_flash_info()"Link: https://lore.kernel.org/r/CALxbwRo_-9CaJmt7r7ELgu+vOcgk=xZcGHobnKf=oT2=u4d4aA@mail.gmail.com/ [0]* tag 'mtd/for-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (28 commits) mtd: rawnand: lpx32xx: Fix dma_request_chan() error checks mtd: spinand: macronix: Add support for serial NAND flash mtd: spinand: macronix: Add support for reading Device ID 2 mtd: rawnand: lpx32xx: Request DMA channels using DT entries dt-bindings: mtd: qcom,nandc: Define properties at top-level mtd: rawnand: intel: use 'time_left' variable with wait_for_completion_timeout() mtd: rawnand: mxc: use 'time_left' variable with wait_for_completion_timeout() mtd: rawnand: gpmi: add iMX8QXP support. mtd: rawnand: gpmi: add 'support_edo_timing' in gpmi_devdata mtd: cmdlinepart: Replace `dbg()` macro with `pr_debug()` mtd: add missing MODULE_DESCRIPTION() macros mtd: make mtd_test.c a separate module dt-bindings: mtd: gpmi-nand: Add 'fsl,imx8qxp-gpmi-nand' compatible string mtd: rawnand: cadence: remove unused struct 'ecc_info' mtd: rawnand: mxc: support software ECC mtd: rawnand: mxc: implement exec_op mtd: rawnand: mxc: separate page read from ecc calc mtd: spi-nor: winbond: fix w25q128 regression mtd: spi-nor: simplify spi_nor_get_flash_info() mtd: spi-nor: get rid of SPI_NOR_NO_FR ... List of files: /linux/drivers/mtd/spi-nor/Makefile

b93f410b8b2a9a6344ea27ea9f1038e351b112f3 - Merge tag 'spi-nor/for-6.11' into mtd/next

Sat, 20 Jul 2024 14:24:26 +0200

Merge tag 'spi-nor/for-6.11' into mtd/nextSPI NOR changes for 6.11Notable changes:- Drop support for Xilinx S3AN flashes. These flashes are for the very old Xilinx Spartan 3 FPGAs and they need some awkward code in the core to support. Drop support for these flashes, along with the special handling we needed for them in the core like non-power-of-2 page size handling and the .setup() callback.- Fix regression for old w25q128 flashes without SFDP tables. Commit 83e824a4a595 ("mtd: spi-nor: Correct flags for Winbond w25q128") dropped support for such devices under the assumption that they aren't being used anymore. Users have now surfaced [0] so fix the regression by supporting both kind of devices.- Core cleanups including removal of SPI_NOR_NO_FR flag and simplification of spi_nor_get_flash_info().[0] https://lore.kernel.org/r/CALxbwRo_-9CaJmt7r7ELgu+vOcgk=xZcGHobnKf=oT2=u4d4aA@mail.gmail.com/Signed-off-by: Miquel Raynal List of files: /linux/drivers/mtd/spi-nor/Makefile

be1d1a76570c6e82fb51e77e7d0ad2d6e8157fea - mtd: spi-nor: Remove support for Xilinx S3AN flashes

Fri, 19 Apr 2024 16:12:44 +0200

mtd: spi-nor: Remove support for Xilinx S3AN flashesThese flashes are kind of an oddball for the very old Xilinx Spartan 3FPGAs to store their bitstream. More importantly, they reuse the AtmelJEDEC manufacturer ID and in fact the at45db081d already blocks the useof the 3S700AN flash chip. It's time to sunset support for theseflashes.Signed-off-by: Michael Walle Acked-by: Tudor Ambarus Reviewed-by: Pratyush Yadav Cc: Ricardo Ribalda Acked-by: Ricardo Ribalda Signed-off-by: Pratyush Yadav Link: https://lore.kernel.org/r/20240419141249.609534-2-mwalle@kernel.org List of files: /linux/drivers/mtd/spi-nor/Makefile

a23e1966932464e1c5226cb9ac4ce1d5fc10ba22 - Merge branch 'next' into for-linus

Mon, 15 Jul 2024 23:03:44 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.11 merge window. List of files: /linux/drivers/mtd/spi-nor/Makefile

6f47c7ae8c7afaf9ad291d39f0d3974f191a7946 - Merge tag 'v6.9' into next

Tue, 28 May 2024 06:37:18 +0200

Merge tag 'v6.9' into nextSync up with the mainline to bring in the new cleanup API. List of files: /linux/drivers/mtd/spi-nor/Makefile

60a2f25de7b8b785baee2932db932ae9a5b8c86d - Merge drm/drm-next into drm-intel-gt-next

Thu, 16 May 2024 09:33:01 +0200

Merge drm/drm-next into drm-intel-gt-nextSome display refactoring patches are needed in order to allow conflict-less merging.Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/mtd/spi-nor/Makefile

0ea5c948cb64bab5bc7a5516774eb8536f05aa0d - Merge drm/drm-next into drm-intel-next

Mon, 15 Jan 2024 08:38:05 +0100

Merge drm/drm-next into drm-intel-nextBackmerge to bring Xe driver to drm-intel-next.Signed-off-by: Jani Nikula List of files: /linux/drivers/mtd/spi-nor/Makefile

03c11eb3b16dc0058589751dfd91f254be2be613 - Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch

Wed, 14 Feb 2024 10:45:07 +0100

Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branchConflicts: arch/x86/include/asm/percpu.h arch/x86/include/asm/text-patching.hSigned-off-by: Ingo Molnar List of files: /linux/drivers/mtd/spi-nor/Makefile

ab1c247094e323177a578b38f0325bf79f0317ac - Merge remote-tracking branch 'torvalds/master' into perf-tools-next

Tue, 19 Dec 2023 01:37:07 +0100

Merge remote-tracking branch 'torvalds/master' into perf-tools-nextTo pick up fixes that went thru perf-tools for v6.7 and to get in syncwith upstream to check for drift in the copies of headers, etc.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/mtd/spi-nor/Makefile