13 files changed, 66 insertions, 40 deletions

diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 1ec08c198b66..a8015a7a55bb 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -693,24 +693,35 @@ static inline int pmd_numa(pmd_t pmd)
 #ifndef pte_mknonnuma
 static inline pte_t pte_mknonnuma(pte_t pte)
 {
-        pte = pte_clear_flags(pte, _PAGE_NUMA);
-        return pte_set_flags(pte, _PAGE_PRESENT|_PAGE_ACCESSED);
+        pteval_t val = pte_val(pte);
+
+        val &= ~_PAGE_NUMA;
+        val |= (_PAGE_PRESENT|_PAGE_ACCESSED);
+        return __pte(val);
 }
 #endif
 
 #ifndef pmd_mknonnuma
 static inline pmd_t pmd_mknonnuma(pmd_t pmd)
 {
-        pmd = pmd_clear_flags(pmd, _PAGE_NUMA);
-        return pmd_set_flags(pmd, _PAGE_PRESENT|_PAGE_ACCESSED);
+        pmdval_t val = pmd_val(pmd);
+
+        val &= ~_PAGE_NUMA;
+        val |= (_PAGE_PRESENT|_PAGE_ACCESSED);
+
+        return __pmd(val);
 }
 #endif
 
 #ifndef pte_mknuma
 static inline pte_t pte_mknuma(pte_t pte)
 {
-        pte = pte_set_flags(pte, _PAGE_NUMA);
-        return pte_clear_flags(pte, _PAGE_PRESENT);
+        pteval_t val = pte_val(pte);
+
+        val &= ~_PAGE_PRESENT;
+        val |= _PAGE_NUMA;
+
+        return __pte(val);
 }
 #endif
 
