projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d4468d0
8d71b61
)
Merge tag 'v4.9.233' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...
author
Mauro (mdrjr) Ribeiro
<mauro.ribeiro@hardkernel.com>
Tue, 15 Sep 2020 13:53:28 +0000
(10:53 -0300)
committer
Mauro (mdrjr) Ribeiro
<mauro.ribeiro@hardkernel.com>
Tue, 15 Sep 2020 13:53:28 +0000
(10:53 -0300)
This is the 4.9.233 stable release
23 files changed:
1
2
Makefile
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/kernel/hw_breakpoint.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpio/gpiolib-of.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/pci/pcie/aspm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/pci/quirks.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/ext4/inode.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/f2fs/dir.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/xattr.c
patch
|
diff1
|
diff2
|
blob
|
history
include/asm-generic/vmlinux.lds.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/mmzone.h
patch
|
diff1
|
diff2
|
blob
|
history
include/net/addrconf.h
patch
|
diff1
|
diff2
|
blob
|
history
include/net/sock.h
patch
|
diff1
|
diff2
|
blob
|
history
init/main.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/cgroup.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/trace/ftrace.c
patch
|
diff1
|
diff2
|
blob
|
history
mm/mmap.c
patch
|
diff1
|
diff2
|
blob
|
history
mm/page_alloc.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/sock.c
patch
|
diff1
|
diff2
|
blob
|
history
net/socket.c
patch
|
diff1
|
diff2
|
blob
|
history
sound/usb/card.h
patch
|
diff1
|
diff2
|
blob
|
history
sound/usb/pcm.c
patch
|
diff1
|
diff2
|
blob
|
history
sound/usb/quirks.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Makefile
Simple merge
diff --cc
arch/arm/kernel/hw_breakpoint.c
Simple merge
diff --cc
drivers/gpio/gpiolib-of.c
Simple merge
diff --cc
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
Simple merge
diff --cc
drivers/pci/pcie/aspm.c
Simple merge
diff --cc
drivers/pci/quirks.c
Simple merge
diff --cc
fs/ext4/inode.c
Simple merge
diff --cc
fs/f2fs/dir.c
index
d065e61
,
9a11b48
..
794f7d1
---
1
/
fs/f2fs/dir.c
---
2
/
fs/f2fs/dir.c
+++ b/
fs/f2fs/dir.c
@@@
-828,15
-870,11
+839,14
@@@
int f2fs_fill_dentries(struct dir_conte
if (!dir_emit(ctx, de_name.name, de_name.len,
le32_to_cpu(de->ino), d_type))
- return true;
+ return 1;
+
+ if (sbi->readdir_ra == 1)
+ ra_node_page(sbi, le32_to_cpu(de->ino));
- bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len));
ctx->pos = start_pos + bit_pos;
}
- return
false
;
+ return
0
;
}
static int f2fs_readdir(struct file *file, struct dir_context *ctx)
diff --cc
fs/xattr.c
Simple merge
diff --cc
include/asm-generic/vmlinux.lds.h
Simple merge
diff --cc
include/linux/mmzone.h
Simple merge
diff --cc
include/net/addrconf.h
Simple merge
diff --cc
include/net/sock.h
Simple merge
diff --cc
init/main.c
Simple merge
diff --cc
kernel/cgroup.c
Simple merge
diff --cc
kernel/trace/ftrace.c
Simple merge
diff --cc
mm/mmap.c
Simple merge
diff --cc
mm/page_alloc.c
Simple merge
diff --cc
net/core/sock.c
Simple merge
diff --cc
net/socket.c
Simple merge
diff --cc
sound/usb/card.h
Simple merge
diff --cc
sound/usb/pcm.c
Simple merge
diff --cc
sound/usb/quirks.c
Simple merge