Changes in Makefile

f4b369c6fe0ceaba2da2daff8c9eb415f85926dd - Merge branch 'next' into for-linus

Mon, 20 Apr 2026 03:28:57 +0200

Merge branch 'next' into for-linusPrepare input updates for 7.1 merge window. List of files: /linux/fs/nfs/Makefile

0421ccdfad0d92713a812a5aeb7d07b0ea7213c8 - Merge tag 'v7.0-rc3' into next

Thu, 12 Mar 2026 18:44:42 +0100

Merge tag 'v7.0-rc3' into nextSync up with the mainline to brig up the latest changes, specificallychanges to ALPS driver. List of files: /linux/fs/nfs/Makefile

3e9e952bb3139ad1e08f3e1960239c2988ab90c9 - Merge branch 'for-7.1-printf-kunit-build' into for-linus

Mon, 20 Apr 2026 13:41:28 +0200

Merge branch 'for-7.1-printf-kunit-build' into for-linus List of files: /linux/fs/nfs/Makefile

42d3b66d4cdbacfc9d120d2301b8de89cc29a914 - Merge drm/drm-next into drm-xe-next

Thu, 12 Mar 2026 15:17:56 +0100

Merge drm/drm-next into drm-xe-nextBackmerging to bring in 7.00-rc3. Important ahead GPU SVM merging THPsupport.Signed-off-by: Matthew Brost List of files: /linux/fs/nfs/Makefile

f09812b85fa6f41058bcc46e70ac406bf9b0493a - Merge drm/drm-next into drm-intel-next

Wed, 25 Feb 2026 12:23:04 +0100

Merge drm/drm-next into drm-intel-nextSync with v7.0-rc1 which contains a few treewide changes affecting i915.Signed-off-by: Jani Nikula List of files: /linux/fs/nfs/Makefile

8b85987d3cf50178f67618122d9f3bb202f62f42 - Merge drm/drm-next into drm-misc-next

Mon, 23 Feb 2026 11:48:20 +0100

Merge drm/drm-next into drm-misc-nextLet's merge 7.0-rc1 to start the new drm-misc-next windowSigned-off-by: Maxime Ripard List of files: /linux/fs/nfs/Makefile

c17ee635fd3a482b2ad2bf5e269755c2eae5f25e - Merge drm/drm-fixes into drm-misc-fixes

Mon, 23 Feb 2026 10:09:45 +0100

Merge drm/drm-fixes into drm-misc-fixes7.0-rc1 was just released, let's merge it to kick the new release cycle.Signed-off-by: Maxime Ripard List of files: /linux/fs/nfs/Makefile

7449f86bafcdb588422bb14a4babfd285e723670 - Merge tag 'nfs-for-7.0-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

Fri, 13 Feb 2026 02:49:33 +0100

Merge tag 'nfs-for-7.0-1' of git://git.linux-nfs.org/projects/anna/linux-nfsPull NFS client updates from Anna Schumaker: "New Features: - Use an LRU list for returning unused delegations - Introduce a KConfig option to disable NFS v4.0 and make NFS v4.1 the default Bugfixes: - NFS/localio: - Handle short writes by retrying - Prevent direct reclaim recursion into NFS via nfs_writepages - Use GFP_NOIO and non-memreclaim workqueue in nfs_local_commit - Remove -EAGAIN handling in nfs_local_doio() - pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN - fs/nfs: Fix a readdir slow-start regression - SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path Other cleanups and improvements: - A few other NFS/localio cleanups - Various other delegation handling cleanups from Christoph - Unify security_inode_listsecurity() calls - Improvements to NFSv4 lease handling - Clean up SUNRPC *_debug fields when CONFIG_SUNRPC_DEBUG is not set"* tag 'nfs-for-7.0-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (60 commits) SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path nfs: nfs4proc: Convert comma to semicolon SUNRPC: Change list definition method sunrpc: rpc_debug and others are defined even if CONFIG_SUNRPC_DEBUG unset NFSv4: limit lease period in nfs4_set_lease_period() NFSv4: pass lease period in seconds to nfs4_set_lease_period() nfs: unify security_inode_listsecurity() calls fs/nfs: Fix readdir slow-start regression pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN NFS: fix delayed delegation return handling NFS: simplify error handling in nfs_end_delegation_return NFS: fold nfs_abort_delegation_return into nfs_end_delegation_return NFS: remove the delegation == NULL check in nfs_end_delegation_return NFS: use bool for the issync argument to nfs_end_delegation_return NFS: return void from ->return_delegation NFS: return void from nfs4_inode_make_writeable NFS: Merge CONFIG_NFS_V4_1 with CONFIG_NFS_V4 NFS: Add a way to disable NFS v4.0 via KConfig NFS: Move sequence slot operations into minorversion operations NFS: Pass a struct nfs_client to nfs4_init_sequence() ... List of files: /linux/fs/nfs/Makefile

7537db24806fdc3d3ec4fef53babdc22c9219e75 - NFS: Merge CONFIG_NFS_V4_1 with CONFIG_NFS_V4

Thu, 04 Dec 2025 21:44:33 +0100

NFS: Merge CONFIG_NFS_V4_1 with CONFIG_NFS_V4Compiling the NFSv4 module without any minorversion support doesn't makemuch sense, so this patch sets NFS v4.1 as the default, always enabledNFS version allowing us to replace all the CONFIG_NFS_V4_1s scatteredthroughout the code with CONFIG_NFS_V4.Signed-off-by: Anna Schumaker List of files: /linux/fs/nfs/Makefile

4e0269352534715915aae3fb84dd4d3bb3ff3738 - NFS: Add a way to disable NFS v4.0 via KConfig

Fri, 21 Nov 2025 20:53:50 +0100

NFS: Add a way to disable NFS v4.0 via KConfigI introduce NFS4_MIN_MINOR_VERSION as a parallel toNFS4_MAX_MINOR_VERSION to check if NFS v4.0 has been compiled in andreturn an appropriate error if not.Signed-off-by: Anna Schumaker List of files: /linux/fs/nfs/Makefile

c96c05fcfe395e93f738d924dfd40571ca4302ca - NFS: Split out the nfs40_reboot_recovery_ops into nfs40client.c

Thu, 13 Nov 2025 17:10:17 +0100

NFS: Split out the nfs40_reboot_recovery_ops into nfs40client.cSigned-off-by: Anna Schumaker List of files: /linux/fs/nfs/Makefile

e5e45ea615a13edac86d6f84bbd5fc1c5d532a10 - NFS: Move nfs40_call_sync_ops into nfs40proc.c

Fri, 07 Nov 2025 22:30:51 +0100

NFS: Move nfs40_call_sync_ops into nfs40proc.cThis is the first step in extracting NFS v4.0 into its own set of filesthat can be disabled through Kconfig.Signed-off-by: Anna Schumaker List of files: /linux/fs/nfs/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/fs/nfs/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/fs/nfs/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/fs/nfs/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/fs/nfs/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/fs/nfs/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/fs/nfs/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/fs/nfs/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/fs/nfs/Makefile