projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e332fd0
e93d474
)
Merge tag 'v4.9.168' into khadas-vim3-4.9.y
author
Nick
<nick@khadas.com>
Tue, 21 May 2019 09:53:45 +0000
(17:53 +0800)
committer
Nick
<nick@khadas.com>
Tue, 21 May 2019 09:53:45 +0000
(17:53 +0800)
This is the 4.9.168 stable release
17 files changed:
1
2
Makefile
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/kernel/smp.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/kernel/unwind.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm64/mm/fault.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/hwtracing/coresight/coresight-etm4x.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/gadget/function/f_fs.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/fbdev/core/fbmem.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/cifs/connect.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/f2fs/trace.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/read_write.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/irq/chip.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/sysctl.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/trace/trace.c
patch
|
diff1
|
diff2
|
blob
|
history
mm/cma.c
patch
|
diff1
|
diff2
|
blob
|
history
mm/mempolicy.c
patch
|
diff1
|
diff2
|
blob
|
history
mm/vmalloc.c
patch
|
diff1
|
diff2
|
blob
|
history
security/selinux/hooks.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Makefile
Simple merge
diff --cc
arch/arm/kernel/smp.c
Simple merge
diff --cc
arch/arm/kernel/unwind.c
Simple merge
diff --cc
arch/arm64/mm/fault.c
Simple merge
diff --cc
drivers/hwtracing/coresight/coresight-etm4x.c
Simple merge
diff --cc
drivers/usb/gadget/function/f_fs.c
Simple merge
diff --cc
drivers/video/fbdev/core/fbmem.c
Simple merge
diff --cc
fs/cifs/connect.c
Simple merge
diff --cc
fs/f2fs/trace.c
index
a1fcd00
,
501c283
..
cb69679
---
1
/
fs/f2fs/trace.c
---
2
/
fs/f2fs/trace.c
+++ b/
fs/f2fs/trace.c
@@@
-59,8
-59,9
+59,9
@@@
void f2fs_trace_pid(struct page *page
pid_t pid = task_pid_nr(current);
void *p;
-
page->private = pid
;
+
set_page_private(page, (unsigned long)pid)
;
+ retry:
if (radix_tree_preload(GFP_NOFS))
return;
diff --cc
fs/read_write.c
Simple merge
diff --cc
kernel/irq/chip.c
Simple merge
diff --cc
kernel/sysctl.c
Simple merge
diff --cc
kernel/trace/trace.c
Simple merge
diff --cc
mm/cma.c
Simple merge
diff --cc
mm/mempolicy.c
Simple merge
diff --cc
mm/vmalloc.c
Simple merge
diff --cc
security/selinux/hooks.c
Simple merge