Changes in Makefile

a23e1966932464e1c5226cb9ac4ce1d5fc10ba22 - Merge branch 'next' into for-linus

Mon, 15 Jul 2024 21:03:44 +0000

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

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

Tue, 28 May 2024 04:37:18 +0000

Merge tag 'v6.9' into nextSync up with the mainline to bring in the new cleanup API. List of files: /linux/tools/testing/selftests/filelock/Makefile

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

Tue, 24 Oct 2023 08:50:22 +0000

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/filelock/Makefile

a940daa52167e9db8ecce82213813b735a9d9f23 - Merge branch 'linus' into smp/core

Tue, 17 Oct 2023 19:40:46 +0000

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/filelock/Makefile

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

Wed, 11 Oct 2023 07:50:59 +0000

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/filelock/Makefile

7d6904bf26b96ef087514cb7a8c50b62a4911c99 - Merge wireless into wireless-next

Thu, 05 Oct 2023 20:57:34 +0000

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/filelock/Makefile

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

Mon, 18 Sep 2023 20:17:15 +0000

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

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

Fri, 15 Sep 2023 08:23:38 +0000

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

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

Tue, 12 Sep 2023 06:53:30 +0000

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

f20ae9cf5b0743e70ed460ae52f976a8488a8c79 - Merge tag 'filelock-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux

Mon, 28 Aug 2023 18:47:24 +0000

Merge tag 'filelock-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linuxPull file locking updates from Jeff Layton: - new functionality for F_OFD_GETLK: requesting a type of F_UNLCK will find info about whatever lock happens to be first in the given range, regardless of type. - an OFD lock selftest - bugfix involving a UAF in a tracepoint - comment typo fix* tag 'filelock-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux: locks: fix KASAN: use-after-free in trace_event_raw_event_filelock_lock fs/locks: Fix typo selftests: add OFD lock tests fs/locks: F_UNLCK extension for F_OFD_GETLK List of files: /linux/tools/testing/selftests/filelock/Makefile

bfe2e8f569073e7297ad19932b980964105bb777 - selftests: add OFD lock tests

Thu, 22 Jun 2023 16:52:24 +0000

selftests: add OFD lock testsTest the basic locking stuff on 2 fds: multiple read locks,conflicts between read and write locks, use of len==0 for queries.Also tests for F_UNLCK F_OFD_GETLK extension.[ jlayton: fix unlink() pathname in selftest ]Cc: Jeff Layton Cc: Chuck Lever Cc: Alexander Viro Cc: Christian Brauner Cc: linux-fsdevel@vger.kernel.orgCc: linux-kernel@vger.kernel.orgCc: Shuah Khan Cc: linux-kselftest@vger.kernel.orgCc: linux-api@vger.kernel.orgSigned-off-by: Stas Sergeev Signed-off-by: Jeff Layton List of files: /linux/tools/testing/selftests/filelock/Makefile