Merge tag 'v4.9.168' into khadas-vim3-4.9.y
authorNick <nick@khadas.com>
Tue, 21 May 2019 09:53:45 +0000 (17:53 +0800)
committerNick <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
arch/arm/kernel/smp.c
arch/arm/kernel/unwind.c
arch/arm64/mm/fault.c
drivers/hwtracing/coresight/coresight-etm4x.c
drivers/usb/gadget/function/f_fs.c
drivers/video/fbdev/core/fbmem.c
fs/cifs/connect.c
fs/f2fs/trace.c
fs/read_write.c
kernel/irq/chip.c
kernel/sysctl.c
kernel/trace/trace.c
mm/cma.c
mm/mempolicy.c
mm/vmalloc.c
security/selinux/hooks.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc 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
Simple merge
diff --cc kernel/sysctl.c
Simple merge
Simple merge
diff --cc mm/cma.c
Simple merge
diff --cc mm/mempolicy.c
Simple merge
diff --cc mm/vmalloc.c
Simple merge
Simple merge