diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-25 10:14:11 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-25 10:14:11 +0200 |
| commit | b14302a8c835befaa67f7adfc01514b6e80a9b74 (patch) | |
| tree | 0c2230284e9fa2a43abd274b5a0511526aaeb97f /patch-5.17-redhat.patch | |
| parent | d825b7ec7a402e2a67c7063731e92f4689e5f8fd (diff) | |
| parent | 20602ec6c1b74c305c8a7aa3d7c20fb1dab82c53 (diff) | |
| download | kernel-b14302a8c835befaa67f7adfc01514b6e80a9b74.tar.gz kernel-b14302a8c835befaa67f7adfc01514b6e80a9b74.tar.xz kernel-b14302a8c835befaa67f7adfc01514b6e80a9b74.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.17-redhat.patch')
| -rw-r--r-- | patch-5.17-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 07901a9c3..42a316da2 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -111,7 +111,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 3cf179812f0f..ca873b29f0b2 100644 +index aba139bbd1c7..01a8c0b291ac 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1917,7 +1917,7 @@ index d1f34229e11a..e828504cc396 100644 if (error < 0) return error; diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c -index ea17fa1f31ec..e2d59bb5e6bb 100644 +index d20891162145..9a16897e8dc6 100644 --- a/fs/nfs/fs_context.c +++ b/fs/nfs/fs_context.c @@ -80,6 +80,7 @@ enum nfs_param { |