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/tools/testing/memblock/Makefile

25768de50b1f2dbb6ea44bd5148a87fe2c9c3688 - Merge branch 'next' into for-linus

Tue, 21 Jan 2025 06:37:39 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.14 merge window. List of files: /linux/tools/testing/memblock/Makefile

6d4a0f4ea72319c9a37c1a7191695467006dd272 - Merge tag 'v6.13-rc3' into next

Tue, 17 Dec 2024 18:40:45 +0100

Merge tag 'v6.13-rc3' into nextSync up with the mainline. List of files: /linux/tools/testing/memblock/Makefile

77b679453d3364688ff3e5153c0be5b2b52672b7 - Merge tag 'v6.12-rc3' into perf-tools-next

Mon, 14 Oct 2024 19:45:28 +0200

Merge tag 'v6.12-rc3' into perf-tools-nextTo get the fixes in the current perf-tools tree.Signed-off-by: Namhyung Kim List of files: /linux/tools/testing/memblock/Makefile

3fd6c59042dbba50391e30862beac979491145fe - Merge tag 'v6.12-rc1' into clk-meson-next

Mon, 30 Sep 2024 11:28:07 +0200

Merge tag 'v6.12-rc1' into clk-meson-nextLinux 6.12-rc1 List of files: /linux/tools/testing/memblock/Makefile

a0efa2f362a69e47b9d8b48f770ef3a0249a7911 - Merge net-next/main to resolve conflicts

Wed, 09 Oct 2024 08:59:14 +0200

Merge net-next/main to resolve conflictsThe wireless-next tree was based on something older, and thereare now conflicts between -rc2 and work here. Merge net-next,which has enough of -rc2 for the conflicts to happen, resolvingthem in the process.Signed-off-by: Johannes Berg List of files: /linux/tools/testing/memblock/Makefile

b88132ceb3faccdd785809df75f9d490ebaab459 - Merge drm/drm-next into drm-xe-next

Fri, 04 Oct 2024 11:29:21 +0200

Merge drm/drm-next into drm-xe-nextBackmerging to resolve a conflict with core locally.Signed-off-by: Thomas Hellström List of files: /linux/tools/testing/memblock/Makefile

2dd0ef5d951e9b565ddb324fe26c531b6a40bf82 - Merge drm/drm-next into drm-misc-next

Mon, 30 Sep 2024 10:50:54 +0200

Merge drm/drm-next into drm-misc-nextGet drm-misc-next to up v6.12-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/tools/testing/memblock/Makefile

e0568571258d096f0277c74185bcbfc9cf21bccb - Merge drm/drm-next into drm-intel-next

Mon, 30 Sep 2024 10:49:10 +0200

Merge drm/drm-next into drm-intel-nextSync to v6.12-rc1.Signed-off-by: Jani Nikula List of files: /linux/tools/testing/memblock/Makefile

f33e46a0c6bddd341d0989484a2546bba7ac4a3c - Merge branch 'for-6.13/wacom' into for-linus

Mon, 18 Nov 2024 21:29:33 +0100

Merge branch 'for-6.13/wacom' into for-linus- Sanitization of BTN_TOOL_RUBBER handling (Jason Gerecke) List of files: /linux/tools/testing/memblock/Makefile

52c996d3f40b40f87ef9dc80596903309682acc3 - Merge remote-tracking branch 'torvalds/master' into perf-tools

Fri, 27 Sep 2024 20:36:52 +0200

Merge remote-tracking branch 'torvalds/master' into perf-toolsTo pick up changes in other trees that may affect perf, such as libbpfand in general the header files that perf has copies of, so that we cando the sync with the kernel sources.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/tools/testing/memblock/Makefile

c8d430db8eec7d4fd13a6bea27b7086a54eda6da - Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

Sun, 06 Oct 2024 09:59:22 +0200

Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEADKVM/arm64 fixes for 6.12, take #1- Fix pKVM error path on init, making sure we do not change critical system registers as we're about to fail- Make sure that the host's vector length is at capped by a value common to all CPUs- Fix kvm_has_feat*() handling of "negative" features, as the current code is pretty broken- Promote Joey to the status of official reviewer, while James steps down -- hopefully only temporarly List of files: /linux/tools/testing/memblock/Makefile

