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

This is the 4.9.233 stable release

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