Merge tag 'v4.9.239' into khadas-vims-4.9.y

This is the 4.9.239 stable release

Signed-off-by: Nick Xie <nick@khadas.com>

diff --cc Makefile
Simple merge

diff --cc drivers/platform/x86/thinkpad_acpi.c
Simple merge

diff --cc drivers/video/console/fbcon.c
Simple merge

diff --cc fs/eventpoll.c
Simple merge

diff --cc include/net/xfrm.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc mm/page_alloc.c
index 5a6587215033fb9e02b6a516a14238723ce0cb90,b0c451e3b59f399c822b467470ed5d1e01f8c059..e3e9dd354aa1be61efc61f82e96a582268ecb9e7
--- 1/mm/page_alloc.c
--- 2/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -64,9 -64,7 +64,10 @@@
  #include <linux/page_owner.h>
  #include <linux/kthread.h>
  #include <linux/memcontrol.h>
 +#ifdef CONFIG_AMLOGIC_PAGE_TRACE
 +#include <linux/amlogic/page_trace.h>
 +#endif /* CONFIG_AMLOGIC_PAGE_TRACE */
+ #include <linux/khugepaged.h>
  
  #include <asm/sections.h>
  #include <asm/tlbflush.h>

diff --cc net/xfrm/xfrm_state.c
Simple merge