Merge tag 'v4.9.209' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...

This is the 4.9.209 stable release

diff --cc Makefile
Simple merge

diff --cc arch/arm64/include/asm/pgtable.h
Simple merge

diff --cc arch/arm64/mm/fault.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 7be82fc,a2b7c68..12ced97
--- 1/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
--- 2/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@@ -54,17 -54,8 +54,17 @@@
  #include <linux/reset.h>
  #include <linux/of_mdio.h>
  #include "dwmac1000.h"
 +#ifdef CONFIG_AMLOGIC_ETH_PRIVE
 +#include "stmmac_platform.h"
 +#endif
 +#ifdef CONFIG_DWMAC_MESON
 +#include <phy_debug.h>
 +#endif
 +
 +#include <linux/suspend.h>
 +#define PM_SUSPEND_PREPARE      0x0003 /* Going to suspend the system */
  
- #define       STMMAC_ALIGN(x)         __ALIGN_KERNEL(x, SMP_CACHE_BYTES)
+ #define       STMMAC_ALIGN(x)         ALIGN(ALIGN(x, SMP_CACHE_BYTES), 16)
  #define       TSO_MAX_BUFF_SIZE       (SZ_16K - 1)
  
  /* Module parameters */

diff --cc fs/pstore/ram.c
Simple merge

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

diff --cc mm/mmap.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/rfkill/core.c
Simple merge