Changes in 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/tools/testing/selftests/user_events/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/tools/testing/selftests/user_events/Makefile

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

Tue, 24 Oct 2023 10:50:22 +0200

Merge drm/drm-next into drm-intel-gt-nextWork that needs to land in drm-intel-gt-next depends on two patches onlypresent in drm-intel-next, absence of which is causing a merge conflict: 3b918f4f0c8b ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS") ac765b7018f6 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")Signed-off-by: Tvrtko Ursulin List of files: /linux/tools/testing/selftests/user_events/Makefile

a940daa52167e9db8ecce82213813b735a9d9f23 - Merge branch 'linus' into smp/core

Tue, 17 Oct 2023 21:40:46 +0200

Merge branch 'linus' into smp/corePull in upstream to get the fixes so depending changes can be applied. List of files: /linux/tools/testing/selftests/user_events/Makefile

57390019b68b83f96eb98f490367b9df1f2d77cb - Merge drm/drm-next into drm-misc-next

Wed, 11 Oct 2023 09:50:59 +0200

Merge drm/drm-next into drm-misc-nextUpdating drm-misc-next to the state of Linux v6.6-rc2.Signed-off-by: Thomas Zimmermann List of files: /linux/tools/testing/selftests/user_events/Makefile

7d6904bf26b96ef087514cb7a8c50b62a4911c99 - Merge wireless into wireless-next

Thu, 05 Oct 2023 22:57:34 +0200

Merge wireless into wireless-nextResolve several conflicts, mostly between changes/fixes inwireless and the locking rework in wireless-next. One ofthe conflicts actually shows a bug in wireless that we'llwant to fix separately.Signed-off-by: Johannes Berg Signed-off-by: Kalle Valo List of files: /linux/tools/testing/selftests/user_events/Makefile

de80193308f43d3ae52cd3561e8ba77cd1437311 - Merge tag 'v6.6-rc4' into perf/core, to pick up fixes

Tue, 03 Oct 2023 09:32:25 +0200

Merge tag 'v6.6-rc4' into perf/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/tools/testing/selftests/user_events/Makefile

6f23fc47c1b2ac226704fb7294f43ed3b0965e51 - Merge tag 'v6.6-rc2' into locking/core, to pick up fixes

Mon, 18 Sep 2023 22:17:15 +0200

Merge tag 'v6.6-rc2' into locking/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/tools/testing/selftests/user_events/Makefile

a3f9e4bc1ec9d8f1e352eb7c1cbaea3168246be7 - Merge drm/drm-next into drm-intel-next

Fri, 15 Sep 2023 10:23:38 +0200

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

c900529f3d9161bfde5cca0754f83b4d3c3e0220 - Merge drm/drm-fixes into drm-misc-fixes

Tue, 12 Sep 2023 08:53:30 +0200

Merge drm/drm-fixes into drm-misc-fixesForwarding to v6.6-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/tools/testing/selftests/user_events/Makefile

1ac731c529cd4d6adbce134754b51ff7d822b145 - Merge branch 'next' into for-linus

Thu, 31 Aug 2023 01:06:38 +0200

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

5a31cc7297072a7266a910ca5266b640d27803b4 - Merge tag 'linux-kselftest-next-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Tue, 29 Aug 2023 03:46:47 +0200

Merge tag 'linux-kselftest-next-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftestPull Kselftest updates from Shuah Khan: "A mix of fixes, enhancements, and new tests. Bulk of the changes enhance and fix rseq and resctrl tests. In addition, user_events, dmabuf-heaps and perf_events are added to default kselftest build and test coverage. A futex test fix, enhance prctl test coverage, and minor fixes are included in this update"* tag 'linux-kselftest-next-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (32 commits) selftests: cachestat: use proper syscall number macro selftests: cachestat: properly link in librt selftests/futex: Order calls to futex_lock_pi selftests: Hook more tests into the build infrastructure selftests/user_events: Reenable build selftests/filesystems: Add six consecutive 'x' characters to mktemp selftests/rseq: Use rseq_unqual_scalar_typeof in macros selftests/rseq: Fix arm64 buggy load-acquire/store-release macros selftests/rseq: Implement rseq_unqual_scalar_typeof selftests/rseq: Fix CID_ID typo in Makefile selftests:prctl: add set-process-name to .gitignore selftests:prctl: Fix make clean override warning selftests/resctrl: Remove test type checks from cat_val() selftests/resctrl: Pass the real number of tests to show_cache_info() selftests/resctrl: Move CAT/CMT test global vars to function they are used in selftests/resctrl: Don't use variable argument list for ->setup() selftests/resctrl: Don't pass test name to fill_buf selftests/resctrl: Improve parameter consistency in fill_buf selftests/resctrl: Remove unnecessary startptr global from fill_buf selftests/resctrl: Remove "malloc_and_init_memory" param from run_fill_buf() ... List of files: /linux/tools/testing/selftests/user_events/Makefile

