Merge tag 'v4.4-rc2' into drm-intel-next-queued

Linux 4.4-rc2

Backmerge to get at

commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date:   Thu Nov 5 23:04:11 2015 +0200

    drm/i915/skl: disable display side power well support for now

so that we can proplery re-eanble skl power wells in -next.

Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
index 674e3e226465..5295535b60c6 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
@@ -26,6 +26,7 @@ struct fdtable {
         struct file __rcu **fd;      /* current fd array */
         unsigned long *close_on_exec;
         unsigned long *open_fds;
+        unsigned long *full_fds_bits;
         struct rcu_head rcu;
 };
 
@@ -59,6 +60,7 @@ struct files_struct {
         int next_fd;
         unsigned long close_on_exec_init[1];
         unsigned long open_fds_init[1];
+        unsigned long full_fds_bits_init[1];
         struct file __rcu * fd_array[NR_OPEN_DEFAULT];
 };