0c436dfe5c25d0931b164b944165259f95e5281f - Merge tag 'asoc-fix-v6.12-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Wed, 02 Oct 2024 21:29:16 +0200

Merge tag 'asoc-fix-v6.12-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.12A bunch of fixes here that came in during the merge window and the firstweek of release, plus some new quirks and device IDs. There's nothingmajor here, it's a bit bigger than it might've been due to there beingno fixes sent during the merge window due to your vacation. List of files: /linux/tools/testing/memblock/Makefile

2cd86f02c017bf9733e5cd891381b7d40f6f37ad - Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes

Tue, 01 Oct 2024 18:09:41 +0200

Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixesRequired for a panthor fix that broke whenFOP_UNSIGNED_OFFSET was added in place of FMODE_UNSIGNED_OFFSET.Signed-off-by: Maarten Lankhorst List of files: /linux/tools/testing/memblock/Makefile

3a39d672e7f48b8d6b91a09afa4b55352773b4b5 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Fri, 27 Sep 2024 08:13:52 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR.No conflicts and no adjacent changes.Signed-off-by: Paolo Abeni List of files: /linux/tools/testing/memblock/Makefile

aa486552a110fd6e625bb66b7edf0e0df7389a1a - Merge tag 'memblock-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

Wed, 25 Sep 2024 20:35:19 +0200

Merge tag 'memblock-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblockPull memblock updates from Mike Rapoport: - new memblock_estimated_nr_free_pages() helper to replace totalram_pages() which is less accurate when CONFIG_DEFERRED_STRUCT_PAGE_INIT is set - fixes for memblock tests* tag 'memblock-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock: s390/mm: get estimated free pages by memblock api kernel/fork.c: get estimated free pages by memblock api mm/memblock: introduce a new helper memblock_estimated_nr_free_pages() memblock test: fix implicit declaration of function 'strscpy' memblock test: fix implicit declaration of function 'isspace' memblock test: fix implicit declaration of function 'memparse' memblock test: add the definition of __setup() memblock test: fix implicit declaration of function 'virt_to_phys' tools/testing: abstract two init.h into common include directory memblock tests: include export.h in linkage.h as kernel dose memblock tests: include memory_hotplug.h in mmzone.h as kernel dose List of files: /linux/tools/testing/memblock/Makefile

a88cde5769d523e4ae6aad61237e4a5f6bd2309a - memblock test: fix implicit declaration of function 'memparse'

Tue, 06 Aug 2024 03:03:17 +0200

memblock test: fix implicit declaration of function 'memparse'Commit 1e4c64b71c9b ("mm/memblock: Add "reserve_mem" to reserved namedmemory at boot up") introduce the usage of memparse(), which is notdefined in memblock test.Add the definition and link it to fix the build.Signed-off-by: Wei Yang Link: https://lore.kernel.org/r/20240806010319.29194-3-richard.weiyang@gmail.comSigned-off-by: Mike Rapoport (Microsoft) List of files: /linux/tools/testing/memblock/Makefile

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

Tue, 11 Apr 2023 14:43:45 +0200

Merge drm/drm-next into drm-intel-gt-nextNeed to pull in commit from drm-next (earlier in drm-intel-next):1eca0778f4b3 ("drm/i915: add struct i915_dsm to wrap dsm members together")In order to merge following patch to drm-intel-gt-next:https://patchwork.freedesktop.org/patch/530942/?series=114925&rev=6Signed-off-by: Joonas Lahtinen List of files: /linux/tools/testing/memblock/Makefile

cecdd52a3dd312564f81a39df08378b7b39a2654 - Merge drm/drm-next into drm-intel-next

Tue, 28 Mar 2023 16:30:57 +0200

Merge drm/drm-next into drm-intel-nextCatch up with 6.3-rc cycle...Signed-off-by: Rodrigo Vivi List of files: /linux/tools/testing/memblock/Makefile

e752ab11dcb48353727ea26eefd740155e028865 - Merge remote-tracking branch 'drm/drm-next' into msm-next

Mon, 20 Mar 2023 18:31:25 +0100

Merge remote-tracking branch 'drm/drm-next' into msm-nextMerge drm-next into msm-next to pick up external clk and PM dependenciesfor improved a6xx GPU reset sequence.Signed-off-by: Rob Clark List of files: /linux/tools/testing/memblock/Makefile