68b4d2d58389f9d1db7ffc02644498f215ee8c70 - selftests/user_events: Reenable build

Sun, 06 Aug 2023 13:29:59 +0200

selftests/user_events: Reenable buildThe user_events selftests were removed from the standard set ofselftests due to the uapi header it relies on having been temporarilyremoved. That header is now reinstated so we can reenable the tests.Signed-off-by: Mark Brown Signed-off-by: Shuah Khan List of files: /linux/tools/testing/selftests/user_events/Makefile

50501936288d6a29d7ef78f25d00e33240fad45f - Merge tag 'v6.4' into next

Mon, 17 Jul 2023 18:20:46 +0200

Merge tag 'v6.4' into nextSync up with mainline to bring in updates to shared infrastructure. List of files: /linux/tools/testing/selftests/user_events/Makefile

e80b500370e71b8cd7dd64be4080cee0a3e5068f - Merge branch 'for-6.5/apple' into for-linus

Tue, 27 Jun 2023 22:37:24 +0200

Merge branch 'for-6.5/apple' into for-linus- improved support for Keychron K8 keyboard (Lasse Brun) List of files: /linux/tools/testing/selftests/user_events/Makefile

db6da59cf27b5661ced03754ae0550f8914eda9e - Merge drm/drm-next into drm-misc-next-fixes

Thu, 15 Jun 2023 10:34:19 +0200

Merge drm/drm-next into drm-misc-next-fixesBackmerging to sync drm-misc-next-fixes with drm-misc-next.Signed-off-by: Thomas Zimmermann List of files: /linux/tools/testing/selftests/user_events/Makefile

03c601927b673a243c9595e1ecc9e8adfdd02438 - Merge branch 'drm-next' of git://anongit.freedesktop.org/drm/drm into msm-next-lumag-base

Mon, 12 Jun 2023 23:20:40 +0200

Merge branch 'drm-next' of git://anongit.freedesktop.org/drm/drm into msm-next-lumag-baseMerge the drm-next tree to pick up the DRM DSC helpers (merged viadrm-intel-next tree). MSM DSC v1.2 patches depend on these helpers.Signed-off-by: Dmitry Baryshkov List of files: /linux/tools/testing/selftests/user_events/Makefile

5c68005083d620b1499fc81926a514d39ae8b88c - Merge tag 'v6.4-rc4' into wpan-next/staging

Tue, 06 Jun 2023 10:42:42 +0200

Merge tag 'v6.4-rc4' into wpan-next/stagingLinux 6.4-rc4 List of files: /linux/tools/testing/selftests/user_events/Makefile

9ff17e6bdaa50892dd9bdb1b116cb71b73dd711a - Merge drm/drm-next into drm-intel-gt-next

Mon, 05 Jun 2023 12:10:23 +0200

Merge drm/drm-next into drm-intel-gt-nextFor conflict avoidance we need the following commit: c9a9f18d3ad8 drm/i915/huc: use const struct bus_type pointersSigned-off-by: Tvrtko Ursulin List of files: /linux/tools/testing/selftests/user_events/Makefile

9c3a985f88fa4de82bf4bda906095ce6444e9039 - Merge drm/drm-next into drm-intel-next

Wed, 17 May 2023 15:30:24 +0200

Merge drm/drm-next into drm-intel-nextBackmerge to get some hwmon dependencies.Signed-off-by: Rodrigo Vivi List of files: /linux/tools/testing/selftests/user_events/Makefile