@@ -729,8 +740,12 @@ static inline void ptep_set_numa(struct mm_struct *mm, unsigned long addr,
 #ifndef pmd_mknuma
 static inline pmd_t pmd_mknuma(pmd_t pmd)
 {
-        pmd = pmd_set_flags(pmd, _PAGE_NUMA);
-        return pmd_clear_flags(pmd, _PAGE_PRESENT);
+        pmdval_t val = pmd_val(pmd);
+
+        val &= ~_PAGE_PRESENT;
+        val |= _PAGE_NUMA;
+
+        return __pmd(val);
 }
 #endif
 
diff --git a/include/linux/device.h b/include/linux/device.h
index 233bbbeb768d..d1d1c055b48e 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -566,12 +566,6 @@ extern int __must_check device_create_bin_file(struct device *dev,
                                         const struct bin_attribute *attr);
 extern void device_remove_bin_file(struct device *dev,
                                    const struct bin_attribute *attr);
-extern int device_schedule_callback_owner(struct device *dev,
-                void (*func)(struct device *dev), struct module *owner);
-
-/* This is a macro to avoid include problems with THIS_MODULE */
-#define device_schedule_callback(dev, func)                     \
-        device_schedule_callback_owner(dev, func, THIS_MODULE)
 
 /* device resource management */
 typedef void (*dr_release_t)(struct device *dev, void *res);
@@ -932,10 +926,7 @@ extern int device_online(struct device *dev);
 extern struct device *__root_device_register(const char *name,
                                              struct module *owner);
 
-/*
- * This is a macro to avoid include problems with THIS_MODULE,
- * just as per what is done for device_schedule_callback() above.
- */
+/* This is a macro to avoid include problems with THIS_MODULE */
 #define root_device_register(name) \
         __root_device_register(name, THIS_MODULE)
 
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index ab7359fde987..2d7b4f139c32 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -147,15 +147,17 @@ hv_get_ringbuffer_availbytes(struct hv_ring_buffer_info *rbi,
  * 0 . 13 (Windows Server 2008)
  * 1 . 1  (Windows 7)
  * 2 . 4  (Windows 8)
+ * 3 . 0  (Windows 8 R2)
  */
 
 #define VERSION_WS2008  ((0 << 16) | (13))
 #define VERSION_WIN7    ((1 << 16) | (1))
 #define VERSION_WIN8    ((2 << 16) | (4))
+#define VERSION_WIN8_1    ((3 << 16) | (0))
 
 #define VERSION_INVAL -1
 
-#define VERSION_CURRENT VERSION_WIN8
+#define VERSION_CURRENT VERSION_WIN8_1
 
 /* Make maximum size of pipe payload of 16K */
 #define MAX_PIPE_DATA_PAYLOAD           (sizeof(u8) * 16384)
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h
index 1f9f56e28851..76d2acbfa7c6 100644
--- a/include/linux/ipmi.h
+++ b/include/linux/ipmi.h
@@ -237,7 +237,7 @@ int ipmi_set_maintenance_mode(ipmi_user_t user, int mode);
  * The first user that sets this to TRUE will receive all events that
  * have been queued while no one was waiting for events.
  */
-int ipmi_set_gets_events(ipmi_user_t user, int val);
+int ipmi_set_gets_events(ipmi_user_t user, bool val);
 
 /*
  * Called when a new SMI is registered.  This will also be called on
diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index 8ea3fe0b9759..bd349240d50e 100644
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -109,12 +109,19 @@ struct ipmi_smi_handlers {
            events from the BMC we are attached to. */
         void (*request_events)(void *send_info);
 
+        /* Called by the upper layer when some user requires that the
+           interface watch for events, received messages, watchdog
+           pretimeouts, or not.  Used by the SMI to know if it should
+           watch for these.  This may be NULL if the SMI does not
+           implement it. */
+        void (*set_need_watch)(void *send_info, bool enable);
+
         /* Called when the interface should go into "run to
            completion" mode.  If this call sets the value to true, the
            interface should make sure that all messages are flushed
            out and that none are pending, and any new requests are run
            to completion immediately. */
-        void (*set_run_to_completion)(void *send_info, int run_to_completion);
+        void (*set_run_to_completion)(void *send_info, bool run_to_completion);
 
         /* Called to poll for work to do.  This is so upper layers can
            poll for operations during things like crash dumps. */
@@ -125,7 +132,7 @@ struct ipmi_smi_handlers {
            setting.  The message handler does the mode handling.  Note
            that this is called from interrupt context, so it cannot
            block. */
-        void (*set_maintenance_mode)(void *send_info, int enable);
+        void (*set_maintenance_mode)(void *send_info, bool enable);
 
         /* Tell the handler that we are using it/not using it.  The
            message handler get the modules that this handler belongs
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 407bdb67fd4f..3406cfb1267a 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -179,6 +179,7 @@ enum {
         MLX5_DEV_CAP_FLAG_BAD_QKEY_CNTR = 1LL <<  9,
         MLX5_DEV_CAP_FLAG_APM           = 1LL << 17,
         MLX5_DEV_CAP_FLAG_ATOMIC        = 1LL << 18,
+        MLX5_DEV_CAP_FLAG_BLOCK_MCAST   = 1LL << 23,
         MLX5_DEV_CAP_FLAG_ON_DMND_PG    = 1LL << 24,
         MLX5_DEV_CAP_FLAG_CQ_MODER      = 1LL << 29,
         MLX5_DEV_CAP_FLAG_RESIZE_CQ     = 1LL << 30,
diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h
index f829ad80ff28..9709b30e2d69 100644
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
@@ -146,6 +146,7 @@ enum {
 
 enum {
         MLX5_QP_LAT_SENSITIVE   = 1 << 28,
+        MLX5_QP_BLOCK_MCAST     = 1 << 30,
         MLX5_QP_ENABLE_SIG      = 1 << 31,
 };
 
diff --git a/include/linux/mtd/spear_smi.h b/include/linux/mtd/spear_smi.h
index 8ae1726044c3..581603ac1277 100644
--- a/include/linux/mtd/spear_smi.h
+++ b/include/linux/mtd/spear_smi.h
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2010 ST Microelectronics
- * Shiraz Hashim <shiraz.hashim@st.com>
+ * Shiraz Hashim <shiraz.linux.kernel@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/include/linux/of.h b/include/linux/of.h
index 919bf211877d..3bad8d106e0e 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -374,6 +374,11 @@ static inline struct device_node *of_find_matching_node_and_match(
         return NULL;
 }
 
+static inline struct device_node *of_find_node_by_path(const char *path)
+{
+        return NULL;
+}
+
 static inline struct device_node *of_get_parent(const struct device_node *node)
 {
         return NULL;
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 9e7db9e73cc1..48bf152761c7 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -20,13 +20,13 @@ enum reboot_mode {
 extern enum reboot_mode reboot_mode;
 
 enum reboot_type {
-        BOOT_TRIPLE = 't',
-        BOOT_KBD = 'k',
-        BOOT_BIOS = 'b',
-        BOOT_ACPI = 'a',
-        BOOT_EFI = 'e',
-        BOOT_CF9 = 'p',
-        BOOT_CF9_COND = 'q',
+        BOOT_TRIPLE     = 't',
+        BOOT_KBD        = 'k',
+        BOOT_BIOS       = 'b',
+        BOOT_ACPI       = 'a',
+        BOOT_EFI        = 'e',
+        BOOT_CF9_FORCE  = 'p',
+        BOOT_CF9_SAFE   = 'q',
 };
 extern enum reboot_type reboot_type;
 
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 084354b0e814..5ffaa3443712 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -179,9 +179,6 @@ struct sysfs_ops {
 
 #ifdef CONFIG_SYSFS
 
-int sysfs_schedule_callback(struct kobject *kobj, void (*func)(void *),
-                            void *data, struct module *owner);
-
 int __must_check sysfs_create_dir_ns(struct kobject *kobj, const void *ns);
 void sysfs_remove_dir(struct kobject *kobj);
 int __must_check sysfs_rename_dir_ns(struct kobject *kobj, const char *new_name,
@@ -255,12 +252,6 @@ static inline void sysfs_enable_ns(struct kernfs_node *kn)
 
 #else /* CONFIG_SYSFS */
 
-static inline int sysfs_schedule_callback(struct kobject *kobj,
-                void (*func)(void *), void *data, struct module *owner)
-{
-        return -ENOSYS;
-}
-
 static inline int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
 {
         return 0;
diff --git a/include/linux/wait.h b/include/linux/wait.h
index e7d9d9ed14f5..bd68819f0815 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -191,11 +191,23 @@ wait_queue_head_t *bit_waitqueue(void *, int);
         (!__builtin_constant_p(state) ||                                \
                 state == TASK_INTERRUPTIBLE || state == TASK_KILLABLE)  \
 
+/*
+ * The below macro ___wait_event() has an explicit shadow of the __ret
+ * variable when used from the wait_event_*() macros.
+ *
+ * This is so that both can use the ___wait_cond_timeout() construct
+ * to wrap the condition.
+ *
+ * The type inconsistency of the wait_event_*() __ret variable is also
+ * on purpose; we use long where we can return timeout values and int
+ * otherwise.
+ */
+
 #define ___wait_event(wq, condition, state, exclusive, ret, cmd)        \
 ({                                                                      \
         __label__ __out;                                                \
         wait_queue_t __wait;                                            \
-        long __ret = ret;                                               \
+        long __ret = ret;       /* explicit shadow */                   \
                                                                         \
         INIT_LIST_HEAD(&__wait.task_list);                              \
         if (exclusive)                                                  \
diff --git a/include/uapi/linux/hyperv.h b/include/uapi/linux/hyperv.h
index 9beb7c991638..78e4a86030dd 100644
--- a/include/uapi/linux/hyperv.h
+++ b/include/uapi/linux/hyperv.h
@@ -305,6 +305,7 @@ enum hv_kvp_exchg_pool {
 #define HV_ERROR_DEVICE_NOT_CONNECTED   0x8007048F
 #define HV_INVALIDARG                   0x80070057
 #define HV_GUID_NOTFOUND                0x80041002
+#define HV_ERROR_ALREADY_EXISTS         0x80070050
 
 #define ADDR_FAMILY_NONE        0x00
 #define ADDR_FAMILY_IPV4        0x01