mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 6.1 to 6.1.75 (#11830)
This commit is contained in:
parent
ab07e6a93e
commit
053f193d01
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-6.1 = .73
|
LINUX_VERSION-6.1 = .75
|
||||||
LINUX_KERNEL_HASH-6.1.73 = 6cad48706bf1cde342613dca2a2cd6dd4f79f88f9e4d356263564e4b2a5d7e87
|
LINUX_KERNEL_HASH-6.1.75 = 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
From 107c0964cb8db7ca28ac5199426414fdab3c274d Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Alexandros C. Couloumbis" <alex@ozo.com>
|
|
||||||
Date: Fri, 7 Jul 2017 17:14:51 +0200
|
|
||||||
Subject: hack: arch: powerpc: drop register save/restore library from modules
|
|
||||||
|
|
||||||
Upstream GCC uses a libgcc function for saving/restoring registers. This
|
|
||||||
makes the code bigger, and upstream kernels need to carry that function
|
|
||||||
for every single kernel module. Our GCC is patched to avoid those
|
|
||||||
references, so we can drop the extra bloat for modules.
|
|
||||||
|
|
||||||
lede-commit: e8e1084654f50904e6bf77b70b2de3f137d7b3ec
|
|
||||||
Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
|
|
||||||
---
|
|
||||||
arch/powerpc/Makefile | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/arch/powerpc/Makefile
|
|
||||||
+++ b/arch/powerpc/Makefile
|
|
||||||
@@ -42,19 +42,6 @@ machine-$(CONFIG_PPC64) += 64
|
|
||||||
machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le
|
|
||||||
UTS_MACHINE := $(subst $(space),,$(machine-y))
|
|
||||||
|
|
||||||
-# XXX This needs to be before we override LD below
|
|
||||||
-ifdef CONFIG_PPC32
|
|
||||||
-KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
|
|
||||||
-else
|
|
||||||
-ifeq ($(call ld-ifversion, -ge, 22500, y),y)
|
|
||||||
-# Have the linker provide sfpr if possible.
|
|
||||||
-# There is a corresponding test in arch/powerpc/lib/Makefile
|
|
||||||
-KBUILD_LDFLAGS_MODULE += --save-restore-funcs
|
|
||||||
-else
|
|
||||||
-KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
|
|
||||||
-endif
|
|
||||||
-endif
|
|
||||||
-
|
|
||||||
ifdef CONFIG_CPU_LITTLE_ENDIAN
|
|
||||||
KBUILD_CFLAGS += -mlittle-endian
|
|
||||||
KBUILD_LDFLAGS += -EL
|
|
@ -17,9 +17,9 @@ Signed-off-by: Steve French <stfrench@microsoft.com>
|
|||||||
|
|
||||||
--- a/fs/smb/server/oplock.c
|
--- a/fs/smb/server/oplock.c
|
||||||
+++ b/fs/smb/server/oplock.c
|
+++ b/fs/smb/server/oplock.c
|
||||||
@@ -1191,6 +1191,12 @@ int smb_grant_oplock(struct ksmbd_work *
|
@@ -1197,6 +1197,12 @@ int smb_grant_oplock(struct ksmbd_work *
|
||||||
bool prev_op_has_lease;
|
return 0;
|
||||||
__le32 prev_op_state = 0;
|
}
|
||||||
|
|
||||||
+ /* Only v2 leases handle the directory */
|
+ /* Only v2 leases handle the directory */
|
||||||
+ if (S_ISDIR(file_inode(fp->filp)->i_mode)) {
|
+ if (S_ISDIR(file_inode(fp->filp)->i_mode)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user