254 files changed, 4770 insertions, 2775 deletions
diff --git a/include/Kbuild b/include/Kbuild
index 1dfd33e8d43b..bab1145bc7a7 100644
--- a/include/Kbuild
+++ b/include/Kbuild
@@ -1,5 +1,2 @@
 # Top-level Makefile calls into asm-$(ARCH)
 # List only non-arch directories below
-header-y += video/
-header-y += scsi/
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index 9bf59d0e8aaa..cf051e05a8fe 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -44,17 +44,50 @@
 #ifndef __ACEXCEP_H__
 #define __ACEXCEP_H__
+/* This module contains all possible exception codes for acpi_status */
 /*
- * Exceptions returned by external ACPI interfaces
+ * Exception code classes
 */
-#define AE_CODE_ENVIRONMENTAL           0x0000
+#define AE_CODE_ENVIRONMENTAL           0x0000  /* General ACPICA environment */
-#define AE_CODE_PROGRAMMER              0x1000
+#define AE_CODE_PROGRAMMER              0x1000  /* External ACPICA interface caller */
-#define AE_CODE_ACPI_TABLES             0x2000
+#define AE_CODE_ACPI_TABLES             0x2000  /* ACPI tables */
-#define AE_CODE_AML                     0x3000
+#define AE_CODE_AML                     0x3000  /* From executing AML code */
-#define AE_CODE_CONTROL                 0x4000
+#define AE_CODE_CONTROL                 0x4000  /* Internal control codes */
 #define AE_CODE_MAX                     0x4000
 #define AE_CODE_MASK                    0xF000
+/*
+ * Macros to insert the exception code classes
+ */
+#define EXCEP_ENV(code)                 ((acpi_status) (code | AE_CODE_ENVIRONMENTAL))
+#define EXCEP_PGM(code)                 ((acpi_status) (code | AE_CODE_PROGRAMMER))
+#define EXCEP_TBL(code)                 ((acpi_status) (code | AE_CODE_ACPI_TABLES))
+#define EXCEP_AML(code)                 ((acpi_status) (code | AE_CODE_AML))
+#define EXCEP_CTL(code)                 ((acpi_status) (code | AE_CODE_CONTROL))
+/*
+ * Exception info table. The "Description" field is used only by the
+ * ACPICA help application (acpihelp).
+ */
+struct acpi_exception_info {
+        char *name;
+#ifdef ACPI_HELP_APP
+        char *description;
+#endif
+};
+#ifdef ACPI_HELP_APP
+#define EXCEP_TXT(name,description)     {name, description}
+#else
+#define EXCEP_TXT(name,description)     {name}
+#endif
+/*
+ * Success is always zero, failure is non-zero
+ */
 #define ACPI_SUCCESS(a)                 (!(a))
 #define ACPI_FAILURE(a)                 (a)
@@ -64,60 +97,60 @@
 /*
 * Environmental exceptions
 */
-#define AE_ERROR                        (acpi_status) (0x0001 | AE_CODE_ENVIRONMENTAL)
+#define AE_ERROR                        EXCEP_ENV (0x0001)
-#define AE_NO_ACPI_TABLES               (acpi_status) (0x0002 | AE_CODE_ENVIRONMENTAL)
+#define AE_NO_ACPI_TABLES               EXCEP_ENV (0x0002)
-#define AE_NO_NAMESPACE                 (acpi_status) (0x0003 | AE_CODE_ENVIRONMENTAL)
+#define AE_NO_NAMESPACE                 EXCEP_ENV (0x0003)
-#define AE_NO_MEMORY                    (acpi_status) (0x0004 | AE_CODE_ENVIRONMENTAL)
+#define AE_NO_MEMORY                    EXCEP_ENV (0x0004)
-#define AE_NOT_FOUND                    (acpi_status) (0x0005 | AE_CODE_ENVIRONMENTAL)
+#define AE_NOT_FOUND                    EXCEP_ENV (0x0005)
-#define AE_NOT_EXIST                    (acpi_status) (0x0006 | AE_CODE_ENVIRONMENTAL)
+#define AE_NOT_EXIST                    EXCEP_ENV (0x0006)
-#define AE_ALREADY_EXISTS               (acpi_status) (0x0007 | AE_CODE_ENVIRONMENTAL)
+#define AE_ALREADY_EXISTS               EXCEP_ENV (0x0007)
-#define AE_TYPE                         (acpi_status) (0x0008 | AE_CODE_ENVIRONMENTAL)
+#define AE_TYPE                         EXCEP_ENV (0x0008)
-#define AE_NULL_OBJECT                  (acpi_status) (0x0009 | AE_CODE_ENVIRONMENTAL)
+#define AE_NULL_OBJECT                  EXCEP_ENV (0x0009)
-#define AE_NULL_ENTRY                   (acpi_status) (0x000A | AE_CODE_ENVIRONMENTAL)
+#define AE_NULL_ENTRY                   EXCEP_ENV (0x000A)
-#define AE_BUFFER_OVERFLOW              (acpi_status) (0x000B | AE_CODE_ENVIRONMENTAL)
+#define AE_BUFFER_OVERFLOW              EXCEP_ENV (0x000B)
-#define AE_STACK_OVERFLOW               (acpi_status) (0x000C | AE_CODE_ENVIRONMENTAL)
+#define AE_STACK_OVERFLOW               EXCEP_ENV (0x000C)
-#define AE_STACK_UNDERFLOW              (acpi_status) (0x000D | AE_CODE_ENVIRONMENTAL)
+#define AE_STACK_UNDERFLOW              EXCEP_ENV (0x000D)
-#define AE_NOT_IMPLEMENTED              (acpi_status) (0x000E | AE_CODE_ENVIRONMENTAL)
+#define AE_NOT_IMPLEMENTED              EXCEP_ENV (0x000E)
-#define AE_SUPPORT                      (acpi_status) (0x000F | AE_CODE_ENVIRONMENTAL)
+#define AE_SUPPORT                      EXCEP_ENV (0x000F)
-#define AE_LIMIT                        (acpi_status) (0x0010 | AE_CODE_ENVIRONMENTAL)
+#define AE_LIMIT                        EXCEP_ENV (0x0010)
-#define AE_TIME                         (acpi_status) (0x0011 | AE_CODE_ENVIRONMENTAL)
+#define AE_TIME                         EXCEP_ENV (0x0011)
-#define AE_ACQUIRE_DEADLOCK             (acpi_status) (0x0012 | AE_CODE_ENVIRONMENTAL)
+#define AE_ACQUIRE_DEADLOCK             EXCEP_ENV (0x0012)
-#define AE_RELEASE_DEADLOCK             (acpi_status) (0x0013 | AE_CODE_ENVIRONMENTAL)
+#define AE_RELEASE_DEADLOCK             EXCEP_ENV (0x0013)
-#define AE_NOT_ACQUIRED                 (acpi_status) (0x0014 | AE_CODE_ENVIRONMENTAL)
+#define AE_NOT_ACQUIRED                 EXCEP_ENV (0x0014)
-#define AE_ALREADY_ACQUIRED             (acpi_status) (0x0015 | AE_CODE_ENVIRONMENTAL)
+#define AE_ALREADY_ACQUIRED             EXCEP_ENV (0x0015)
-#define AE_NO_HARDWARE_RESPONSE         (acpi_status) (0x0016 | AE_CODE_ENVIRONMENTAL)
+#define AE_NO_HARDWARE_RESPONSE         EXCEP_ENV (0x0016)
-#define AE_NO_GLOBAL_LOCK               (acpi_status) (0x0017 | AE_CODE_ENVIRONMENTAL)
+#define AE_NO_GLOBAL_LOCK               EXCEP_ENV (0x0017)
-#define AE_ABORT_METHOD                 (acpi_status) (0x0018 | AE_CODE_ENVIRONMENTAL)
+#define AE_ABORT_METHOD                 EXCEP_ENV (0x0018)
-#define AE_SAME_HANDLER                 (acpi_status) (0x0019 | AE_CODE_ENVIRONMENTAL)
+#define AE_SAME_HANDLER                 EXCEP_ENV (0x0019)
-#define AE_NO_HANDLER                   (acpi_status) (0x001A | AE_CODE_ENVIRONMENTAL)
+#define AE_NO_HANDLER                   EXCEP_ENV (0x001A)
-#define AE_OWNER_ID_LIMIT               (acpi_status) (0x001B | AE_CODE_ENVIRONMENTAL)
+#define AE_OWNER_ID_LIMIT               EXCEP_ENV (0x001B)
-#define AE_NOT_CONFIGURED               (acpi_status) (0x001C | AE_CODE_ENVIRONMENTAL)
+#define AE_NOT_CONFIGURED               EXCEP_ENV (0x001C)
 #define AE_CODE_ENV_MAX                 0x001C
 /*
 * Programmer exceptions
 */
-#define AE_BAD_PARAMETER                (acpi_status) (0x0001 | AE_CODE_PROGRAMMER)
+#define AE_BAD_PARAMETER                EXCEP_PGM (0x0001)
-#define AE_BAD_CHARACTER                (acpi_status) (0x0002 | AE_CODE_PROGRAMMER)
+#define AE_BAD_CHARACTER                EXCEP_PGM (0x0002)
-#define AE_BAD_PATHNAME                 (acpi_status) (0x0003 | AE_CODE_PROGRAMMER)
+#define AE_BAD_PATHNAME                 EXCEP_PGM (0x0003)
-#define AE_BAD_DATA                     (acpi_status) (0x0004 | AE_CODE_PROGRAMMER)
+#define AE_BAD_DATA                     EXCEP_PGM (0x0004)
-#define AE_BAD_HEX_CONSTANT             (acpi_status) (0x0005 | AE_CODE_PROGRAMMER)
+#define AE_BAD_HEX_CONSTANT             EXCEP_PGM (0x0005)
-#define AE_BAD_OCTAL_CONSTANT           (acpi_status) (0x0006 | AE_CODE_PROGRAMMER)
+#define AE_BAD_OCTAL_CONSTANT           EXCEP_PGM (0x0006)
-#define AE_BAD_DECIMAL_CONSTANT         (acpi_status) (0x0007 | AE_CODE_PROGRAMMER)
+#define AE_BAD_DECIMAL_CONSTANT         EXCEP_PGM (0x0007)
-#define AE_MISSING_ARGUMENTS            (acpi_status) (0x0008 | AE_CODE_PROGRAMMER)
+#define AE_MISSING_ARGUMENTS            EXCEP_PGM (0x0008)
-#define AE_BAD_ADDRESS                  (acpi_status) (0x0009 | AE_CODE_PROGRAMMER)
+#define AE_BAD_ADDRESS                  EXCEP_PGM (0x0009)
 #define AE_CODE_PGM_MAX                 0x0009
 /*
 * Acpi table exceptions
 */
-#define AE_BAD_SIGNATURE                (acpi_status) (0x0001 | AE_CODE_ACPI_TABLES)
+#define AE_BAD_SIGNATURE                EXCEP_TBL (0x0001)
-#define AE_BAD_HEADER                   (acpi_status) (0x0002 | AE_CODE_ACPI_TABLES)
+#define AE_BAD_HEADER                   EXCEP_TBL (0x0002)
-#define AE_BAD_CHECKSUM                 (acpi_status) (0x0003 | AE_CODE_ACPI_TABLES)
+#define AE_BAD_CHECKSUM                 EXCEP_TBL (0x0003)
-#define AE_BAD_VALUE                    (acpi_status) (0x0004 | AE_CODE_ACPI_TABLES)
+#define AE_BAD_VALUE                    EXCEP_TBL (0x0004)
-#define AE_INVALID_TABLE_LENGTH         (acpi_status) (0x0005 | AE_CODE_ACPI_TABLES)
+#define AE_INVALID_TABLE_LENGTH         EXCEP_TBL (0x0005)
 #define AE_CODE_TBL_MAX                 0x0005
@@ -125,58 +158,58 @@
 * AML exceptions. These are caused by problems with
 * the actual AML byte stream
 */
-#define AE_AML_BAD_OPCODE               (acpi_status) (0x0001 | AE_CODE_AML)
+#define AE_AML_BAD_OPCODE               EXCEP_AML (0x0001)
-#define AE_AML_NO_OPERAND               (acpi_status) (0x0002 | AE_CODE_AML)
+#define AE_AML_NO_OPERAND               EXCEP_AML (0x0002)
-#define AE_AML_OPERAND_TYPE             (acpi_status) (0x0003 | AE_CODE_AML)
+#define AE_AML_OPERAND_TYPE             EXCEP_AML (0x0003)
-#define AE_AML_OPERAND_VALUE            (acpi_status) (0x0004 | AE_CODE_AML)
+#define AE_AML_OPERAND_VALUE            EXCEP_AML (0x0004)
-#define AE_AML_UNINITIALIZED_LOCAL      (acpi_status) (0x0005 | AE_CODE_AML)
+#define AE_AML_UNINITIALIZED_LOCAL      EXCEP_AML (0x0005)
-#define AE_AML_UNINITIALIZED_ARG        (acpi_status) (0x0006 | AE_CODE_AML)
+#define AE_AML_UNINITIALIZED_ARG        EXCEP_AML (0x0006)
-#define AE_AML_UNINITIALIZED_ELEMENT    (acpi_status) (0x0007 | AE_CODE_AML)
+#define AE_AML_UNINITIALIZED_ELEMENT    EXCEP_AML (0x0007)
-#define AE_AML_NUMERIC_OVERFLOW         (acpi_status) (0x0008 | AE_CODE_AML)
+#define AE_AML_NUMERIC_OVERFLOW         EXCEP_AML (0x0008)
-#define AE_AML_REGION_LIMIT             (acpi_status) (0x0009 | AE_CODE_AML)
+#define AE_AML_REGION_LIMIT             EXCEP_AML (0x0009)
-#define AE_AML_BUFFER_LIMIT             (acpi_status) (0x000A | AE_CODE_AML)
+#define AE_AML_BUFFER_LIMIT             EXCEP_AML (0x000A)
-#define AE_AML_PACKAGE_LIMIT            (acpi_status) (0x000B | AE_CODE_AML)
+#define AE_AML_PACKAGE_LIMIT            EXCEP_AML (0x000B)
-#define AE_AML_DIVIDE_BY_ZERO           (acpi_status) (0x000C | AE_CODE_AML)
+#define AE_AML_DIVIDE_BY_ZERO           EXCEP_AML (0x000C)
-#define AE_AML_BAD_NAME                 (acpi_status) (0x000D | AE_CODE_AML)
+#define AE_AML_BAD_NAME                 EXCEP_AML (0x000D)
-#define AE_AML_NAME_NOT_FOUND           (acpi_status) (0x000E | AE_CODE_AML)
+#define AE_AML_NAME_NOT_FOUND           EXCEP_AML (0x000E)
-#define AE_AML_INTERNAL                 (acpi_status) (0x000F | AE_CODE_AML)
+#define AE_AML_INTERNAL                 EXCEP_AML (0x000F)
-#define AE_AML_INVALID_SPACE_ID         (acpi_status) (0x0010 | AE_CODE_AML)
+#define AE_AML_INVALID_SPACE_ID         EXCEP_AML (0x0010)
-#define AE_AML_STRING_LIMIT             (acpi_status) (0x0011 | AE_CODE_AML)
+#define AE_AML_STRING_LIMIT             EXCEP_AML (0x0011)
-#define AE_AML_NO_RETURN_VALUE          (acpi_status) (0x0012 | AE_CODE_AML)
+#define AE_AML_NO_RETURN_VALUE          EXCEP_AML (0x0012)
-#define AE_AML_METHOD_LIMIT             (acpi_status) (0x0013 | AE_CODE_AML)
+#define AE_AML_METHOD_LIMIT             EXCEP_AML (0x0013)
-#define AE_AML_NOT_OWNER                (acpi_status) (0x0014 | AE_CODE_AML)
+#define AE_AML_NOT_OWNER                EXCEP_AML (0x0014)
-#define AE_AML_MUTEX_ORDER              (acpi_status) (0x0015 | AE_CODE_AML)
+#define AE_AML_MUTEX_ORDER              EXCEP_AML (0x0015)
-#define AE_AML_MUTEX_NOT_ACQUIRED       (acpi_status) (0x0016 | AE_CODE_AML)
+#define AE_AML_MUTEX_NOT_ACQUIRED       EXCEP_AML (0x0016)
-#define AE_AML_INVALID_RESOURCE_TYPE    (acpi_status) (0x0017 | AE_CODE_AML)
+#define AE_AML_INVALID_RESOURCE_TYPE    EXCEP_AML (0x0017)
-#define AE_AML_INVALID_INDEX            (acpi_status) (0x0018 | AE_CODE_AML)
+#define AE_AML_INVALID_INDEX            EXCEP_AML (0x0018)
-#define AE_AML_REGISTER_LIMIT           (acpi_status) (0x0019 | AE_CODE_AML)
+#define AE_AML_REGISTER_LIMIT           EXCEP_AML (0x0019)
-#define AE_AML_NO_WHILE                 (acpi_status) (0x001A | AE_CODE_AML)
+#define AE_AML_NO_WHILE                 EXCEP_AML (0x001A)
-#define AE_AML_ALIGNMENT                (acpi_status) (0x001B | AE_CODE_AML)
+#define AE_AML_ALIGNMENT                EXCEP_AML (0x001B)
-#define AE_AML_NO_RESOURCE_END_TAG      (acpi_status) (0x001C | AE_CODE_AML)
+#define AE_AML_NO_RESOURCE_END_TAG      EXCEP_AML (0x001C)
-#define AE_AML_BAD_RESOURCE_VALUE       (acpi_status) (0x001D | AE_CODE_AML)
+#define AE_AML_BAD_RESOURCE_VALUE       EXCEP_AML (0x001D)
-#define AE_AML_CIRCULAR_REFERENCE       (acpi_status) (0x001E | AE_CODE_AML)
+#define AE_AML_CIRCULAR_REFERENCE       EXCEP_AML (0x001E)
-#define AE_AML_BAD_RESOURCE_LENGTH      (acpi_status) (0x001F | AE_CODE_AML)
+#define AE_AML_BAD_RESOURCE_LENGTH      EXCEP_AML (0x001F)
-#define AE_AML_ILLEGAL_ADDRESS          (acpi_status) (0x0020 | AE_CODE_AML)
+#define AE_AML_ILLEGAL_ADDRESS          EXCEP_AML (0x0020)
-#define AE_AML_INFINITE_LOOP            (acpi_status) (0x0021 | AE_CODE_AML)
+#define AE_AML_INFINITE_LOOP            EXCEP_AML (0x0021)
 #define AE_CODE_AML_MAX                 0x0021
 /*
 * Internal exceptions used for control
 */
-#define AE_CTRL_RETURN_VALUE            (acpi_status) (0x0001 | AE_CODE_CONTROL)
+#define AE_CTRL_RETURN_VALUE            EXCEP_CTL (0x0001)
-#define AE_CTRL_PENDING                 (acpi_status) (0x0002 | AE_CODE_CONTROL)
+#define AE_CTRL_PENDING                 EXCEP_CTL (0x0002)
-#define AE_CTRL_TERMINATE               (acpi_status) (0x0003 | AE_CODE_CONTROL)
+#define AE_CTRL_TERMINATE               EXCEP_CTL (0x0003)
-#define AE_CTRL_TRUE                    (acpi_status) (0x0004 | AE_CODE_CONTROL)
+#define AE_CTRL_TRUE                    EXCEP_CTL (0x0004)
-#define AE_CTRL_FALSE                   (acpi_status) (0x0005 | AE_CODE_CONTROL)
+#define AE_CTRL_FALSE                   EXCEP_CTL (0x0005)
-#define AE_CTRL_DEPTH                   (acpi_status) (0x0006 | AE_CODE_CONTROL)
+#define AE_CTRL_DEPTH                   EXCEP_CTL (0x0006)
-#define AE_CTRL_END                     (acpi_status) (0x0007 | AE_CODE_CONTROL)
+#define AE_CTRL_END                     EXCEP_CTL (0x0007)
-#define AE_CTRL_TRANSFER                (acpi_status) (0x0008 | AE_CODE_CONTROL)
+#define AE_CTRL_TRANSFER                EXCEP_CTL (0x0008)
-#define AE_CTRL_BREAK                   (acpi_status) (0x0009 | AE_CODE_CONTROL)
+#define AE_CTRL_BREAK                   EXCEP_CTL (0x0009)
-#define AE_CTRL_CONTINUE                (acpi_status) (0x000A | AE_CODE_CONTROL)
+#define AE_CTRL_CONTINUE                EXCEP_CTL (0x000A)
-#define AE_CTRL_SKIP                    (acpi_status) (0x000B | AE_CODE_CONTROL)
+#define AE_CTRL_SKIP                    EXCEP_CTL (0x000B)
-#define AE_CTRL_PARSE_CONTINUE          (acpi_status) (0x000C | AE_CODE_CONTROL)
+#define AE_CTRL_PARSE_CONTINUE          EXCEP_CTL (0x000C)
-#define AE_CTRL_PARSE_PENDING           (acpi_status) (0x000D | AE_CODE_CONTROL)
+#define AE_CTRL_PARSE_PENDING           EXCEP_CTL (0x000D)
 #define AE_CODE_CTRL_MAX                0x000D
@@ -188,112 +221,156 @@
 * String versions of the exception codes above
 * These strings must match the corresponding defines exactly
 */
-char const *acpi_gbl_exception_names_env[] = {
+static const struct acpi_exception_info acpi_gbl_exception_names_env[] = {
-        "AE_OK",
+        EXCEP_TXT("AE_OK", "No error"),
-        "AE_ERROR",
+        EXCEP_TXT("AE_ERROR", "Unspecified error"),
-        "AE_NO_ACPI_TABLES",
+        EXCEP_TXT("AE_NO_ACPI_TABLES", "ACPI tables could not be found"),
-        "AE_NO_NAMESPACE",
+        EXCEP_TXT("AE_NO_NAMESPACE", "A namespace has not been loaded"),
-        "AE_NO_MEMORY",
+        EXCEP_TXT("AE_NO_MEMORY", "Insufficient dynamic memory"),
-        "AE_NOT_FOUND",
+        EXCEP_TXT("AE_NOT_FOUND", "The name was not found in the namespace"),
-        "AE_NOT_EXIST",
+        EXCEP_TXT("AE_NOT_EXIST", "A required entity does not exist"),
-        "AE_ALREADY_EXISTS",
+        EXCEP_TXT("AE_ALREADY_EXISTS", "An entity already exists"),
-        "AE_TYPE",
+        EXCEP_TXT("AE_TYPE", "The object type is incorrect"),
-        "AE_NULL_OBJECT",
+        EXCEP_TXT("AE_NULL_OBJECT", "A required object was missing"),
-        "AE_NULL_ENTRY",
+        EXCEP_TXT("AE_NULL_ENTRY", "The requested object does not exist"),
-        "AE_BUFFER_OVERFLOW",
+        EXCEP_TXT("AE_BUFFER_OVERFLOW", "The buffer provided is too small"),
-        "AE_STACK_OVERFLOW",
+        EXCEP_TXT("AE_STACK_OVERFLOW", "An internal stack overflowed"),
-        "AE_STACK_UNDERFLOW",
+        EXCEP_TXT("AE_STACK_UNDERFLOW", "An internal stack underflowed"),
-        "AE_NOT_IMPLEMENTED",
+        EXCEP_TXT("AE_NOT_IMPLEMENTED", "The feature is not implemented"),
-        "AE_SUPPORT",
+        EXCEP_TXT("AE_SUPPORT", "The feature is not supported"),
-        "AE_LIMIT",
+        EXCEP_TXT("AE_LIMIT", "A predefined limit was exceeded"),
-        "AE_TIME",
+        EXCEP_TXT("AE_TIME", "A time limit or timeout expired"),
-        "AE_ACQUIRE_DEADLOCK",
+        EXCEP_TXT("AE_ACQUIRE_DEADLOCK",
-        "AE_RELEASE_DEADLOCK",
+                  "Internal error, attempt was made to acquire a mutex in improper order"),
-        "AE_NOT_ACQUIRED",
+        EXCEP_TXT("AE_RELEASE_DEADLOCK",
-        "AE_ALREADY_ACQUIRED",
+                  "Internal error, attempt was made to release a mutex in improper order"),
-        "AE_NO_HARDWARE_RESPONSE",
+        EXCEP_TXT("AE_NOT_ACQUIRED",
-        "AE_NO_GLOBAL_LOCK",
+                  "An attempt to release a mutex or Global Lock without a previous acquire"),
-        "AE_ABORT_METHOD",
+        EXCEP_TXT("AE_ALREADY_ACQUIRED",
-        "AE_SAME_HANDLER",
+                  "Internal error, attempt was made to acquire a mutex twice"),
-        "AE_NO_HANDLER",
+        EXCEP_TXT("AE_NO_HARDWARE_RESPONSE",
-        "AE_OWNER_ID_LIMIT",
+                  "Hardware did not respond after an I/O operation"),
-        "AE_NOT_CONFIGURED"
+        EXCEP_TXT("AE_NO_GLOBAL_LOCK", "There is no FACS Global Lock"),
+        EXCEP_TXT("AE_ABORT_METHOD", "A control method was aborted"),
+        EXCEP_TXT("AE_SAME_HANDLER",
+                  "Attempt was made to install the same handler that is already installed"),
+        EXCEP_TXT("AE_NO_HANDLER",
+                  "A handler for the operation is not installed"),
+        EXCEP_TXT("AE_OWNER_ID_LIMIT",
+                  "There are no more Owner IDs available for ACPI tables or control methods"),
+        EXCEP_TXT("AE_NOT_CONFIGURED",
+                  "The interface is not part of the current subsystem configuration")
 };
-char const *acpi_gbl_exception_names_pgm[] = {
+static const struct acpi_exception_info acpi_gbl_exception_names_pgm[] = {
-        NULL,
+        EXCEP_TXT(NULL, NULL),
-        "AE_BAD_PARAMETER",
+        EXCEP_TXT("AE_BAD_PARAMETER", "A parameter is out of range or invalid"),
-        "AE_BAD_CHARACTER",
+        EXCEP_TXT("AE_BAD_CHARACTER",
-        "AE_BAD_PATHNAME",
+                  "An invalid character was found in a name"),
-        "AE_BAD_DATA",
+        EXCEP_TXT("AE_BAD_PATHNAME",
-        "AE_BAD_HEX_CONSTANT",
+                  "An invalid character was found in a pathname"),
-        "AE_BAD_OCTAL_CONSTANT",
+        EXCEP_TXT("AE_BAD_DATA",
-        "AE_BAD_DECIMAL_CONSTANT",
+                  "A package or buffer contained incorrect data"),
-        "AE_MISSING_ARGUMENTS",
+        EXCEP_TXT("AE_BAD_HEX_CONSTANT", "Invalid character in a Hex constant"),
-        "AE_BAD_ADDRESS"
+        EXCEP_TXT("AE_BAD_OCTAL_CONSTANT",
+                  "Invalid character in an Octal constant"),
+        EXCEP_TXT("AE_BAD_DECIMAL_CONSTANT",
+                  "Invalid character in a Decimal constant"),
+        EXCEP_TXT("AE_MISSING_ARGUMENTS",
+                  "Too few arguments were passed to a control method"),
+        EXCEP_TXT("AE_BAD_ADDRESS", "An illegal null I/O address")
 };
-char const *acpi_gbl_exception_names_tbl[] = {
+static const struct acpi_exception_info acpi_gbl_exception_names_tbl[] = {
-        NULL,
+        EXCEP_TXT(NULL, NULL),
-        "AE_BAD_SIGNATURE",
+        EXCEP_TXT("AE_BAD_SIGNATURE", "An ACPI table has an invalid signature"),
-        "AE_BAD_HEADER",
+        EXCEP_TXT("AE_BAD_HEADER", "Invalid field in an ACPI table header"),
-        "AE_BAD_CHECKSUM",
+        EXCEP_TXT("AE_BAD_CHECKSUM", "An ACPI table checksum is not correct"),
-        "AE_BAD_VALUE",
+        EXCEP_TXT("AE_BAD_VALUE", "An invalid value was found in a table"),
-        "AE_INVALID_TABLE_LENGTH"
+        EXCEP_TXT("AE_INVALID_TABLE_LENGTH",
+                  "The FADT or FACS has improper length")
 };
-char const *acpi_gbl_exception_names_aml[] = {
+static const struct acpi_exception_info acpi_gbl_exception_names_aml[] = {
-        NULL,
+        EXCEP_TXT(NULL, NULL),
-        "AE_AML_BAD_OPCODE",
+        EXCEP_TXT("AE_AML_BAD_OPCODE", "Invalid AML opcode encountered"),
-        "AE_AML_NO_OPERAND",
+        EXCEP_TXT("AE_AML_NO_OPERAND", "A required operand is missing"),
-        "AE_AML_OPERAND_TYPE",
+        EXCEP_TXT("AE_AML_OPERAND_TYPE",
-        "AE_AML_OPERAND_VALUE",
+                  "An operand of an incorrect type was encountered"),
-        "AE_AML_UNINITIALIZED_LOCAL",
+        EXCEP_TXT("AE_AML_OPERAND_VALUE",
-        "AE_AML_UNINITIALIZED_ARG",
+                  "The operand had an inappropriate or invalid value"),
-        "AE_AML_UNINITIALIZED_ELEMENT",
+        EXCEP_TXT("AE_AML_UNINITIALIZED_LOCAL",
-        "AE_AML_NUMERIC_OVERFLOW",
+                  "Method tried to use an uninitialized local variable"),
-        "AE_AML_REGION_LIMIT",
+        EXCEP_TXT("AE_AML_UNINITIALIZED_ARG",
-        "AE_AML_BUFFER_LIMIT",
+                  "Method tried to use an uninitialized argument"),
-        "AE_AML_PACKAGE_LIMIT",
+        EXCEP_TXT("AE_AML_UNINITIALIZED_ELEMENT",
-        "AE_AML_DIVIDE_BY_ZERO",
+                  "Method tried to use an empty package element"),
-        "AE_AML_BAD_NAME",
+        EXCEP_TXT("AE_AML_NUMERIC_OVERFLOW",
-        "AE_AML_NAME_NOT_FOUND",
+                  "Overflow during BCD conversion or other"),
-        "AE_AML_INTERNAL",
+        EXCEP_TXT("AE_AML_REGION_LIMIT",
-        "AE_AML_INVALID_SPACE_ID",
+                  "Tried to access beyond the end of an Operation Region"),
-        "AE_AML_STRING_LIMIT",
+        EXCEP_TXT("AE_AML_BUFFER_LIMIT",
-        "AE_AML_NO_RETURN_VALUE",
+                  "Tried to access beyond the end of a buffer"),
-        "AE_AML_METHOD_LIMIT",
+        EXCEP_TXT("AE_AML_PACKAGE_LIMIT",
-        "AE_AML_NOT_OWNER",
+                  "Tried to access beyond the end of a package"),
-        "AE_AML_MUTEX_ORDER",
+        EXCEP_TXT("AE_AML_DIVIDE_BY_ZERO",
-        "AE_AML_MUTEX_NOT_ACQUIRED",
+                  "During execution of AML Divide operator"),
-        "AE_AML_INVALID_RESOURCE_TYPE",
+        EXCEP_TXT("AE_AML_BAD_NAME",
-        "AE_AML_INVALID_INDEX",
+                  "An ACPI name contains invalid character(s)"),
-        "AE_AML_REGISTER_LIMIT",
+        EXCEP_TXT("AE_AML_NAME_NOT_FOUND",
-        "AE_AML_NO_WHILE",
+                  "Could not resolve a named reference"),
-        "AE_AML_ALIGNMENT",
+        EXCEP_TXT("AE_AML_INTERNAL", "An internal error within the interprete"),
-        "AE_AML_NO_RESOURCE_END_TAG",
+        EXCEP_TXT("AE_AML_INVALID_SPACE_ID",
-        "AE_AML_BAD_RESOURCE_VALUE",
+                  "An Operation Region SpaceID is invalid"),
-        "AE_AML_CIRCULAR_REFERENCE",
+        EXCEP_TXT("AE_AML_STRING_LIMIT",
-        "AE_AML_BAD_RESOURCE_LENGTH",
+                  "String is longer than 200 characters"),
-        "AE_AML_ILLEGAL_ADDRESS",
+        EXCEP_TXT("AE_AML_NO_RETURN_VALUE",
-        "AE_AML_INFINITE_LOOP"
+                  "A method did not return a required value"),
+        EXCEP_TXT("AE_AML_METHOD_LIMIT",
+                  "A control method reached the maximum reentrancy limit of 255"),
+        EXCEP_TXT("AE_AML_NOT_OWNER",
+                  "A thread tried to release a mutex that it does not own"),
+        EXCEP_TXT("AE_AML_MUTEX_ORDER", "Mutex SyncLevel release mismatch"),
+        EXCEP_TXT("AE_AML_MUTEX_NOT_ACQUIRED",
+                  "Attempt to release a mutex that was not previously acquired"),
+        EXCEP_TXT("AE_AML_INVALID_RESOURCE_TYPE",
+                  "Invalid resource type in resource list"),
+        EXCEP_TXT("AE_AML_INVALID_INDEX",
+                  "Invalid Argx or Localx (x too large)"),
+        EXCEP_TXT("AE_AML_REGISTER_LIMIT",
+                  "Bank value or Index value beyond range of register"),
+        EXCEP_TXT("AE_AML_NO_WHILE", "Break or Continue without a While"),
+        EXCEP_TXT("AE_AML_ALIGNMENT",
+                  "Non-aligned memory transfer on platform that does not support this"),
+        EXCEP_TXT("AE_AML_NO_RESOURCE_END_TAG",
+                  "No End Tag in a resource list"),
+        EXCEP_TXT("AE_AML_BAD_RESOURCE_VALUE",
+                  "Invalid value of a resource element"),
+        EXCEP_TXT("AE_AML_CIRCULAR_REFERENCE",
+                  "Two references refer to each other"),
+        EXCEP_TXT("AE_AML_BAD_RESOURCE_LENGTH",
+                  "The length of a Resource Descriptor in the AML is incorrect"),
+        EXCEP_TXT("AE_AML_ILLEGAL_ADDRESS",
+                  "A memory, I/O, or PCI configuration address is invalid"),
+        EXCEP_TXT("AE_AML_INFINITE_LOOP",
+                  "An apparent infinite AML While loop, method was aborted")
 };
-char const *acpi_gbl_exception_names_ctrl[] = {
+static const struct acpi_exception_info acpi_gbl_exception_names_ctrl[] = {
-        NULL,
+        EXCEP_TXT(NULL, NULL),
-        "AE_CTRL_RETURN_VALUE",
+        EXCEP_TXT("AE_CTRL_RETURN_VALUE", "A Method returned a value"),
-        "AE_CTRL_PENDING",
+        EXCEP_TXT("AE_CTRL_PENDING", "Method is calling another method"),
-        "AE_CTRL_TERMINATE",
+        EXCEP_TXT("AE_CTRL_TERMINATE", "Terminate the executing method"),
-        "AE_CTRL_TRUE",
+        EXCEP_TXT("AE_CTRL_TRUE", "An If or While predicate result"),
-        "AE_CTRL_FALSE",
+        EXCEP_TXT("AE_CTRL_FALSE", "An If or While predicate result"),
-        "AE_CTRL_DEPTH",
+        EXCEP_TXT("AE_CTRL_DEPTH", "Maximum search depth has been reached"),
-        "AE_CTRL_END",
+        EXCEP_TXT("AE_CTRL_END", "An If or While predicate is false"),
-        "AE_CTRL_TRANSFER",
+        EXCEP_TXT("AE_CTRL_TRANSFER", "Transfer control to called method"),
-        "AE_CTRL_BREAK",
+        EXCEP_TXT("AE_CTRL_BREAK", "A Break has been executed"),
-        "AE_CTRL_CONTINUE",
+        EXCEP_TXT("AE_CTRL_CONTINUE", "A Continue has been executed"),
-        "AE_CTRL_SKIP",
+        EXCEP_TXT("AE_CTRL_SKIP", "Not currently used"),
-        "AE_CTRL_PARSE_CONTINUE",
+        EXCEP_TXT("AE_CTRL_PARSE_CONTINUE", "Used to skip over bad opcodes"),
-        "AE_CTRL_PARSE_PENDING"
+        EXCEP_TXT("AE_CTRL_PARSE_PENDING", "Used to implement AML While loops")
 };
 #endif                          /* EXCEPTION_TABLE */
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index 9885276178e0..4f52ea795c7a 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -324,9 +324,9 @@
 /* Helper macro */
-#define ACPI_TRACE_ENTRY(name, function, cast, param) \
+#define ACPI_TRACE_ENTRY(name, function, type, param) \
        ACPI_FUNCTION_NAME (name) \
-        function (ACPI_DEBUG_PARAMETERS, cast (param))
+        function (ACPI_DEBUG_PARAMETERS, (type) (param))
 /* The actual entry trace macros */
@@ -335,13 +335,13 @@
        acpi_ut_trace (ACPI_DEBUG_PARAMETERS)
 #define ACPI_FUNCTION_TRACE_PTR(name, pointer) \
-        ACPI_TRACE_ENTRY (name, acpi_ut_trace_ptr, (void *), pointer)
+        ACPI_TRACE_ENTRY (name, acpi_ut_trace_ptr, void *, pointer)
 #define ACPI_FUNCTION_TRACE_U32(name, value) \
-        ACPI_TRACE_ENTRY (name, acpi_ut_trace_u32, (u32), value)
+        ACPI_TRACE_ENTRY (name, acpi_ut_trace_u32, u32, value)
 #define ACPI_FUNCTION_TRACE_STR(name, string) \
-        ACPI_TRACE_ENTRY (name, acpi_ut_trace_str, (char *), string)
+        ACPI_TRACE_ENTRY (name, acpi_ut_trace_str, char *, string)
 #define ACPI_FUNCTION_ENTRY() \
        acpi_ut_track_stack_ptr()
@@ -355,16 +355,37 @@
 *
 * One of the FUNCTION_TRACE macros above must be used in conjunction
 * with these macros so that "_AcpiFunctionName" is defined.
+ *
+ * There are two versions of most of the return macros. The default version is
+ * safer, since it avoids side-effects by guaranteeing that the argument will
+ * not be evaluated twice.
+ *
+ * A less-safe version of the macros is provided for optional use if the
+ * compiler uses excessive CPU stack (for example, this may happen in the
+ * debug case if code optimzation is disabled.)
 */
 /* Exit trace helper macro */
-#define ACPI_TRACE_EXIT(function, cast, param) \
+#ifndef ACPI_SIMPLE_RETURN_MACROS
+#define ACPI_TRACE_EXIT(function, type, param) \
+        ACPI_DO_WHILE0 ({ \
+                register type _param = (type) (param); \
+                function (ACPI_DEBUG_PARAMETERS, _param); \
+                return (_param); \
+        })
+#else                           /* Use original less-safe macros */
+#define ACPI_TRACE_EXIT(function, type, param) \
        ACPI_DO_WHILE0 ({ \
-                function (ACPI_DEBUG_PARAMETERS, cast (param)); \
+                function (ACPI_DEBUG_PARAMETERS, (type) (param)); \
-                return ((param)); \
+                return (param); \
        })
+#endif                          /* ACPI_SIMPLE_RETURN_MACROS */
 /* The actual exit macros */
 #define return_VOID \
@@ -374,13 +395,19 @@
        })
 #define return_ACPI_STATUS(status) \
-        ACPI_TRACE_EXIT (acpi_ut_status_exit, (acpi_status), status)
+        ACPI_TRACE_EXIT (acpi_ut_status_exit, acpi_status, status)
 #define return_PTR(pointer) \
-        ACPI_TRACE_EXIT (acpi_ut_ptr_exit, (u8 *), pointer)
+        ACPI_TRACE_EXIT (acpi_ut_ptr_exit, void *, pointer)
 #define return_VALUE(value) \
-        ACPI_TRACE_EXIT (acpi_ut_value_exit, (u64), value)
+        ACPI_TRACE_EXIT (acpi_ut_value_exit, u64, value)
+#define return_UINT32(value) \
+        ACPI_TRACE_EXIT (acpi_ut_value_exit, u32, value)
+#define return_UINT8(value) \
+        ACPI_TRACE_EXIT (acpi_ut_value_exit, u8, value)
 /* Conditional execution */
@@ -428,8 +455,10 @@
 #define return_VOID                     return
 #define return_ACPI_STATUS(s)           return(s)
-#define return_VALUE(s)                 return(s)
 #define return_PTR(s)                   return(s)
+#define return_VALUE(s)                 return(s)
+#define return_UINT8(s)                 return(s)
+#define return_UINT32(s)                return(s)
 #endif                          /* ACPI_DEBUG_OUTPUT */
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 22ba56e834e2..98db31d9f9b4 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -88,11 +88,30 @@ struct acpi_device;
 * -----------------
 */
+enum acpi_hotplug_mode {
+        AHM_GENERIC = 0,
+        AHM_CONTAINER,
+        AHM_COUNT
+};
+struct acpi_hotplug_profile {
+        struct kobject kobj;
+        bool enabled:1;
+        enum acpi_hotplug_mode mode;
+};
+static inline struct acpi_hotplug_profile *to_acpi_hotplug_profile(
+                                                struct kobject *kobj)
+{
+        return container_of(kobj, struct acpi_hotplug_profile, kobj);
+}
 struct acpi_scan_handler {
        const struct acpi_device_id *ids;
        struct list_head list_node;
        int (*attach)(struct acpi_device *dev, const struct acpi_device_id *id);
        void (*detach)(struct acpi_device *dev);
+        struct acpi_hotplug_profile hotplug;
 };
 /*
@@ -142,7 +161,6 @@ struct acpi_device_status {
 struct acpi_device_flags {
        u32 dynamic_status:1;
-        u32 bus_address:1;
        u32 removable:1;
        u32 ejectable:1;
        u32 suprise_removal_ok:1;
@@ -150,7 +168,7 @@ struct acpi_device_flags {
        u32 performance_manageable:1;
        u32 eject_pending:1;
        u32 match_driver:1;
-        u32 reserved:23;
+        u32 reserved:24;
 };
 /* File System */
@@ -173,10 +191,17 @@ struct acpi_hardware_id {
        char *id;
 };
+struct acpi_pnp_type {
+        u32 hardware_id:1;
+        u32 bus_address:1;
+        u32 reserved:30;
+};
 struct acpi_device_pnp {
-        acpi_bus_id bus_id;     /* Object name */
+        acpi_bus_id bus_id;             /* Object name */
+        struct acpi_pnp_type type;      /* ID type */
        acpi_bus_address bus_address;   /* _ADR */
-        char *unique_id;        /* _UID */
+        char *unique_id;                /* _UID */
        struct list_head ids;           /* _HID and _CIDs */
        acpi_device_name device_name;   /* Driver-determined */
        acpi_device_class device_class; /*        "          */
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 627749af0ba7..e6168a24b9f0 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -95,7 +95,6 @@ int acpi_pci_link_free_irq(acpi_handle handle);
 struct pci_bus;
 struct pci_dev *acpi_get_pci_dev(acpi_handle);
-int acpi_pci_bind_root(struct acpi_device *device);
 /* Arch-defined function to add a bus to the system */
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 03322dddd88e..454881e6450a 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -46,7 +46,7 @@
 /* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION                 0x20130117
+#define ACPI_CA_VERSION                 0x20130328
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 77dc7a4099a3..ffaac0e7e0c6 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -72,11 +72,13 @@
 #define ACPI_SIG_IVRS           "IVRS"  /* I/O Virtualization Reporting Structure */
 #define ACPI_SIG_MCFG           "MCFG"  /* PCI Memory Mapped Configuration table */
 #define ACPI_SIG_MCHI           "MCHI"  /* Management Controller Host Interface table */
+#define ACPI_SIG_MTMR           "MTMR"  /* MID Timer table */
 #define ACPI_SIG_SLIC           "SLIC"  /* Software Licensing Description Table */
 #define ACPI_SIG_SPCR           "SPCR"  /* Serial Port Console Redirection table */
 #define ACPI_SIG_SPMI           "SPMI"  /* Server Platform Management Interface table */
 #define ACPI_SIG_TCPA           "TCPA"  /* Trusted Computing Platform Alliance table */
 #define ACPI_SIG_UEFI           "UEFI"  /* Uefi Boot Optimization Table */
+#define ACPI_SIG_VRTC           "VRTC"  /* Virtual Real Time Clock Table */
 #define ACPI_SIG_WAET           "WAET"  /* Windows ACPI Emulated devices Table */
 #define ACPI_SIG_WDAT           "WDAT"  /* Watchdog Action Table */
 #define ACPI_SIG_WDDT           "WDDT"  /* Watchdog Timer Description Table */
@@ -852,6 +854,29 @@ struct acpi_table_mchi {
 /*******************************************************************************
 *
+ * MTMR - MID Timer Table
+ *        Version 1
+ *
+ * Conforms to "Simple Firmware Interface Specification",
+ * Draft 0.8.2, Oct 19, 2010
+ * NOTE: The ACPI MTMR is equivalent to the SFI MTMR table.
+ *
+ ******************************************************************************/
+struct acpi_table_mtmr {
+        struct acpi_table_header header;        /* Common ACPI table header */
+};
+/* MTMR entry */
+struct acpi_mtmr_entry {
+        struct acpi_generic_address physical_address;
+        u32 frequency;
+        u32 irq;
+};
+/*******************************************************************************
+ *
 * SLIC - Software Licensing Description Table
 *        Version 1
 *
@@ -1025,6 +1050,28 @@ struct acpi_table_uefi {
 /*******************************************************************************
 *
+ * VRTC - Virtual Real Time Clock Table
+ *        Version 1
+ *
+ * Conforms to "Simple Firmware Interface Specification",
+ * Draft 0.8.2, Oct 19, 2010
+ * NOTE: The ACPI VRTC is equivalent to The SFI MRTC table.
+ *
+ ******************************************************************************/
+struct acpi_table_vrtc {
+        struct acpi_table_header header;        /* Common ACPI table header */
+};
+/* VRTC entry */
+struct acpi_vrtc_entry {
+        struct acpi_generic_address physical_address;
+        u32 irq;
+};
+/*******************************************************************************
+ *
 * WAET - Windows ACPI Emulated devices Table
 *        Version 1
 *
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h
index 332b17e3bec8..e2c0931a3d67 100644
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
@@ -174,7 +174,7 @@ struct acpi_fpdt_header {
 enum acpi_fpdt_type {
        ACPI_FPDT_TYPE_BOOT = 0,
-        ACPI_FPDT_TYPE_S3PERF = 1,
+        ACPI_FPDT_TYPE_S3PERF = 1
 };
 /*
@@ -223,7 +223,7 @@ struct acpi_s3pt_header {
 enum acpi_s3pt_type {
        ACPI_S3PT_TYPE_RESUME = 0,
-        ACPI_S3PT_TYPE_SUSPEND = 1,
+        ACPI_S3PT_TYPE_SUSPEND = 1
 };
 struct acpi_s3pt_resume {
@@ -505,26 +505,59 @@ struct acpi_rasf_shared_memory {
        u32 signature;
        u16 command;
        u16 status;
-        u64 requested_address;
+        u16 version;
-        u64 requested_length;
+        u8 capabilities[16];
-        u64 actual_address;
+        u8 set_capabilities[16];
-        u64 actual_length;
+        u16 num_parameter_blocks;
+        u32 set_capabilities_status;
+};
+/* RASF Parameter Block Structure Header */
+struct acpi_rasf_parameter_block {
+        u16 type;
+        u16 version;
+        u16 length;
+};
+/* RASF Parameter Block Structure for PATROL_SCRUB */
+struct acpi_rasf_patrol_scrub_parameter {
+        struct acpi_rasf_parameter_block header;
+        u16 patrol_scrub_command;
+        u64 requested_address_range[2];
+        u64 actual_address_range[2];
        u16 flags;
-        u8 speed;
+        u8 requested_speed;
 };
 /* Masks for Flags and Speed fields above */
 #define ACPI_RASF_SCRUBBER_RUNNING      1
 #define ACPI_RASF_SPEED                 (7<<1)
+#define ACPI_RASF_SPEED_SLOW            (0<<1)
+#define ACPI_RASF_SPEED_MEDIUM          (4<<1)
+#define ACPI_RASF_SPEED_FAST            (7<<1)
 /* Channel Commands */
 enum acpi_rasf_commands {
-        ACPI_RASF_GET_RAS_CAPABILITIES = 1,
+        ACPI_RASF_EXECUTE_RASF_COMMAND = 1
-        ACPI_RASF_GET_PATROL_PARAMETERS = 2,
+};
-        ACPI_RASF_START_PATROL_SCRUBBER = 3,
-        ACPI_RASF_STOP_PATROL_SCRUBBER = 4
+/* Platform RAS Capabilities */
+enum acpi_rasf_capabiliities {
+        ACPI_HW_PATROL_SCRUB_SUPPORTED = 0,
+        ACPI_SW_PATROL_SCRUB_EXPOSED = 1
+};
+/* Patrol Scrub Commands */
+enum acpi_rasf_patrol_scrub_commands {
+        ACPI_RASF_GET_PATROL_PARAMETERS = 1,
+        ACPI_RASF_START_PATROL_SCRUBBER = 2,
+        ACPI_RASF_STOP_PATROL_SCRUBBER = 3
 };
 /* Channel Command flags */
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 845e75f1ffd8..a64adcc29ae5 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -650,13 +650,14 @@ typedef u32 acpi_event_type;
 * The encoding of acpi_event_status is illustrated below.
 * Note that a set bit (1) indicates the property is TRUE
 * (e.g. if bit 0 is set then the event is enabled).
- * +-------------+-+-+-+
+ * +-------------+-+-+-+-+
- * |   Bits 31:3 |2|1|0|
+ * |   Bits 31:4 |3|2|1|0|
- * +-------------+-+-+-+
+ * +-------------+-+-+-+-+
- *          |     | | |
+ *          |     | | | |
- *          |     | | +- Enabled?
+ *          |     | | | +- Enabled?
- *          |     | +--- Enabled for wake?
+ *          |     | | +--- Enabled for wake?
- *          |     +----- Set?
+ *          |     | +----- Set?
+ *          |     +------- Has a handler?
 *          +----------- <Reserved>
 */
 typedef u32 acpi_event_status;
@@ -1128,7 +1129,6 @@ struct acpi_memory_list {
        u16 object_size;
        u16 max_depth;
        u16 current_depth;
-        u16 link_offset;
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h
new file mode 100644
index 000000000000..d06079c774a0
--- /dev/null
+++ b/include/asm-generic/hugetlb.h
@@ -0,0 +1,40 @@
+#ifndef _ASM_GENERIC_HUGETLB_H
+#define _ASM_GENERIC_HUGETLB_H
+static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot)
+{
+        return mk_pte(page, pgprot);
+}
+static inline int huge_pte_write(pte_t pte)
+{
+        return pte_write(pte);
+}
+static inline int huge_pte_dirty(pte_t pte)
+{
+        return pte_dirty(pte);
+}
+static inline pte_t huge_pte_mkwrite(pte_t pte)
+{
+        return pte_mkwrite(pte);
+}
+static inline pte_t huge_pte_mkdirty(pte_t pte)
+{
+        return pte_mkdirty(pte);
+}
+static inline pte_t huge_pte_modify(pte_t pte, pgprot_t newprot)
+{
+        return pte_modify(pte, newprot);
+}
+static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,
+                                  pte_t *ptep)
+{
+        pte_clear(mm, addr, ptep);
+}
+#endif /* _ASM_GENERIC_HUGETLB_H */
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index bfd87685fc1f..a59ff51b0166 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -7,6 +7,16 @@
 #include <linux/mm_types.h>
 #include <linux/bug.h>
+/*
+ * On almost all architectures and configurations, 0 can be used as the
+ * upper ceiling to free_pgtables(): on many architectures it has the same
+ * effect as using TASK_SIZE.  However, there is one configuration which
+ * must impose a more careful limit, to avoid freeing kernel pgtables.
+ */
+#ifndef USER_PGTABLES_CEILING
+#define USER_PGTABLES_CEILING   0UL
+#endif
 #ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
 extern int ptep_set_access_flags(struct vm_area_struct *vma,
                                 unsigned long address, pte_t *ptep,
diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
index 25f01d0bc149..b1b1fa6ffffe 100644
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
@@ -99,7 +99,12 @@ struct mmu_gather {
        unsigned int            need_flush : 1, /* Did free PTEs */
                                fast_mode  : 1; /* No batching   */
-        unsigned int            fullmm;
+        /* we are in the middle of an operation to clear
+         * a full mm and can make some optimizations */
+        unsigned int            fullmm : 1,
+        /* we have performed an operation which
+         * requires a complete flush of the tlb */
+                                need_flush_all : 1;
        struct mmu_gather_batch *active;
        struct mmu_gather_batch local;
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h
index 4077b5d9ff81..0501fa3f783d 100644
--- a/include/asm-generic/unistd.h
+++ b/include/asm-generic/unistd.h
@@ -9,20 +9,3 @@
 #define __ARCH_WANT_STAT64
 #define __ARCH_WANT_SYS_LLSEEK
 #endif
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#ifndef cond_syscall
-#ifdef CONFIG_SYMBOL_PREFIX
-#define __SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
-#else
-#define __SYMBOL_PREFIX
-#endif
-#define cond_syscall(x) asm(".weak\t" __SYMBOL_PREFIX #x "\n\t" \
-                            ".set\t" __SYMBOL_PREFIX #x "," \
-                            __SYMBOL_PREFIX "sys_ni_syscall")
-#endif
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index bcbdd7484e58..17b5b5967641 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -152,15 +152,6 @@ void acpi_penalize_isa_irq(int irq, int active);
 void acpi_pci_irq_disable (struct pci_dev *dev);
-struct acpi_pci_driver {
-        struct list_head node;
-        int (*add)(struct acpi_pci_root *root);
-        void (*remove)(struct acpi_pci_root *root);
-};
-int acpi_pci_register_driver(struct acpi_pci_driver *driver);
-void acpi_pci_unregister_driver(struct acpi_pci_driver *driver);
 extern int ec_read(u8 addr, u8 *val);
 extern int ec_write(u8 addr, u8 val);
 extern int ec_transaction(u8 command,
@@ -204,7 +195,7 @@ extern bool wmi_has_guid(const char *guid);
 #if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE)
 extern long acpi_video_get_capabilities(acpi_handle graphics_dev_handle);
-extern long acpi_is_video_device(struct acpi_device *device);
+extern long acpi_is_video_device(acpi_handle handle);
 extern void acpi_video_dmi_promote_vendor(void);
 extern void acpi_video_dmi_demote_vendor(void);
 extern int acpi_video_backlight_support(void);
@@ -217,7 +208,7 @@ static inline long acpi_video_get_capabilities(acpi_handle graphics_dev_handle)
        return 0;
 }
-static inline long acpi_is_video_device(struct acpi_device *device)
+static inline long acpi_is_video_device(acpi_handle handle)
 {
        return 0;
 }
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h
index f612c783170f..62d9303c2837 100644
--- a/include/linux/amba/serial.h
+++ b/include/linux/amba/serial.h
@@ -203,6 +203,9 @@ struct amba_pl011_data {
        bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
        void *dma_rx_param;
        void *dma_tx_param;
+        bool dma_rx_poll_enable;
+        unsigned int dma_rx_poll_rate;
+        unsigned int dma_rx_poll_timeout;
        void (*init) (void);
        void (*exit) (void);
 };
diff --git a/include/linux/async.h b/include/linux/async.h
index a2e3f18b2ad6..6b0226bdaadc 100644
--- a/include/linux/async.h
+++ b/include/linux/async.h
@@ -16,9 +16,8 @@
 #include <linux/list.h>
 typedef u64 async_cookie_t;
-typedef void (async_func_ptr) (void *data, async_cookie_t cookie);
+typedef void (*async_func_t) (void *data, async_cookie_t cookie);
 struct async_domain {
-        struct list_head node;
        struct list_head pending;
        unsigned registered:1;
 };
@@ -27,8 +26,7 @@ struct async_domain {
 * domain participates in global async_synchronize_full
 */
 #define ASYNC_DOMAIN(_name) \
-        struct async_domain _name = { .node = LIST_HEAD_INIT(_name.node), \
+        struct async_domain _name = { .pending = LIST_HEAD_INIT(_name.pending), \
-                                      .pending = LIST_HEAD_INIT(_name.pending), \
                                      .registered = 1 }
 /*
@@ -36,12 +34,11 @@ struct async_domain {
 * complete, this domain does not participate in async_synchronize_full
 */
 #define ASYNC_DOMAIN_EXCLUSIVE(_name) \
-        struct async_domain _name = { .node = LIST_HEAD_INIT(_name.node), \
+        struct async_domain _name = { .pending = LIST_HEAD_INIT(_name.pending), \
-                                      .pending = LIST_HEAD_INIT(_name.pending), \
                                      .registered = 0 }
-extern async_cookie_t async_schedule(async_func_ptr *ptr, void *data);
+extern async_cookie_t async_schedule(async_func_t func, void *data);
-extern async_cookie_t async_schedule_domain(async_func_ptr *ptr, void *data,
+extern async_cookie_t async_schedule_domain(async_func_t func, void *data,
                                            struct async_domain *domain);
 void async_unregister_domain(struct async_domain *domain);
 extern void async_synchronize_full(void);
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 8f7a3d68371a..ee0bd9524055 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -954,7 +954,7 @@ static inline int atapi_cdb_len(const u16 *dev_id)
        }
 }
-static inline bool atapi_command_packet_set(const u16 *dev_id)
+static inline int atapi_command_packet_set(const u16 *dev_id)
 {
        return (dev_id[ATA_ID_CONFIG] >> 8) & 0x1f;
 }
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index cdf11191e645..22990cf4439d 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -111,12 +111,13 @@ struct bio {
 #define BIO_FS_INTEGRITY 9      /* fs owns integrity data, not block layer */
 #define BIO_QUIET       10      /* Make BIO Quiet */
 #define BIO_MAPPED_INTEGRITY 11/* integrity metadata has been remapped */
+#define BIO_SNAP_STABLE 12      /* bio data must be snapshotted during write */
 /*
 * Flags starting here get preserved by bio_reset() - this includes
 * BIO_POOL_IDX()
 */
-#define BIO_RESET_BITS  12
+#define BIO_RESET_BITS  13
 #define bio_flagged(bio, flag)  ((bio)->bi_flags & (1 << (flag)))
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 0ea61e07a91c..7c2e030e72f1 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -12,7 +12,6 @@
 struct blk_trace {
        int trace_state;
-        bool rq_based;
        struct rchan *rchan;
        unsigned long __percpu *sequence;
        unsigned char __percpu *msg_data;
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index cdc3bab01832..5f0b0e1f7c08 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -44,7 +44,6 @@ extern unsigned long init_bootmem_node(pg_data_t *pgdat,
                                       unsigned long endpfn);
 extern unsigned long init_bootmem(unsigned long addr, unsigned long memend);
-extern unsigned long free_low_memory_core_early(int nodeid);
 extern unsigned long free_all_bootmem_node(pg_data_t *pgdat);
 extern unsigned long free_all_bootmem(void);
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 5afc4f94d110..9e52b0626b39 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -34,6 +34,8 @@ enum bh_state_bits {
        BH_Write_EIO,   /* I/O error on write */
        BH_Unwritten,   /* Buffer is allocated on disk but not written */
        BH_Quiet,       /* Buffer Error Prinks to be quiet */
+        BH_Meta,        /* Buffer contains metadata */
+        BH_Prio,        /* Buffer should be submitted with REQ_PRIO */
        BH_PrivateStart,/* not a state bit, but the first bit available
                         * for private allocation by other entities
@@ -124,6 +126,8 @@ BUFFER_FNS(Delay, delay)
 BUFFER_FNS(Boundary, boundary)
 BUFFER_FNS(Write_EIO, write_io_error)
 BUFFER_FNS(Unwritten, unwritten)
+BUFFER_FNS(Meta, meta)
+BUFFER_FNS(Prio, prio)
 #define bh_offset(bh)           ((unsigned long)(bh)->b_data & ~PAGE_MASK)
@@ -181,6 +185,7 @@ void ll_rw_block(int, int, struct buffer_head * bh[]);
 int sync_dirty_buffer(struct buffer_head *bh);
 int __sync_dirty_buffer(struct buffer_head *bh, int rw);
 void write_dirty_buffer(struct buffer_head *bh, int rw);
+int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags);
 int submit_bh(int, struct buffer_head *);
 void write_boundary_block(struct block_device *bdev,
                        sector_t bblock, unsigned blocksize);
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 98503b792369..d9a4f7f40f32 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -35,6 +35,7 @@ struct cpu_vfs_cap_data {
 #define _KERNEL_CAP_T_SIZE     (sizeof(kernel_cap_t))
+struct file;
 struct inode;
 struct dentry;
 struct user_namespace;
@@ -211,6 +212,7 @@ extern bool capable(int cap);
 extern bool ns_capable(struct user_namespace *ns, int cap);
 extern bool nsown_capable(int cap);
 extern bool inode_capable(const struct inode *inode, int cap);
+extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
 /* audit system wants to get cap info from files as well */
 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 900af5964f55..646ab9d15e42 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -19,6 +19,7 @@
 #include <linux/idr.h>
 #include <linux/workqueue.h>
 #include <linux/xattr.h>
+#include <linux/fs.h>
 #ifdef CONFIG_CGROUPS
@@ -30,10 +31,6 @@ struct css_id;
 extern int cgroup_init_early(void);
 extern int cgroup_init(void);
-extern void cgroup_lock(void);
-extern int cgroup_lock_is_held(void);
-extern bool cgroup_lock_live_group(struct cgroup *cgrp);
-extern void cgroup_unlock(void);
 extern void cgroup_fork(struct task_struct *p);
 extern void cgroup_post_fork(struct task_struct *p);
 extern void cgroup_exit(struct task_struct *p, int run_callbacks);
@@ -44,14 +41,25 @@ extern void cgroup_unload_subsys(struct cgroup_subsys *ss);
 extern const struct file_operations proc_cgroup_operations;
-/* Define the enumeration of all builtin cgroup subsystems */
+/*
+ * Define the enumeration of all cgroup subsystems.
+ *
+ * We define ids for builtin subsystems and then modular ones.
+ */
 #define SUBSYS(_x) _x ## _subsys_id,
-#define IS_SUBSYS_ENABLED(option) IS_ENABLED(option)
 enum cgroup_subsys_id {
+#define IS_SUBSYS_ENABLED(option) IS_BUILTIN(option)
 #include <linux/cgroup_subsys.h>
+#undef IS_SUBSYS_ENABLED
+        CGROUP_BUILTIN_SUBSYS_COUNT,
+        __CGROUP_SUBSYS_TEMP_PLACEHOLDER = CGROUP_BUILTIN_SUBSYS_COUNT - 1,
+#define IS_SUBSYS_ENABLED(option) IS_MODULE(option)
+#include <linux/cgroup_subsys.h>
+#undef IS_SUBSYS_ENABLED
        CGROUP_SUBSYS_COUNT,
 };
-#undef IS_SUBSYS_ENABLED
 #undef SUBSYS
 /* Per-subsystem/per-cgroup state maintained by the system. */
@@ -148,6 +156,13 @@ enum {
         * specified at mount time and thus is implemented here.
         */
        CGRP_CPUSET_CLONE_CHILDREN,
+        /* see the comment above CGRP_ROOT_SANE_BEHAVIOR for details */
+        CGRP_SANE_BEHAVIOR,
+};
+struct cgroup_name {
+        struct rcu_head rcu_head;
+        char name[];
 };
 struct cgroup {
@@ -172,11 +187,23 @@ struct cgroup {
        struct cgroup *parent;          /* my parent */
        struct dentry *dentry;          /* cgroup fs entry, RCU protected */
+        /*
+         * This is a copy of dentry->d_name, and it's needed because
+         * we can't use dentry->d_name in cgroup_path().
+         *
+         * You must acquire rcu_read_lock() to access cgrp->name, and
+         * the only place that can change it is rename(), which is
+         * protected by parent dir's i_mutex.
+         *
+         * Normally you should use cgroup_name() wrapper rather than
+         * access it directly.
+         */
+        struct cgroup_name __rcu *name;
        /* Private pointers for each registered subsystem */
        struct cgroup_subsys_state *subsys[CGROUP_SUBSYS_COUNT];
        struct cgroupfs_root *root;
-        struct cgroup *top_cgroup;
        /*
         * List of cg_cgroup_links pointing at css_sets with
@@ -213,6 +240,96 @@ struct cgroup {
        struct simple_xattrs xattrs;
 };
+#define MAX_CGROUP_ROOT_NAMELEN 64
+/* cgroupfs_root->flags */
+enum {
+        /*
+         * Unfortunately, cgroup core and various controllers are riddled
+         * with idiosyncrasies and pointless options.  The following flag,
+         * when set, will force sane behavior - some options are forced on,
+         * others are disallowed, and some controllers will change their
+         * hierarchical or other behaviors.
+         *
+         * The set of behaviors affected by this flag are still being
+         * determined and developed and the mount option for this flag is
+         * prefixed with __DEVEL__.  The prefix will be dropped once we
+         * reach the point where all behaviors are compatible with the
+         * planned unified hierarchy, which will automatically turn on this
+         * flag.
+         *
+         * The followings are the behaviors currently affected this flag.
+         *
+         * - Mount options "noprefix" and "clone_children" are disallowed.
+         *   Also, cgroupfs file cgroup.clone_children is not created.
+         *
+         * - When mounting an existing superblock, mount options should
+         *   match.
+         *
+         * - Remount is disallowed.
+         *
+         * - memcg: use_hierarchy is on by default and the cgroup file for
+         *   the flag is not created.
+         *
+         * The followings are planned changes.
+         *
+         * - release_agent will be disallowed once replacement notification
+         *   mechanism is implemented.
+         */
+        CGRP_ROOT_SANE_BEHAVIOR = (1 << 0),
+        CGRP_ROOT_NOPREFIX      = (1 << 1), /* mounted subsystems have no named prefix */
+        CGRP_ROOT_XATTR         = (1 << 2), /* supports extended attributes */
+};
+/*
+ * A cgroupfs_root represents the root of a cgroup hierarchy, and may be
+ * associated with a superblock to form an active hierarchy.  This is
+ * internal to cgroup core.  Don't access directly from controllers.
+ */
+struct cgroupfs_root {
+        struct super_block *sb;
+        /*
+         * The bitmask of subsystems intended to be attached to this
+         * hierarchy
+         */
+        unsigned long subsys_mask;
+        /* Unique id for this hierarchy. */
+        int hierarchy_id;
+        /* The bitmask of subsystems currently attached to this hierarchy */
+        unsigned long actual_subsys_mask;
+        /* A list running through the attached subsystems */
+        struct list_head subsys_list;
+        /* The root cgroup for this hierarchy */
+        struct cgroup top_cgroup;
+        /* Tracks how many cgroups are currently defined in hierarchy.*/
+        int number_of_cgroups;
+        /* A list running through the active hierarchies */
+        struct list_head root_list;
+        /* All cgroups on this root, cgroup_mutex protected */
+        struct list_head allcg_list;
+        /* Hierarchy-specific flags */
+        unsigned long flags;
+        /* IDs for cgroups in this hierarchy */
+        struct ida cgroup_ida;
+        /* The path to use for release notifications. */
+        char release_agent_path[PATH_MAX];
+        /* The name for this hierarchy - may be empty */
+        char name[MAX_CGROUP_ROOT_NAMELEN];
+};
 /*
 * A css_set is a structure holding pointers to a set of
 * cgroup_subsys_state objects. This saves space in the task struct
@@ -278,6 +395,7 @@ struct cgroup_map_cb {
 /* cftype->flags */
 #define CFTYPE_ONLY_ON_ROOT     (1U << 0)       /* only create on root cg */
 #define CFTYPE_NOT_ON_ROOT      (1U << 1)       /* don't create on root cg */
+#define CFTYPE_INSANE           (1U << 2)       /* don't create if sane_behavior */
 #define MAX_CFTYPE_NAME         64
@@ -304,9 +422,6 @@ struct cftype {
        /* CFTYPE_* flags */
        unsigned int flags;
-        /* file xattrs */
-        struct simple_xattrs xattrs;
        int (*open)(struct inode *inode, struct file *file);
        ssize_t (*read)(struct cgroup *cgrp, struct cftype *cft,
                        struct file *file,
@@ -404,18 +519,31 @@ struct cgroup_scanner {
        void *data;
 };
+/*
+ * See the comment above CGRP_ROOT_SANE_BEHAVIOR for details.  This
+ * function can be called as long as @cgrp is accessible.
+ */
+static inline bool cgroup_sane_behavior(const struct cgroup *cgrp)
+{
+        return cgrp->root->flags & CGRP_ROOT_SANE_BEHAVIOR;
+}
+/* Caller should hold rcu_read_lock() */
+static inline const char *cgroup_name(const struct cgroup *cgrp)
+{
+        return rcu_dereference(cgrp->name)->name;
+}
 int cgroup_add_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
 int cgroup_rm_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
 int cgroup_is_removed(const struct cgroup *cgrp);
+bool cgroup_is_descendant(struct cgroup *cgrp, struct cgroup *ancestor);
 int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen);
 int cgroup_task_count(const struct cgroup *cgrp);
-/* Return true if cgrp is a descendant of the task's cgroup */
-int cgroup_is_descendant(const struct cgroup *cgrp, struct task_struct *task);
 /*
 * Control Group taskset, used to pass around set of tasks to cgroup_subsys
 * methods.
@@ -458,7 +586,6 @@ struct cgroup_subsys {
        void (*bind)(struct cgroup *root);
        int subsys_id;
-        int active;
        int disabled;
        int early_init;
        /*
@@ -523,10 +650,16 @@ static inline struct cgroup_subsys_state *cgroup_subsys_state(
 * rcu_dereference_check() conditions, such as locks used during the
 * cgroup_subsys::attach() methods.
 */
+#ifdef CONFIG_PROVE_RCU
+extern struct mutex cgroup_mutex;
 #define task_subsys_state_check(task, subsys_id, __c)                   \
-        rcu_dereference_check(task->cgroups->subsys[subsys_id],         \
+        rcu_dereference_check((task)->cgroups->subsys[(subsys_id)],     \
-                              lockdep_is_held(&task->alloc_lock) ||     \
+                              lockdep_is_held(&(task)->alloc_lock) ||   \
-                              cgroup_lock_is_held() || (__c))
+                              lockdep_is_held(&cgroup_mutex) || (__c))
+#else
+#define task_subsys_state_check(task, subsys_id, __c)                   \
+        rcu_dereference((task)->cgroups->subsys[(subsys_id)])
+#endif
 static inline struct cgroup_subsys_state *
 task_subsys_state(struct task_struct *task, int subsys_id)
@@ -661,8 +794,8 @@ struct task_struct *cgroup_iter_next(struct cgroup *cgrp,
                                        struct cgroup_iter *it);
 void cgroup_iter_end(struct cgroup *cgrp, struct cgroup_iter *it);
 int cgroup_scan_tasks(struct cgroup_scanner *scan);
-int cgroup_attach_task(struct cgroup *, struct task_struct *);
 int cgroup_attach_task_all(struct task_struct *from, struct task_struct *);
+int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from);
 /*
 * CSS ID is ID for cgroup_subsys_state structs under subsys. This only works
@@ -687,13 +820,6 @@ void free_css_id(struct cgroup_subsys *ss, struct cgroup_subsys_state *css);
 struct cgroup_subsys_state *css_lookup(struct cgroup_subsys *ss, int id);
-/*
- * Get a cgroup whose id is greater than or equal to id under tree of root.
- * Returning a cgroup_subsys_state or NULL.
- */
-struct cgroup_subsys_state *css_get_next(struct cgroup_subsys *ss, int id,
-                struct cgroup_subsys_state *root, int *foundid);
 /* Returns true if root is ancestor of cg */
 bool css_is_ancestor(struct cgroup_subsys_state *cg,
                     const struct cgroup_subsys_state *root);
diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
index 42e55deee757..4ce9056b31a8 100644
--- a/include/linux/cleancache.h
+++ b/include/linux/cleancache.h
@@ -33,7 +33,7 @@ struct cleancache_ops {
        void (*invalidate_fs)(int);
 };
-extern struct cleancache_ops
+extern struct cleancache_ops *
        cleancache_register_ops(struct cleancache_ops *ops);
 extern void __cleancache_init_fs(struct super_block *);
 extern void __cleancache_init_shared_fs(char *, struct super_block *);
@@ -42,9 +42,9 @@ extern void __cleancache_put_page(struct page *);
 extern void __cleancache_invalidate_page(struct address_space *, struct page *);
 extern void __cleancache_invalidate_inode(struct address_space *);
 extern void __cleancache_invalidate_fs(struct super_block *);
-extern int cleancache_enabled;
 #ifdef CONFIG_CLEANCACHE
+#define cleancache_enabled (1)
 static inline bool cleancache_fs_enabled(struct page *page)
 {
        return page->mapping->host->i_sb->cleancache_poolid >= 0;
diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
index 9c7f5807824b..dd7adff76e81 100644
--- a/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@ -152,7 +152,7 @@ struct clk {
                },                                              \
                .reg = _reg,                                    \
                .shift = _shift,                                \
-                .width = _width,                                \
+                .mask = BIT(_width) - 1,                        \
                .flags = _mux_flags,                            \
                .lock = _lock,                                  \
        };                                                      \
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 7f197d7addb0..11860985fecb 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -45,6 +45,14 @@ struct clk_hw;
 *              undo any work done in the @prepare callback. Called with
 *              prepare_lock held.
 *
+ * @is_prepared: Queries the hardware to determine if the clock is prepared.
+ *              This function is allowed to sleep. Optional, if this op is not
+ *              set then the prepare count will be used.
+ *
+ * @unprepare_unused: Unprepare the clock atomically.  Only called from
+ *              clk_disable_unused for prepare clocks with special needs.
+ *              Called with prepare mutex held. This function may sleep.
+ *
 * @enable:     Enable the clock atomically. This must not return until the
 *              clock is generating a valid clock signal, usable by consumer
 *              devices. Called with enable_lock held. This function must not
@@ -108,6 +116,8 @@ struct clk_hw;
 struct clk_ops {
        int             (*prepare)(struct clk_hw *hw);
        void            (*unprepare)(struct clk_hw *hw);
+        int             (*is_prepared)(struct clk_hw *hw);
+        void            (*unprepare_unused)(struct clk_hw *hw);
        int             (*enable)(struct clk_hw *hw);
        void            (*disable)(struct clk_hw *hw);
        int             (*is_enabled)(struct clk_hw *hw);
@@ -239,9 +249,14 @@ struct clk_div_table {
 * CLK_DIVIDER_ONE_BASED - by default the divisor is the value read from the
 *      register plus one.  If CLK_DIVIDER_ONE_BASED is set then the divider is
 *      the raw value read from the register, with the value of zero considered
- *      invalid
+ *      invalid, unless CLK_DIVIDER_ALLOW_ZERO is set.
 * CLK_DIVIDER_POWER_OF_TWO - clock divisor is 2 raised to the value read from
 *      the hardware register
+ * CLK_DIVIDER_ALLOW_ZERO - Allow zero divisors.  For dividers which have
+ *      CLK_DIVIDER_ONE_BASED set, it is possible to end up with a zero divisor.
+ *      Some hardware implementations gracefully handle this case and allow a
+ *      zero divisor by not modifying their input clock
+ *      (divide by one / bypass).
 */
 struct clk_divider {
        struct clk_hw   hw;
@@ -255,6 +270,7 @@ struct clk_divider {
 #define CLK_DIVIDER_ONE_BASED           BIT(0)
 #define CLK_DIVIDER_POWER_OF_TWO        BIT(1)
+#define CLK_DIVIDER_ALLOW_ZERO          BIT(2)
 extern const struct clk_ops clk_divider_ops;
 struct clk *clk_register_divider(struct device *dev, const char *name,
@@ -274,7 +290,7 @@ struct clk *clk_register_divider_table(struct device *dev, const char *name,
 * @reg:        register controlling multiplexer
 * @shift:      shift to multiplexer bit field
 * @width:      width of mutliplexer bit field
- * @num_clks:   number of parent clocks
+ * @flags:      hardware-specific flags
 * @lock:       register lock
 *
 * Clock with multiple selectable parents.  Implements .get_parent, .set_parent
@@ -287,8 +303,9 @@ struct clk *clk_register_divider_table(struct device *dev, const char *name,
 struct clk_mux {
        struct clk_hw   hw;
        void __iomem    *reg;
+        u32             *table;
+        u32             mask;
        u8              shift;
-        u8              width;
        u8              flags;
        spinlock_t      *lock;
 };
@@ -297,11 +314,19 @@ struct clk_mux {
 #define CLK_MUX_INDEX_BIT               BIT(1)
 extern const struct clk_ops clk_mux_ops;
 struct clk *clk_register_mux(struct device *dev, const char *name,
                const char **parent_names, u8 num_parents, unsigned long flags,
                void __iomem *reg, u8 shift, u8 width,
                u8 clk_mux_flags, spinlock_t *lock);
+struct clk *clk_register_mux_table(struct device *dev, const char *name,
+                const char **parent_names, u8 num_parents, unsigned long flags,
+                void __iomem *reg, u8 shift, u32 mask,
+                u8 clk_mux_flags, u32 *table, spinlock_t *lock);
+void of_fixed_factor_clk_setup(struct device_node *node);
 /**
 * struct clk_fixed_factor - fixed multiplier and divider clock
 *
@@ -325,6 +350,37 @@ struct clk *clk_register_fixed_factor(struct device *dev, const char *name,
                const char *parent_name, unsigned long flags,
                unsigned int mult, unsigned int div);
+/***
+ * struct clk_composite - aggregate clock of mux, divider and gate clocks
+ *
+ * @hw:         handle between common and hardware-specific interfaces
+ * @mux_hw:     handle between composite and hardware-specific mux clock
+ * @rate_hw:    handle between composite and hardware-specific rate clock
+ * @gate_hw:    handle between composite and hardware-specific gate clock
+ * @mux_ops:    clock ops for mux
+ * @rate_ops:   clock ops for rate
+ * @gate_ops:   clock ops for gate
+ */
+struct clk_composite {
+        struct clk_hw   hw;
+        struct clk_ops  ops;
+        struct clk_hw   *mux_hw;
+        struct clk_hw   *rate_hw;
+        struct clk_hw   *gate_hw;
+        const struct clk_ops    *mux_ops;
+        const struct clk_ops    *rate_ops;
+        const struct clk_ops    *gate_ops;
+};
+struct clk *clk_register_composite(struct device *dev, const char *name,
+                const char **parent_names, int num_parents,
+                struct clk_hw *mux_hw, const struct clk_ops *mux_ops,
+                struct clk_hw *rate_hw, const struct clk_ops *rate_ops,
+                struct clk_hw *gate_hw, const struct clk_ops *gate_ops,
+                unsigned long flags);
 /**
 * clk_register - allocate a new clock, register it and return an opaque cookie
 * @dev: device that is registering this clock
@@ -351,6 +407,7 @@ unsigned int __clk_get_enable_count(struct clk *clk);
 unsigned int __clk_get_prepare_count(struct clk *clk);
 unsigned long __clk_get_rate(struct clk *clk);
 unsigned long __clk_get_flags(struct clk *clk);
+bool __clk_is_prepared(struct clk *clk);
 bool __clk_is_enabled(struct clk *clk);
 struct clk *__clk_lookup(const char *name);
diff --git a/include/linux/clk.h b/include/linux/clk.h
index b3ac22d0fc1f..9a6d04524b1a 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -28,16 +28,16 @@ struct clk;
 * PRE_RATE_CHANGE - called immediately before the clk rate is changed,
 *     to indicate that the rate change will proceed.  Drivers must
 *     immediately terminate any operations that will be affected by the
- *     rate change.  Callbacks may either return NOTIFY_DONE or
+ *     rate change.  Callbacks may either return NOTIFY_DONE, NOTIFY_OK,
- *     NOTIFY_STOP.
+ *     NOTIFY_STOP or NOTIFY_BAD.
 *
 * ABORT_RATE_CHANGE: called if the rate change failed for some reason
 *     after PRE_RATE_CHANGE.  In this case, all registered notifiers on
 *     the clk will be called with ABORT_RATE_CHANGE. Callbacks must
- *     always return NOTIFY_DONE.
+ *     always return NOTIFY_DONE or NOTIFY_OK.
 *
 * POST_RATE_CHANGE - called after the clk rate change has successfully
- *     completed.  Callbacks must always return NOTIFY_DONE.
+ *     completed.  Callbacks must always return NOTIFY_DONE or NOTIFY_OK.
 *
 */
 #define PRE_RATE_CHANGE                 BIT(0)
diff --git a/include/linux/clk/sunxi.h b/include/linux/clk/sunxi.h
new file mode 100644
index 000000000000..e074fdd5a236
--- /dev/null
+++ b/include/linux/clk/sunxi.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2012 Maxime Ripard
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef __LINUX_CLK_SUNXI_H_
+#define __LINUX_CLK_SUNXI_H_
+void __init sunxi_init_clocks(void);
+#endif
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 66346521cb65..963d71431388 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -8,6 +8,20 @@
 #ifndef _LINUX_CLOCKCHIPS_H
 #define _LINUX_CLOCKCHIPS_H
+/* Clock event notification values */
+enum clock_event_nofitiers {
+        CLOCK_EVT_NOTIFY_ADD,
+        CLOCK_EVT_NOTIFY_BROADCAST_ON,
+        CLOCK_EVT_NOTIFY_BROADCAST_OFF,
+        CLOCK_EVT_NOTIFY_BROADCAST_FORCE,
+        CLOCK_EVT_NOTIFY_BROADCAST_ENTER,
+        CLOCK_EVT_NOTIFY_BROADCAST_EXIT,
+        CLOCK_EVT_NOTIFY_SUSPEND,
+        CLOCK_EVT_NOTIFY_RESUME,
+        CLOCK_EVT_NOTIFY_CPU_DYING,
+        CLOCK_EVT_NOTIFY_CPU_DEAD,
+};
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD
 #include <linux/clocksource.h>
@@ -26,20 +40,6 @@ enum clock_event_mode {
        CLOCK_EVT_MODE_RESUME,
 };
-/* Clock event notification values */
-enum clock_event_nofitiers {
-        CLOCK_EVT_NOTIFY_ADD,
-        CLOCK_EVT_NOTIFY_BROADCAST_ON,
-        CLOCK_EVT_NOTIFY_BROADCAST_OFF,
-        CLOCK_EVT_NOTIFY_BROADCAST_FORCE,
-        CLOCK_EVT_NOTIFY_BROADCAST_ENTER,
-        CLOCK_EVT_NOTIFY_BROADCAST_EXIT,
-        CLOCK_EVT_NOTIFY_SUSPEND,
-        CLOCK_EVT_NOTIFY_RESUME,
-        CLOCK_EVT_NOTIFY_CPU_DYING,
-        CLOCK_EVT_NOTIFY_CPU_DEAD,
-};
 /*
 * Clock event features
 */
@@ -55,6 +55,11 @@ enum clock_event_nofitiers {
 #define CLOCK_EVT_FEAT_C3STOP           0x000008
 #define CLOCK_EVT_FEAT_DUMMY            0x000010
+/*
+ * Core shall set the interrupt affinity dynamically in broadcast mode
+ */
+#define CLOCK_EVT_FEAT_DYNIRQ           0x000020
 /**
 * struct clock_event_device - clock event device descriptor
 * @event_handler:      Assigned by the framework to be called by the low
@@ -170,10 +175,16 @@ extern void tick_broadcast(const struct cpumask *mask);
 extern int tick_receive_broadcast(void);
 #endif
+#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT)
+extern int tick_check_broadcast_expired(void);
+#else
+static inline int tick_check_broadcast_expired(void) { return 0; }
+#endif
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
 extern void clockevents_notify(unsigned long reason, void *arg);
 #else
-# define clockevents_notify(reason, arg) do { } while (0)
+static inline void clockevents_notify(unsigned long reason, void *arg) {}
 #endif
 #else /* CONFIG_GENERIC_CLOCKEVENTS_BUILD */
@@ -181,7 +192,8 @@ extern void clockevents_notify(unsigned long reason, void *arg);
 static inline void clockevents_suspend(void) {}
 static inline void clockevents_resume(void) {}
-#define clockevents_notify(reason, arg) do { } while (0)
+static inline void clockevents_notify(unsigned long reason, void *arg) {}
+static inline int tick_check_broadcast_expired(void) { return 0; }
 #endif
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 27cfda427dd9..aa7032c7238f 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -206,6 +206,7 @@ struct clocksource {
 #define CLOCK_SOURCE_WATCHDOG                   0x10
 #define CLOCK_SOURCE_VALID_FOR_HRES             0x20
 #define CLOCK_SOURCE_UNSTABLE                   0x40
+#define CLOCK_SOURCE_SUSPEND_NONSTOP            0x80
 /* simplify initialization of mask field */
 #define CLOCKSOURCE_MASK(bits) (cycle_t)((bits) < 64 ? ((1ULL<<(bits))-1) : -1)
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 76a87fb57ac2..d53c35352ea9 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -27,12 +27,6 @@
 #define __SC_DELOUSE(t,v) ((t)(unsigned long)(v))
 #endif
-#define __SC_CCAST1(t1, a1)      __SC_DELOUSE(t1,a1)
-#define __SC_CCAST2(t2, a2, ...) __SC_DELOUSE(t2,a2), __SC_CCAST1(__VA_ARGS__)
-#define __SC_CCAST3(t3, a3, ...) __SC_DELOUSE(t3,a3), __SC_CCAST2(__VA_ARGS__)
-#define __SC_CCAST4(t4, a4, ...) __SC_DELOUSE(t4,a4), __SC_CCAST3(__VA_ARGS__)
-#define __SC_CCAST5(t5, a5, ...) __SC_DELOUSE(t5,a5), __SC_CCAST4(__VA_ARGS__)
-#define __SC_CCAST6(t6, a6, ...) __SC_DELOUSE(t6,a6), __SC_CCAST5(__VA_ARGS__)
 #define COMPAT_SYSCALL_DEFINE1(name, ...) \
        COMPAT_SYSCALL_DEFINEx(1, _##name, __VA_ARGS__)
 #define COMPAT_SYSCALL_DEFINE2(name, ...) \
@@ -46,24 +40,15 @@
 #define COMPAT_SYSCALL_DEFINE6(name, ...) \
        COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)
-#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS
 #define COMPAT_SYSCALL_DEFINEx(x, name, ...)                            \
-        asmlinkage long compat_sys##name(__SC_DECL##x(__VA_ARGS__));    \
+        asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
-        static inline long C_SYSC##name(__SC_DECL##x(__VA_ARGS__));     \
+        static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
-        asmlinkage long compat_SyS##name(__SC_LONG##x(__VA_ARGS__))     \
+        asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\
        {                                                               \
-                return (long) C_SYSC##name(__SC_CCAST##x(__VA_ARGS__)); \
+                return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__)); \
        }                                                               \
        SYSCALL_ALIAS(compat_sys##name, compat_SyS##name);              \
-        static inline long C_SYSC##name(__SC_DECL##x(__VA_ARGS__))
+        static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
-#else /* CONFIG_HAVE_SYSCALL_WRAPPERS */
-#define COMPAT_SYSCALL_DEFINEx(x, name, ...)                            \
-        asmlinkage long compat_sys##name(__SC_DECL##x(__VA_ARGS__))
-#endif /* CONFIG_HAVE_SYSCALL_WRAPPERS */
 #ifndef compat_user_stack_pointer
 #define compat_user_stack_pointer() current_user_stack_pointer()
@@ -141,11 +126,11 @@ typedef struct {
 } compat_sigset_t;
 struct compat_sigaction {
-#ifndef __ARCH_HAS_ODD_SIGACTION
+#ifndef __ARCH_HAS_IRIX_SIGACTION
        compat_uptr_t                   sa_handler;
        compat_ulong_t                  sa_flags;
 #else
-        compat_ulong_t                  sa_flags;
+        compat_uint_t                   sa_flags;
        compat_uptr_t                   sa_handler;
 #endif
 #ifdef __ARCH_HAS_SA_RESTORER
@@ -326,21 +311,13 @@ asmlinkage long
 compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
                           compat_size_t __user *len_ptr);
-#ifdef CONFIG_ARCH_WANT_OLD_COMPAT_IPC
+asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
-long compat_sys_semctl(int first, int second, int third, void __user *uptr);
+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
-long compat_sys_msgsnd(int first, int second, int third, void __user *uptr);
+asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
-long compat_sys_msgrcv(int first, int second, int msgtyp, int third,
+asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
-                int version, void __user *uptr);
-long compat_sys_shmat(int first, int second, compat_uptr_t third, int version,
-                void __user *uptr);
-#else
-long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
-long compat_sys_msgsnd(int msqid, struct compat_msgbuf __user *msgp,
                compat_ssize_t msgsz, int msgflg);
-long compat_sys_msgrcv(int msqid, struct compat_msgbuf __user *msgp,
+asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
                compat_ssize_t msgsz, long msgtyp, int msgflg);
-long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
-#endif
 long compat_sys_msgctl(int first, int second, void __user *uptr);
 long compat_sys_shmctl(int first, int second, void __user *uptr);
 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
@@ -444,13 +421,13 @@ extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
                                  compat_long_t addr, compat_long_t data);
+asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, size_t);
 /*
 * epoll (fs/eventpoll.c) compat bits follow ...
 */
-struct epoll_event;
+struct epoll_event;     /* fortunately, this one is fixed-layout */
-#define compat_epoll_event      epoll_event
 asmlinkage long compat_sys_epoll_pwait(int epfd,
-                        struct compat_epoll_event __user *events,
+                        struct epoll_event __user *events,
                        int maxevents, int timeout,
                        const compat_sigset_t __user *sigmask,
                        compat_size_t sigsetsize);
@@ -685,6 +662,8 @@ asmlinkage ssize_t compat_sys_process_vm_writev(compat_pid_t pid,
 asmlinkage long compat_sys_sendfile(int out_fd, int in_fd,
                                    compat_off_t __user *offset, compat_size_t count);
+asmlinkage long compat_sys_sendfile64(int out_fd, int in_fd,
+                                    compat_loff_t __user *offset, compat_size_t count);
 asmlinkage long compat_sys_sigaltstack(const compat_stack_t __user *uss_ptr,
                                       compat_stack_t __user *uoss_ptr);
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index 68b162d92254..842de225055f 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -13,7 +13,7 @@
 #define __must_check            __attribute__((warn_unused_result))
 #define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
-#if GCC_VERSION >= 40100
+#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
 # define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
 #endif
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 10b8f23fab0f..92669cd182a6 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -351,4 +351,10 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 */
 #define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
+/* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
+#ifdef CONFIG_KPROBES
+# define __kprobes      __attribute__((__section__(".kprobes.text")))
+#else
+# define __kprobes
+#endif
 #endif /* __LINUX_COMPILER_H */
diff --git a/include/linux/console.h b/include/linux/console.h
index 29680a8cda99..73bab0f58af5 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -141,6 +141,7 @@ struct console {
        for (con = console_drivers; con != NULL; con = con->next)
 extern int console_set_on_cmdline;
+extern struct console *early_console;
 extern int add_preferred_console(char *name, int idx, char *options);
 extern int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options);
diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
index b28d161c1091..365f4a61bf04 100644
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@ -1,9 +1,9 @@
 #ifndef _LINUX_CONTEXT_TRACKING_H
 #define _LINUX_CONTEXT_TRACKING_H
-#ifdef CONFIG_CONTEXT_TRACKING
 #include <linux/sched.h>
 #include <linux/percpu.h>
+#include <asm/ptrace.h>
 struct context_tracking {
        /*
@@ -13,12 +13,13 @@ struct context_tracking {
         * may be further optimized using static keys.
         */
        bool active;
-        enum {
+        enum ctx_state {
                IN_KERNEL = 0,
                IN_USER,
        } state;
 };
+#ifdef CONFIG_CONTEXT_TRACKING
 DECLARE_PER_CPU(struct context_tracking, context_tracking);
 static inline bool context_tracking_in_user(void)
@@ -33,12 +34,31 @@ static inline bool context_tracking_active(void)
 extern void user_enter(void);
 extern void user_exit(void);
+static inline enum ctx_state exception_enter(void)
+{
+        enum ctx_state prev_ctx;
+        prev_ctx = this_cpu_read(context_tracking.state);
+        user_exit();
+        return prev_ctx;
+}
+static inline void exception_exit(enum ctx_state prev_ctx)
+{
+        if (prev_ctx == IN_USER)
+                user_enter();
+}
 extern void context_tracking_task_switch(struct task_struct *prev,
                                         struct task_struct *next);
 #else
 static inline bool context_tracking_in_user(void) { return false; }
 static inline void user_enter(void) { }
 static inline void user_exit(void) { }
+static inline enum ctx_state exception_enter(void) { return 0; }
+static inline void exception_exit(enum ctx_state prev_ctx) { }
 static inline void context_tracking_task_switch(struct task_struct *prev,
                                                struct task_struct *next) { }
 #endif /* !CONFIG_CONTEXT_TRACKING */
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index ce7a074f2519..c6f6e0839b61 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -212,4 +212,20 @@ static inline int disable_nonboot_cpus(void) { return 0; }
 static inline void enable_nonboot_cpus(void) {}
 #endif /* !CONFIG_PM_SLEEP_SMP */
+enum cpuhp_state {
+        CPUHP_OFFLINE,
+        CPUHP_ONLINE,
+};
+void cpu_startup_entry(enum cpuhp_state state);
+void cpu_idle(void);
+void cpu_idle_poll_ctrl(bool enable);
+void arch_cpu_idle(void);
+void arch_cpu_idle_prepare(void);
+void arch_cpu_idle_enter(void);
+void arch_cpu_idle_exit(void);
+void arch_cpu_idle_dead(void);
 #endif /* _LINUX_CPU_H_ */
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index a22944ca0526..037d36ae63e5 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -106,6 +106,7 @@ struct cpufreq_policy {
                                         * governors are used */
        unsigned int            policy; /* see above */
        struct cpufreq_governor *governor; /* see below */
+        void                    *governor_data;
        struct work_struct      update; /* if update_policy() needs to be
                                         * called, but you're in IRQ context */
@@ -178,9 +179,11 @@ static inline unsigned long cpufreq_scale(unsigned long old, u_int div, u_int mu
 *                          CPUFREQ GOVERNORS                        *
 *********************************************************************/
-#define CPUFREQ_GOV_START  1
+#define CPUFREQ_GOV_START       1
-#define CPUFREQ_GOV_STOP   2
+#define CPUFREQ_GOV_STOP        2
-#define CPUFREQ_GOV_LIMITS 3
+#define CPUFREQ_GOV_LIMITS      3
+#define CPUFREQ_GOV_POLICY_INIT 4
+#define CPUFREQ_GOV_POLICY_EXIT 5
 struct cpufreq_governor {
        char    name[CPUFREQ_NAME_LEN];
@@ -229,6 +232,13 @@ struct cpufreq_driver {
        struct module           *owner;
        char                    name[CPUFREQ_NAME_LEN];
        u8                      flags;
+        /*
+         * This should be set by platforms having multiple clock-domains, i.e.
+         * supporting multiple policies. With this sysfs directories of governor
+         * would be created in cpu/cpu<num>/cpufreq/ directory and so they can
+         * use the same governor with different tunables for different clusters.
+         */
+        bool                    have_governor_per_policy;
        /* needed by all drivers */
        int     (*init)         (struct cpufreq_policy *policy);
@@ -268,8 +278,8 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data);
 int cpufreq_unregister_driver(struct cpufreq_driver *driver_data);
-void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state);
+void cpufreq_notify_transition(struct cpufreq_policy *policy,
+                struct cpufreq_freqs *freqs, unsigned int state);
 static inline void cpufreq_verify_within_limits(struct cpufreq_policy *policy, unsigned int min, unsigned int max)
 {
@@ -329,6 +339,7 @@ const char *cpufreq_get_current_driver(void);
 *********************************************************************/
 int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
 int cpufreq_update_policy(unsigned int cpu);
+bool have_governor_per_policy(void);
 #ifdef CONFIG_CPU_FREQ
 /* query the current CPU frequency (in kHz). If zero, cpufreq couldn't detect it */
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 480c14dc1ddd..3c86faa59798 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -57,6 +57,7 @@ struct cpuidle_state {
 /* Idle State Flags */
 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
 #define CPUIDLE_FLAG_COUPLED    (0x02) /* state applies to multiple cpus */
+#define CPUIDLE_FLAG_TIMER_STOP (0x04)  /* timer is stopped on this state */
 #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)
@@ -104,8 +105,8 @@ struct cpuidle_driver {
        struct module           *owner;
        int                     refcnt;
-        /* set to 1 to use the core cpuidle time keeping (for all states). */
+        /* used by the cpuidle framework to setup the broadcast timer */
-        unsigned int            en_core_tk_irqen:1;
+        unsigned int            bctimer:1;
        /* states array must be ordered in decreasing power consumption */
        struct cpuidle_state    states[CPUIDLE_STATE_MAX];
        int                     state_count;
@@ -122,17 +123,15 @@ extern void cpuidle_driver_unref(void);
 extern void cpuidle_unregister_driver(struct cpuidle_driver *drv);
 extern int cpuidle_register_device(struct cpuidle_device *dev);
 extern void cpuidle_unregister_device(struct cpuidle_device *dev);
+extern int cpuidle_register(struct cpuidle_driver *drv,
+                            const struct cpumask *const coupled_cpus);
+extern void cpuidle_unregister(struct cpuidle_driver *drv);
 extern void cpuidle_pause_and_lock(void);
 extern void cpuidle_resume_and_unlock(void);
 extern void cpuidle_pause(void);
 extern void cpuidle_resume(void);
 extern int cpuidle_enable_device(struct cpuidle_device *dev);
 extern void cpuidle_disable_device(struct cpuidle_device *dev);
-extern int cpuidle_wrap_enter(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv, int index,
-                                int (*enter)(struct cpuidle_device *dev,
-                                        struct cpuidle_driver *drv, int index));
 extern int cpuidle_play_dead(void);
 extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev);
@@ -151,7 +150,10 @@ static inline void cpuidle_unregister_driver(struct cpuidle_driver *drv) { }
 static inline int cpuidle_register_device(struct cpuidle_device *dev)
 {return -ENODEV; }
 static inline void cpuidle_unregister_device(struct cpuidle_device *dev) { }
+static inline int cpuidle_register(struct cpuidle_driver *drv,
+                                   const struct cpumask *const coupled_cpus)
+{return -ENODEV; }
+static inline void cpuidle_unregister(struct cpuidle_driver *drv) { }
 static inline void cpuidle_pause_and_lock(void) { }
 static inline void cpuidle_resume_and_unlock(void) { }
 static inline void cpuidle_pause(void) { }
@@ -159,11 +161,6 @@ static inline void cpuidle_resume(void) { }
 static inline int cpuidle_enable_device(struct cpuidle_device *dev)
 {return -ENODEV; }
 static inline void cpuidle_disable_device(struct cpuidle_device *dev) { }
-static inline int cpuidle_wrap_enter(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv, int index,
-                                int (*enter)(struct cpuidle_device *dev,
-                                        struct cpuidle_driver *drv, int index))
-{ return -ENODEV; }
 static inline int cpuidle_play_dead(void) {return -ENODEV; }
 #endif
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 032560295fcb..d08e4d2a9b92 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -591,6 +591,21 @@ static inline int cpulist_scnprintf(char *buf, int len,
 }
 /**
+ * cpumask_parse - extract a cpumask from from a string
+ * @buf: the buffer to extract from
+ * @dstp: the cpumask to set.
+ *
+ * Returns -errno, or 0 for success.
+ */
+static inline int cpumask_parse(const char *buf, struct cpumask *dstp)
+{
+        char *nl = strchr(buf, '\n');
+        int len = nl ? nl - buf : strlen(buf);
+        return bitmap_parse(buf, len, cpumask_bits(dstp), nr_cpumask_bits);
+}
+/**
 * cpulist_parse - extract a cpumask from a user string of ranges
 * @buf: the buffer to extract from
 * @dstp: the cpumask to set.
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index 8c8a60d29407..ccd1de8ad822 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -11,7 +11,6 @@
 #include <linux/sched.h>
 #include <linux/cpumask.h>
 #include <linux/nodemask.h>
-#include <linux/cgroup.h>
 #include <linux/mm.h>
 #ifdef CONFIG_CPUSETS
diff --git a/include/linux/ctype.h b/include/linux/ctype.h
index 8acfe312f947..653589e3e30e 100644
--- a/include/linux/ctype.h
+++ b/include/linux/ctype.h
@@ -61,4 +61,10 @@ static inline char _tolower(const char c)
        return c | 0x20;
 }
+/* Fast check for octal digit */
+static inline int isodigit(const char c)
+{
+        return c >= '0' && c <= '7';
+}
 #endif
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 3bd46f766751..21ca773f77bf 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -27,7 +27,7 @@ extern int debug_locks_off(void);
                                                                        \
        if (!oops_in_progress && unlikely(c)) {                         \
                if (debug_locks_off() && !debug_locks_silent)           \
-                        WARN_ON(1);                                     \
+                        WARN(1, "DEBUG_LOCKS_WARN_ON(%s)", #c);         \
                __ret = 1;                                              \
        }                                                               \
        __ret;                                                          \
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
index e83ef39b3bea..fe8c4476f7e4 100644
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
@@ -213,7 +213,7 @@ struct devfreq_simple_ondemand_data {
 #endif
 #else /* !CONFIG_PM_DEVFREQ */
-static struct devfreq *devfreq_add_device(struct device *dev,
+static inline struct devfreq *devfreq_add_device(struct device *dev,
                                          struct devfreq_dev_profile *profile,
                                          const char *governor_name,
                                          void *data)
@@ -221,34 +221,34 @@ static struct devfreq *devfreq_add_device(struct device *dev,
        return NULL;
 }
-static int devfreq_remove_device(struct devfreq *devfreq)
+static inline int devfreq_remove_device(struct devfreq *devfreq)
 {
        return 0;
 }
-static int devfreq_suspend_device(struct devfreq *devfreq)
+static inline int devfreq_suspend_device(struct devfreq *devfreq)
 {
        return 0;
 }
-static int devfreq_resume_device(struct devfreq *devfreq)
+static inline int devfreq_resume_device(struct devfreq *devfreq)
 {
        return 0;
 }
-static struct opp *devfreq_recommended_opp(struct device *dev,
+static inline struct opp *devfreq_recommended_opp(struct device *dev,
                                           unsigned long *freq, u32 flags)
 {
-        return -EINVAL;
+        return ERR_PTR(-EINVAL);
 }
-static int devfreq_register_opp_notifier(struct device *dev,
+static inline int devfreq_register_opp_notifier(struct device *dev,
                                         struct devfreq *devfreq)
 {
        return -EINVAL;
 }
-static int devfreq_unregister_opp_notifier(struct device *dev,
+static inline int devfreq_unregister_opp_notifier(struct device *dev,
                                           struct devfreq *devfreq)
 {
        return -EINVAL;
diff --git a/include/linux/device.h b/include/linux/device.h
index 9d6464ea99c6..711793b145ff 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -25,6 +25,7 @@
 #include <linux/pm.h>
 #include <linux/atomic.h>
 #include <linux/ratelimit.h>
+#include <linux/uidgid.h>
 #include <asm/device.h>
 struct device;
@@ -111,17 +112,11 @@ struct bus_type {
        struct iommu_ops *iommu_ops;
        struct subsys_private *p;
+        struct lock_class_key lock_key;
 };
-/* This is a #define to keep the compiler from merging different
+extern int __must_check bus_register(struct bus_type *bus);
- * instances of the __key variable */
-#define bus_register(subsys)                    \
-({                                              \
-        static struct lock_class_key __key;     \
-        __bus_register(subsys, &__key); \
-})
-extern int __must_check __bus_register(struct bus_type *bus,
-                                       struct lock_class_key *key);
 extern void bus_unregister(struct bus_type *bus);
 extern int __must_check bus_rescan_devices(struct bus_type *bus);
@@ -302,6 +297,8 @@ void subsys_interface_unregister(struct subsys_interface *sif);
 int subsys_system_register(struct bus_type *subsys,
                           const struct attribute_group **groups);
+int subsys_virtual_register(struct bus_type *subsys,
+                            const struct attribute_group **groups);
 /**
 * struct class - device classes
@@ -471,7 +468,8 @@ struct device_type {
        const char *name;
        const struct attribute_group **groups;
        int (*uevent)(struct device *dev, struct kobj_uevent_env *env);
-        char *(*devnode)(struct device *dev, umode_t *mode);
+        char *(*devnode)(struct device *dev, umode_t *mode,
+                         kuid_t *uid, kgid_t *gid);
        void (*release)(struct device *dev);
        const struct dev_pm_ops *pm;
@@ -849,7 +847,8 @@ extern int device_rename(struct device *dev, const char *new_name);
 extern int device_move(struct device *dev, struct device *new_parent,
                       enum dpm_order dpm_order);
 extern const char *device_get_devnode(struct device *dev,
-                                      umode_t *mode, const char **tmp);
+                                      umode_t *mode, kuid_t *uid, kgid_t *gid,
+                                      const char **tmp);
 extern void *dev_get_drvdata(const struct device *dev);
 extern int dev_set_drvdata(struct device *dev, void *data);
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index 9978b614a1aa..dfac5ed31120 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -112,6 +112,8 @@ struct dma_buf_ops {
 * @file: file pointer used for sharing buffers across, and for refcounting.
 * @attachments: list of dma_buf_attachment that denotes all devices attached.
 * @ops: dma_buf_ops associated with this buffer object.
+ * @exp_name: name of the exporter; useful for debugging.
+ * @list_node: node for dma_buf accounting and debugging.
 * @priv: exporter specific private data for this buffer object.
 */
 struct dma_buf {
@@ -123,6 +125,8 @@ struct dma_buf {
        struct mutex lock;
        unsigned vmapping_counter;
        void *vmap_ptr;
+        const char *exp_name;
+        struct list_head list_node;
        void *priv;
 };
@@ -162,8 +166,13 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
                                                        struct device *dev);
 void dma_buf_detach(struct dma_buf *dmabuf,
                                struct dma_buf_attachment *dmabuf_attach);
-struct dma_buf *dma_buf_export(void *priv, const struct dma_buf_ops *ops,
-                               size_t size, int flags);
+struct dma_buf *dma_buf_export_named(void *priv, const struct dma_buf_ops *ops,
+                               size_t size, int flags, const char *);
+#define dma_buf_export(priv, ops, size, flags)  \
+        dma_buf_export_named(priv, ops, size, flags, __FILE__)
 int dma_buf_fd(struct dma_buf *dmabuf, int flags);
 struct dma_buf *dma_buf_get(int fd);
 void dma_buf_put(struct dma_buf *dmabuf);
@@ -185,5 +194,6 @@ int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *,
                 unsigned long);
 void *dma_buf_vmap(struct dma_buf *);
 void dma_buf_vunmap(struct dma_buf *, void *vaddr);
+int dma_buf_debugfs_create_file(const char *name,
+                                int (*write)(struct seq_file *));
 #endif /* __DMA_BUF_H__ */
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index f156cca25ad0..b6eb7a05d58e 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -99,6 +99,7 @@ extern const char * dmi_get_system_info(int field);
 extern const struct dmi_device * dmi_find_device(int type, const char *name,
        const struct dmi_device *from);
 extern void dmi_scan_machine(void);
+extern void dmi_set_dump_stack_arch_desc(void);
 extern bool dmi_get_date(int field, int *yearp, int *monthp, int *dayp);
 extern int dmi_name_in_vendors(const char *str);
 extern int dmi_name_in_serial(const char *str);
@@ -114,6 +115,7 @@ static inline const char * dmi_get_system_info(int field) { return NULL; }
 static inline const struct dmi_device * dmi_find_device(int type, const char *name,
        const struct dmi_device *from) { return NULL; }
 static inline void dmi_scan_machine(void) { return; }
+static inline void dmi_set_dump_stack_arch_desc(void) { }
 static inline bool dmi_get_date(int field, int *yearp, int *monthp, int *dayp)
 {
        if (yearp)
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 9bf2f1fcae27..3d7df3d32c66 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -333,6 +333,7 @@ typedef efi_status_t efi_query_capsule_caps_t(efi_capsule_header_t **capsules,
                                              unsigned long count,
                                              u64 *max_size,
                                              int *reset_type);
+typedef efi_status_t efi_query_variable_store_t(u32 attributes, unsigned long size);
 /*
 *  EFI Configuration Table and GUID definitions
@@ -575,9 +576,15 @@ extern void efi_enter_virtual_mode (void);	/* switch EFI to virtual mode, if pos
 #ifdef CONFIG_X86
 extern void efi_late_init(void);
 extern void efi_free_boot_services(void);
+extern efi_status_t efi_query_variable_store(u32 attributes, unsigned long size);
 #else
 static inline void efi_late_init(void) {}
 static inline void efi_free_boot_services(void) {}
+static inline efi_status_t efi_query_variable_store(u32 attributes, unsigned long size)
+{
+        return EFI_SUCCESS;
+}
 #endif
 extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr);
 extern u64 efi_get_iobase (void);
@@ -731,7 +738,7 @@ struct efivar_operations {
        efi_get_variable_t *get_variable;
        efi_get_next_variable_t *get_next_variable;
        efi_set_variable_t *set_variable;
-        efi_query_variable_info_t *query_variable_info;
+        efi_query_variable_store_t *query_variable_store;
 };
 struct efivars {
diff --git a/include/linux/evm.h b/include/linux/evm.h
index 9fc13a760928..1fcb88ca88de 100644
--- a/include/linux/evm.h
+++ b/include/linux/evm.h
@@ -96,5 +96,5 @@ static inline int evm_inode_init_security(struct inode *inode,
        return 0;
 }
-#endif /* CONFIG_EVM_H */
+#endif /* CONFIG_EVM */
 #endif /* LINUX_EVM_H */
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index 5b9b5b317180..41b223a59a63 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -85,6 +85,17 @@ enum fid_type {
        FILEID_NILFS_WITH_PARENT = 0x62,
        /*
+         * 32 bit generation number, 40 bit i_pos.
+         */
+        FILEID_FAT_WITHOUT_PARENT = 0x71,
+        /*
+         * 32 bit generation number, 40 bit i_pos,
+         * 32 bit parent generation number, 40 bit parent i_pos
+         */
+        FILEID_FAT_WITH_PARENT = 0x72,
+        /*
         * Filesystems must not use 0xff file ID.
         */
        FILEID_INVALID = 0xff,
diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
index 30442547b9e6..8293262401de 100644
--- a/include/linux/frontswap.h
+++ b/include/linux/frontswap.h
@@ -14,7 +14,7 @@ struct frontswap_ops {
 };
 extern bool frontswap_enabled;
-extern struct frontswap_ops
+extern struct frontswap_ops *
        frontswap_register_ops(struct frontswap_ops *ops);
 extern void frontswap_shrink(unsigned long);
 extern unsigned long frontswap_curr_pages(void);
@@ -22,33 +22,19 @@ extern void frontswap_writethrough(bool);
 #define FRONTSWAP_HAS_EXCLUSIVE_GETS
 extern void frontswap_tmem_exclusive_gets(bool);
-extern void __frontswap_init(unsigned type);
+extern bool __frontswap_test(struct swap_info_struct *, pgoff_t);
+extern void __frontswap_init(unsigned type, unsigned long *map);
 extern int __frontswap_store(struct page *page);
 extern int __frontswap_load(struct page *page);
 extern void __frontswap_invalidate_page(unsigned, pgoff_t);
 extern void __frontswap_invalidate_area(unsigned);
 #ifdef CONFIG_FRONTSWAP
+#define frontswap_enabled (1)
 static inline bool frontswap_test(struct swap_info_struct *sis, pgoff_t offset)
 {
-        bool ret = false;
+        return __frontswap_test(sis, offset);
-        if (frontswap_enabled && sis->frontswap_map)
-                ret = test_bit(offset, sis->frontswap_map);
-        return ret;
-}
-static inline void frontswap_set(struct swap_info_struct *sis, pgoff_t offset)
-{
-        if (frontswap_enabled && sis->frontswap_map)
-                set_bit(offset, sis->frontswap_map);
-}
-static inline void frontswap_clear(struct swap_info_struct *sis, pgoff_t offset)
-{
-        if (frontswap_enabled && sis->frontswap_map)
-                clear_bit(offset, sis->frontswap_map);
 }
 static inline void frontswap_map_set(struct swap_info_struct *p,
@@ -71,14 +57,6 @@ static inline bool frontswap_test(struct swap_info_struct *sis, pgoff_t offset)
        return false;
 }
-static inline void frontswap_set(struct swap_info_struct *sis, pgoff_t offset)
-{
-}
-static inline void frontswap_clear(struct swap_info_struct *sis, pgoff_t offset)
-{
-}
 static inline void frontswap_map_set(struct swap_info_struct *p,
                                     unsigned long *map)
 {
@@ -120,10 +98,10 @@ static inline void frontswap_invalidate_area(unsigned type)
                __frontswap_invalidate_area(type);
 }
-static inline void frontswap_init(unsigned type)
+static inline void frontswap_init(unsigned type, unsigned long *map)
 {
        if (frontswap_enabled)
-                __frontswap_init(type);
+                __frontswap_init(type, map);
 }
 #endif /* _LINUX_FRONTSWAP_H */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 2c28271ab9d4..17d8b1596215 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -675,9 +675,11 @@ static inline loff_t i_size_read(const struct inode *inode)
 static inline void i_size_write(struct inode *inode, loff_t i_size)
 {
 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+        preempt_disable();
        write_seqcount_begin(&inode->i_size_seqcount);
        inode->i_size = i_size;
        write_seqcount_end(&inode->i_size_seqcount);
+        preempt_enable();
 #elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT)
        preempt_disable();
        inode->i_size = i_size;
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index d5b0910d4961..4b2ee8d12f5e 100644
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -157,7 +157,6 @@ struct fsnotify_group {
                struct inotify_group_private_data {
                        spinlock_t      idr_lock;
                        struct idr      idr;
-                        u32             last_wd;
                        struct user_struct      *user;
                } inotify_data;
 #endif
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index e5ca8ef50e9b..f83e17a40e8b 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -89,6 +89,7 @@ typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip,
 *            that the call back has its own recursion protection. If it does
 *            not set this, then the ftrace infrastructure will add recursion
 *            protection for the caller.
+ * STUB   - The ftrace_ops is just a place holder.
 */
 enum {
        FTRACE_OPS_FL_ENABLED                   = 1 << 0,
@@ -98,6 +99,7 @@ enum {
        FTRACE_OPS_FL_SAVE_REGS                 = 1 << 4,
        FTRACE_OPS_FL_SAVE_REGS_IF_SUPPORTED    = 1 << 5,
        FTRACE_OPS_FL_RECURSION_SAFE            = 1 << 6,
+        FTRACE_OPS_FL_STUB                      = 1 << 7,
 };
 struct ftrace_ops {
@@ -259,8 +261,10 @@ struct ftrace_probe_ops {
        void                    (*func)(unsigned long ip,
                                        unsigned long parent_ip,
                                        void **data);
-        int                     (*callback)(unsigned long ip, void **data);
+        int                     (*init)(struct ftrace_probe_ops *ops,
-        void                    (*free)(void **data);
+                                        unsigned long ip, void **data);
+        void                    (*free)(struct ftrace_probe_ops *ops,
+                                        unsigned long ip, void **data);
        int                     (*print)(struct seq_file *m,
                                         unsigned long ip,
                                         struct ftrace_probe_ops *ops,
@@ -394,7 +398,6 @@ ssize_t ftrace_filter_write(struct file *file, const char __user *ubuf,
                            size_t cnt, loff_t *ppos);
 ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf,
                             size_t cnt, loff_t *ppos);
-loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int whence);
 int ftrace_regex_release(struct inode *inode, struct file *file);
 void __init
@@ -567,6 +570,8 @@ static inline int
 ftrace_regex_release(struct inode *inode, struct file *file) { return -ENODEV; }
 #endif /* CONFIG_DYNAMIC_FTRACE */
+loff_t ftrace_filter_lseek(struct file *file, loff_t offset, int whence);
 /* totally disable ftrace - can not re-enable after this */
 void ftrace_kill(void);
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 13a54d0bdfa8..34e00fb49bec 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -8,6 +8,7 @@
 #include <linux/perf_event.h>
 struct trace_array;
+struct trace_buffer;
 struct tracer;
 struct dentry;
@@ -38,6 +39,12 @@ const char *ftrace_print_symbols_seq_u64(struct trace_seq *p,
 const char *ftrace_print_hex_seq(struct trace_seq *p,
                                 const unsigned char *buf, int len);
+struct trace_iterator;
+struct trace_event;
+int ftrace_raw_output_prep(struct trace_iterator *iter,
+                           struct trace_event *event);
 /*
 * The trace entry - the most basic unit of tracing. This is what
 * is printed in the end as a single line in the trace output, such as:
@@ -61,6 +68,7 @@ struct trace_entry {
 struct trace_iterator {
        struct trace_array      *tr;
        struct tracer           *trace;
+        struct trace_buffer     *trace_buffer;
        void                    *private;
        int                     cpu_file;
        struct mutex            mutex;
@@ -95,8 +103,6 @@ enum trace_iter_flags {
 };
-struct trace_event;
 typedef enum print_line_t (*trace_print_func)(struct trace_iterator *iter,
                                      int flags, struct trace_event *event);
@@ -128,6 +134,13 @@ enum print_line_t {
 void tracing_generic_entry_update(struct trace_entry *entry,
                                  unsigned long flags,
                                  int pc);
+struct ftrace_event_file;
+struct ring_buffer_event *
+trace_event_buffer_lock_reserve(struct ring_buffer **current_buffer,
+                                struct ftrace_event_file *ftrace_file,
+                                int type, unsigned long len,
+                                unsigned long flags, int pc);
 struct ring_buffer_event *
 trace_current_buffer_lock_reserve(struct ring_buffer **current_buffer,
                                  int type, unsigned long len,
@@ -182,53 +195,49 @@ extern int ftrace_event_reg(struct ftrace_event_call *event,
                            enum trace_reg type, void *data);
 enum {
-        TRACE_EVENT_FL_ENABLED_BIT,
        TRACE_EVENT_FL_FILTERED_BIT,
-        TRACE_EVENT_FL_RECORDED_CMD_BIT,
        TRACE_EVENT_FL_CAP_ANY_BIT,
        TRACE_EVENT_FL_NO_SET_FILTER_BIT,
        TRACE_EVENT_FL_IGNORE_ENABLE_BIT,
+        TRACE_EVENT_FL_WAS_ENABLED_BIT,
 };
+/*
+ * Event flags:
+ *  FILTERED      - The event has a filter attached
+ *  CAP_ANY       - Any user can enable for perf
+ *  NO_SET_FILTER - Set when filter has error and is to be ignored
+ *  IGNORE_ENABLE - For ftrace internal events, do not enable with debugfs file
+ *  WAS_ENABLED   - Set and stays set when an event was ever enabled
+ *                    (used for module unloading, if a module event is enabled,
+ *                     it is best to clear the buffers that used it).
+ */
 enum {
-        TRACE_EVENT_FL_ENABLED          = (1 << TRACE_EVENT_FL_ENABLED_BIT),
        TRACE_EVENT_FL_FILTERED         = (1 << TRACE_EVENT_FL_FILTERED_BIT),
-        TRACE_EVENT_FL_RECORDED_CMD     = (1 << TRACE_EVENT_FL_RECORDED_CMD_BIT),
        TRACE_EVENT_FL_CAP_ANY          = (1 << TRACE_EVENT_FL_CAP_ANY_BIT),
        TRACE_EVENT_FL_NO_SET_FILTER    = (1 << TRACE_EVENT_FL_NO_SET_FILTER_BIT),
        TRACE_EVENT_FL_IGNORE_ENABLE    = (1 << TRACE_EVENT_FL_IGNORE_ENABLE_BIT),
+        TRACE_EVENT_FL_WAS_ENABLED      = (1 << TRACE_EVENT_FL_WAS_ENABLED_BIT),
 };
 struct ftrace_event_call {
        struct list_head        list;
        struct ftrace_event_class *class;
        char                    *name;
-        struct dentry           *dir;
        struct trace_event      event;
        const char              *print_fmt;
        struct event_filter     *filter;
+        struct list_head        *files;
        void                    *mod;
        void                    *data;
        /*
-         * 32 bit flags:
+         *   bit 0:             filter_active
-         *   bit 1:             enabled
+         *   bit 1:             allow trace by non root (cap any)
-         *   bit 2:             filter_active
+         *   bit 2:             failed to apply filter
-         *   bit 3:             enabled cmd record
+         *   bit 3:             ftrace internal event (do not enable)
-         *   bit 4:             allow trace by non root (cap any)
+         *   bit 4:             Event was enabled by module
-         *   bit 5:             failed to apply filter
-         *   bit 6:             ftrace internal event (do not enable)
-         *
-         * Changes to flags must hold the event_mutex.
-         *
-         * Note: Reads of flags do not hold the event_mutex since
-         * they occur in critical sections. But the way flags
-         * is currently used, these changes do no affect the code
-         * except that when a change is made, it may have a slight
-         * delay in propagating the changes to other CPUs due to
-         * caching and such.
         */
-        unsigned int            flags;
+        int                     flags; /* static flags of different events */
 #ifdef CONFIG_PERF_EVENTS
        int                             perf_refcount;
@@ -236,6 +245,56 @@ struct ftrace_event_call {
 #endif
 };
+struct trace_array;
+struct ftrace_subsystem_dir;
+enum {
+        FTRACE_EVENT_FL_ENABLED_BIT,
+        FTRACE_EVENT_FL_RECORDED_CMD_BIT,
+        FTRACE_EVENT_FL_SOFT_MODE_BIT,
+        FTRACE_EVENT_FL_SOFT_DISABLED_BIT,
+};
+/*
+ * Ftrace event file flags:
+ *  ENABLED       - The event is enabled
+ *  RECORDED_CMD  - The comms should be recorded at sched_switch
+ *  SOFT_MODE     - The event is enabled/disabled by SOFT_DISABLED
+ *  SOFT_DISABLED - When set, do not trace the event (even though its
+ *                   tracepoint may be enabled)
+ */
+enum {
+        FTRACE_EVENT_FL_ENABLED         = (1 << FTRACE_EVENT_FL_ENABLED_BIT),
+        FTRACE_EVENT_FL_RECORDED_CMD    = (1 << FTRACE_EVENT_FL_RECORDED_CMD_BIT),
+        FTRACE_EVENT_FL_SOFT_MODE       = (1 << FTRACE_EVENT_FL_SOFT_MODE_BIT),
+        FTRACE_EVENT_FL_SOFT_DISABLED   = (1 << FTRACE_EVENT_FL_SOFT_DISABLED_BIT),
+};
+struct ftrace_event_file {
+        struct list_head                list;
+        struct ftrace_event_call        *event_call;
+        struct dentry                   *dir;
+        struct trace_array              *tr;
+        struct ftrace_subsystem_dir     *system;
+        /*
+         * 32 bit flags:
+         *   bit 0:             enabled
+         *   bit 1:             enabled cmd record
+         *   bit 2:             enable/disable with the soft disable bit
+         *   bit 3:             soft disabled
+         *
+         * Note: The bits must be set atomically to prevent races
+         * from other writers. Reads of flags do not need to be in
+         * sync as they occur in critical sections. But the way flags
+         * is currently used, these changes do not affect the code
+         * except that when a change is made, it may have a slight
+         * delay in propagating the changes to other CPUs due to
+         * caching and such. Which is mostly OK ;-)
+         */
+        unsigned long           flags;
+};
 #define __TRACE_EVENT_FLAGS(name, value)                                \
        static int __init trace_init_flags_##name(void)                 \
        {                                                               \
@@ -274,7 +333,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
 extern int trace_add_event_call(struct ftrace_event_call *call);
 extern void trace_remove_event_call(struct ftrace_event_call *call);
-#define is_signed_type(type)    (((type)(-1)) < (type)0)
+#define is_signed_type(type)    (((type)(-1)) < (type)1)
 int trace_set_clr_event(const char *system, const char *event, int set);
diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h
index dd7c569aacad..661d374aeb2d 100644
--- a/include/linux/genalloc.h
+++ b/include/linux/genalloc.h
@@ -29,6 +29,10 @@
 #ifndef __GENALLOC_H__
 #define __GENALLOC_H__
+struct device;
+struct device_node;
 /**
 * Allocation callback function type definition
 * @map: Pointer to bitmap
@@ -105,4 +109,18 @@ extern unsigned long gen_pool_first_fit(unsigned long *map, unsigned long size,
 extern unsigned long gen_pool_best_fit(unsigned long *map, unsigned long size,
                unsigned long start, unsigned int nr, void *data);
+extern struct gen_pool *devm_gen_pool_create(struct device *dev,
+                int min_alloc_order, int nid);
+extern struct gen_pool *dev_get_gen_pool(struct device *dev);
+#ifdef CONFIG_OF
+extern struct gen_pool *of_get_named_gen_pool(struct device_node *np,
+        const char *propname, int index);
+#else
+static inline struct gen_pool *of_get_named_gen_pool(struct device_node *np,
+        const char *propname, int index)
+{
+        return NULL;
+}
+#endif
 #endif /* __GENALLOC_H__ */
diff --git a/include/linux/hid-debug.h b/include/linux/hid-debug.h
index 53744fa1c8b7..8663f216c563 100644
--- a/include/linux/hid-debug.h
+++ b/include/linux/hid-debug.h
@@ -22,11 +22,12 @@
 *
 */
-#define HID_DEBUG_BUFSIZE 512
 #ifdef CONFIG_DEBUG_FS
+#define HID_DEBUG_BUFSIZE 512
 void hid_dump_input(struct hid_device *, struct hid_usage *, __s32);
+void hid_dump_report(struct hid_device *, int , u8 *, int);
 void hid_dump_device(struct hid_device *, struct seq_file *);
 void hid_dump_field(struct hid_field *, int, struct seq_file *);
 char *hid_resolv_usage(unsigned, struct seq_file *);
@@ -50,6 +51,7 @@ struct hid_debug_list {
 #else
 #define hid_dump_input(a,b,c)           do { } while (0)
+#define hid_dump_report(a,b,c,d)        do { } while (0)
 #define hid_dump_device(a,b)            do { } while (0)
 #define hid_dump_field(a,b,c)           do { } while (0)
 #define hid_resolv_usage(a,b)           do { } while (0)
diff --git a/include/linux/hid.h b/include/linux/hid.h
index e14b465b1146..af1b86d46f6e 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -282,6 +282,7 @@ struct hid_item {
 #define HID_QUIRK_BADPAD                        0x00000020
 #define HID_QUIRK_MULTI_INPUT                   0x00000040
 #define HID_QUIRK_HIDINPUT_FORCE                0x00000080
+#define HID_QUIRK_NO_EMPTY_INPUT                0x00000100
 #define HID_QUIRK_SKIP_OUTPUT_REPORTS           0x00010000
 #define HID_QUIRK_FULLSPEED_INTERVAL            0x10000000
 #define HID_QUIRK_NO_INIT_REPORTS               0x20000000
@@ -456,7 +457,8 @@ struct hid_device {							/* device report descriptor */
        unsigned country;                                               /* HID country */
        struct hid_report_enum report_enum[HID_REPORT_TYPES];
-        struct semaphore driver_lock;                                   /* protects the current driver */
+        struct semaphore driver_lock;                                   /* protects the current driver, except during input */
+        struct semaphore driver_input_lock;                             /* protects the current driver */
        struct device dev;                                              /* device */
        struct hid_driver *driver;
        struct hid_ll_driver *ll_driver;
@@ -477,6 +479,7 @@ struct hid_device {							/* device report descriptor */
        unsigned int status;                                            /* see STAT flags above */
        unsigned claimed;                                               /* Claimed by hidinput, hiddev? */
        unsigned quirks;                                                /* Various quirks the device can pull on us */
+        bool io_started;                                                /* Protected by driver_lock. If IO has started */
        struct list_head inputs;                                        /* The list of inputs */
        void *hiddev;                                                   /* The hiddev structure */
@@ -512,6 +515,7 @@ struct hid_device {							/* device report descriptor */
        struct dentry *debug_rdesc;
        struct dentry *debug_events;
        struct list_head debug_list;
+        struct mutex debug_list_lock;
        wait_queue_head_t debug_wait;
 };
@@ -599,6 +603,10 @@ struct hid_usage_id {
 * @resume: invoked on resume if device was not reset (NULL means nop)
 * @reset_resume: invoked on resume if device was reset (NULL means nop)
 *
+ * probe should return -errno on error, or 0 on success. During probe,
+ * input will not be passed to raw_event unless hid_device_io_start is
+ * called.
+ *
 * raw_event and event should return 0 on no action performed, 1 when no
 * further processing should be done and negative on error
 *
@@ -662,6 +670,9 @@ struct hid_driver {
 * @hidinput_input_event: event input event (e.g. ff or leds)
 * @parse: this method is called only once to parse the device data,
 *         shouldn't allocate anything to not leak memory
+ * @request: send report request to device (e.g. feature report)
+ * @wait: wait for buffered io to complete (send/recv reports)
+ * @idle: send idle request to device
 */
 struct hid_ll_driver {
        int (*start)(struct hid_device *hdev);
@@ -676,6 +687,13 @@ struct hid_ll_driver {
                        unsigned int code, int value);
        int (*parse)(struct hid_device *hdev);
+        void (*request)(struct hid_device *hdev,
+                        struct hid_report *report, int reqtype);
+        int (*wait)(struct hid_device *hdev);
+        int (*idle)(struct hid_device *hdev, int report, int idle, int reqtype);
 };
 #define PM_HINT_FULLON  1<<5
@@ -738,6 +756,44 @@ const struct hid_device_id *hid_match_id(struct hid_device *hdev,
 s32 hid_snto32(__u32 value, unsigned n);
 /**
+ * hid_device_io_start - enable HID input during probe, remove
+ *
+ * @hid - the device
+ *
+ * This should only be called during probe or remove and only be
+ * called by the thread calling probe or remove. It will allow
+ * incoming packets to be delivered to the driver.
+ */
+static inline void hid_device_io_start(struct hid_device *hid) {
+        if (hid->io_started) {
+                dev_warn(&hid->dev, "io already started");
+                return;
+        }
+        hid->io_started = true;
+        up(&hid->driver_input_lock);
+}
+/**
+ * hid_device_io_stop - disable HID input during probe, remove
+ *
+ * @hid - the device
+ *
+ * Should only be called after hid_device_io_start. It will prevent
+ * incoming packets from going to the driver for the duration of
+ * probe, remove. If called during probe, packets will still go to the
+ * driver after probe is complete. This function should only be called
+ * by the thread calling probe or remove.
+ */
+static inline void hid_device_io_stop(struct hid_device *hid) {
+        if (!hid->io_started) {
+                dev_warn(&hid->dev, "io already stopped");
+                return;
+        }
+        hid->io_started = false;
+        down(&hid->driver_input_lock);
+}
+/**
 * hid_map_usage - map usage input bits
 *
 * @hidinput: hidinput which we are interested in
@@ -883,6 +939,49 @@ static inline int hid_hw_power(struct hid_device *hdev, int level)
        return hdev->ll_driver->power ? hdev->ll_driver->power(hdev, level) : 0;
 }
+/**
+ * hid_hw_request - send report request to device
+ *
+ * @hdev: hid device
+ * @report: report to send
+ * @reqtype: hid request type
+ */
+static inline void hid_hw_request(struct hid_device *hdev,
+                                  struct hid_report *report, int reqtype)
+{
+        if (hdev->ll_driver->request)
+                hdev->ll_driver->request(hdev, report, reqtype);
+}
+/**
+ * hid_hw_idle - send idle request to device
+ *
+ * @hdev: hid device
+ * @report: report to control
+ * @idle: idle state
+ * @reqtype: hid request type
+ */
+static inline int hid_hw_idle(struct hid_device *hdev, int report, int idle,
+                int reqtype)
+{
+        if (hdev->ll_driver->idle)
+                return hdev->ll_driver->idle(hdev, report, idle, reqtype);
+        return 0;
+}
+/**
+ * hid_hw_wait - wait for buffered io to complete
+ *
+ * @hdev: hid device
+ */
+static inline void hid_hw_wait(struct hid_device *hdev)
+{
+        if (hdev->ll_driver->wait)
+                hdev->ll_driver->wait(hdev);
+}
 int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,
                int interrupt);
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index cc07d2777bbe..d19a5c2d2270 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -157,6 +157,7 @@ enum  hrtimer_base_type {
        HRTIMER_BASE_MONOTONIC,
        HRTIMER_BASE_REALTIME,
        HRTIMER_BASE_BOOTTIME,
+        HRTIMER_BASE_TAI,
        HRTIMER_MAX_CLOCK_BASES,
 };
@@ -327,7 +328,9 @@ extern ktime_t ktime_get(void);
 extern ktime_t ktime_get_real(void);
 extern ktime_t ktime_get_boottime(void);
 extern ktime_t ktime_get_monotonic_offset(void);
-extern ktime_t ktime_get_update_offsets(ktime_t *offs_real, ktime_t *offs_boot);
+extern ktime_t ktime_get_clocktai(void);
+extern ktime_t ktime_get_update_offsets(ktime_t *offs_real, ktime_t *offs_boot,
+                                         ktime_t *offs_tai);
 DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index ee1c244a62a1..528454c2caa9 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -99,7 +99,11 @@ extern int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
 extern int handle_pte_fault(struct mm_struct *mm,
                            struct vm_area_struct *vma, unsigned long address,
                            pte_t *pte, pmd_t *pmd, unsigned int flags);
-extern int split_huge_page(struct page *page);
+extern int split_huge_page_to_list(struct page *page, struct list_head *list);
+static inline int split_huge_page(struct page *page)
+{
+        return split_huge_page_to_list(page, NULL);
+}
 extern void __split_huge_page_pmd(struct vm_area_struct *vma,
                unsigned long address, pmd_t *pmd);
 #define split_huge_page_pmd(__vma, __address, __pmd)                    \
@@ -186,6 +190,11 @@ extern int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vm
 #define transparent_hugepage_enabled(__vma) 0
 #define transparent_hugepage_flags 0UL
+static inline int
+split_huge_page_to_list(struct page *page, struct list_head *list)
+{
+        return 0;
+}
 static inline int split_huge_page(struct page *page)
 {
        return 0;
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 16e4e9a643fb..3a62df310f2e 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -58,6 +58,7 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma,
 int hugetlb_prefault(struct address_space *, struct vm_area_struct *);
 void hugetlb_report_meminfo(struct seq_file *);
 int hugetlb_report_node_meminfo(int, char *);
+void hugetlb_show_meminfo(void);
 unsigned long hugetlb_total_pages(void);
 int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                        unsigned long address, unsigned int flags);
@@ -114,6 +115,9 @@ static inline void hugetlb_report_meminfo(struct seq_file *m)
 {
 }
 #define hugetlb_report_node_meminfo(n, buf)     0
+static inline void hugetlb_show_meminfo(void)
+{
+}
 #define follow_huge_pmd(mm, addr, pmd, write)   NULL
 #define follow_huge_pud(mm, addr, pud, write)   NULL
 #define prepare_hugepage_range(file, addr, len) (-EINVAL)
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index df77ba9a8166..c2559847d7ee 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -27,6 +27,63 @@
 #include <linux/types.h>
+/*
+ * Implementation of host controlled snapshot of the guest.
+ */
+#define VSS_OP_REGISTER 128
+enum hv_vss_op {
+        VSS_OP_CREATE = 0,
+        VSS_OP_DELETE,
+        VSS_OP_HOT_BACKUP,
+        VSS_OP_GET_DM_INFO,
+        VSS_OP_BU_COMPLETE,
+        /*
+         * Following operations are only supported with IC version >= 5.0
+         */
+        VSS_OP_FREEZE, /* Freeze the file systems in the VM */
+        VSS_OP_THAW, /* Unfreeze the file systems */
+        VSS_OP_AUTO_RECOVER,
+        VSS_OP_COUNT /* Number of operations, must be last */
+};
+/*
+ * Header for all VSS messages.
+ */
+struct hv_vss_hdr {
+        __u8 operation;
+        __u8 reserved[7];
+} __attribute__((packed));
+/*
+ * Flag values for the hv_vss_check_feature. Linux supports only
+ * one value.
+ */
+#define VSS_HBU_NO_AUTO_RECOVERY        0x00000005
+struct hv_vss_check_feature {
+        __u32 flags;
+} __attribute__((packed));
+struct hv_vss_check_dm_info {
+        __u32 flags;
+} __attribute__((packed));
+struct hv_vss_msg {
+        union {
+                struct hv_vss_hdr vss_hdr;
+                int error;
+        };
+        union {
+                struct hv_vss_check_feature vss_cf;
+                struct hv_vss_check_dm_info dm_info;
+        };
+} __attribute__((packed));
 /*
 * An implementation of HyperV key value pair (KVP) functionality for Linux.
 *
@@ -1253,6 +1310,25 @@ void vmbus_driver_unregister(struct hv_driver *hv_driver);
                }
 /*
+ * VSS (Backup/Restore) GUID
+ */
+#define HV_VSS_GUID \
+        .guid = { \
+                        0x29, 0x2e, 0xfa, 0x35, 0x23, 0xea, 0x36, 0x42, \
+                        0x96, 0xae, 0x3a, 0x6e, 0xba, 0xcb, 0xa4,  0x40 \
+                }
+/*
+ * Synthetic Video GUID
+ * {DA0A7802-E377-4aac-8E77-0558EB1073F8}
+ */
+#define HV_SYNTHVID_GUID \
+        .guid = { \
+                        0x02, 0x78, 0x0a, 0xda, 0x77, 0xe3, 0xac, 0x4a, \
+                        0x8e, 0x77, 0x05, 0x58, 0xeb, 0x10, 0x73, 0xf8 \
+                }
+/*
 * Common header for Hyper-V ICs
 */
@@ -1356,6 +1432,10 @@ int hv_kvp_init(struct hv_util_service *);
 void hv_kvp_deinit(void);
 void hv_kvp_onchannelcallback(void *);
+int hv_vss_init(struct hv_util_service *);
+void hv_vss_deinit(void);
+void hv_vss_onchannelcallback(void *);
 /*
 * Negotiated version with the Host.
 */
diff --git a/include/linux/idr.h b/include/linux/idr.h
index 2640c7e99e51..a470ac3ef49d 100644
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -42,6 +42,7 @@ struct idr {
        struct idr_layer        *id_free;
        int                     layers; /* only valid w/o concurrent changes */
        int                     id_free_cnt;
+        int                     cur;    /* current pos for cyclic allocation */
        spinlock_t              lock;
 };
@@ -75,6 +76,7 @@ struct idr {
 void *idr_find_slowpath(struct idr *idp, int id);
 void idr_preload(gfp_t gfp_mask);
 int idr_alloc(struct idr *idp, void *ptr, int start, int end, gfp_t gfp_mask);
+int idr_alloc_cyclic(struct idr *idr, void *ptr, int start, int end, gfp_t gfp_mask);
 int idr_for_each(struct idr *idp,
                 int (*fn)(int id, void *p, void *data), void *data);
 void *idr_get_next(struct idr *idp, int *nextid);
diff --git a/include/linux/iio/adc/ad_sigma_delta.h b/include/linux/iio/adc/ad_sigma_delta.h
index 2e4eab9868a3..e7fdec4db9da 100644
--- a/include/linux/iio/adc/ad_sigma_delta.h
+++ b/include/linux/iio/adc/ad_sigma_delta.h
@@ -133,9 +133,9 @@ int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig);
                .channel2 = (_channel2), \
                .address = (_address), \
                .extend_name = (_extend_name), \
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-                        IIO_CHAN_INFO_SCALE_SHARED_BIT | \
+                        BIT(IIO_CHAN_INFO_OFFSET), \
-                        IIO_CHAN_INFO_OFFSET_SEPARATE_BIT, \
+                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
                .scan_index = (_si), \
                .scan_type = { \
                        .sign = 'u', \
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index 8bd12be0b02f..172c5b23cb84 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -15,6 +15,7 @@
 #include <linux/spi/spi.h>
 #include <linux/irqreturn.h>
 #include <linux/iio/trigger.h>
+#include <linux/bitops.h>
 #define ST_SENSORS_TX_MAX_LENGTH                2
 #define ST_SENSORS_RX_MAX_LENGTH                6
@@ -45,8 +46,8 @@
 { \
        .type = device_type, \
        .modified = 1, \
-        .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-                        IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \
+                        BIT(IIO_CHAN_INFO_SCALE), \
        .scan_index = index, \
        .channel2 = mod, \
        .address = addr, \
diff --git a/include/linux/iio/gyro/itg3200.h b/include/linux/iio/gyro/itg3200.h
index c53f16914b77..2a820850f284 100644
--- a/include/linux/iio/gyro/itg3200.h
+++ b/include/linux/iio/gyro/itg3200.h
@@ -149,6 +149,6 @@ static inline void itg3200_buffer_unconfigure(struct iio_dev *indio_dev)
 {
 }
-#endif  /* CONFIG_IIO_RING_BUFFER */
+#endif  /* CONFIG_IIO_BUFFER */
 #endif /* ITG3200_H_ */
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index da8c776ba0bd..8d171f427632 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -38,76 +38,6 @@ enum iio_chan_info_enum {
        IIO_CHAN_INFO_HYSTERESIS,
 };
-#define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2)
-#define IIO_CHAN_INFO_SEPARATE_BIT(type) BIT(type*2 + 1)
-#define IIO_CHAN_INFO_BITS(type) (IIO_CHAN_INFO_SHARED_BIT(type) | \
-                                    IIO_CHAN_INFO_SEPARATE_BIT(type))
-#define IIO_CHAN_INFO_RAW_SEPARATE_BIT                  \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_RAW)
-#define IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT                    \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PROCESSED)
-#define IIO_CHAN_INFO_SCALE_SEPARATE_BIT                \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_SCALE)
-#define IIO_CHAN_INFO_SCALE_SHARED_BIT                  \
-        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_SCALE)
-#define IIO_CHAN_INFO_OFFSET_SEPARATE_BIT                       \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_OFFSET)
-#define IIO_CHAN_INFO_OFFSET_SHARED_BIT                 \
-        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_OFFSET)
-#define IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT                   \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_CALIBSCALE)
-#define IIO_CHAN_INFO_CALIBSCALE_SHARED_BIT                     \
-        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_CALIBSCALE)
-#define IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT                    \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_CALIBBIAS)
-#define IIO_CHAN_INFO_CALIBBIAS_SHARED_BIT                      \
-        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_CALIBBIAS)
-#define IIO_CHAN_INFO_PEAK_SEPARATE_BIT                 \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PEAK)
-#define IIO_CHAN_INFO_PEAK_SHARED_BIT                   \
-        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PEAK)
-#define IIO_CHAN_INFO_PEAKSCALE_SEPARATE_BIT                    \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PEAKSCALE)
-#define IIO_CHAN_INFO_PEAKSCALE_SHARED_BIT                      \
-        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PEAKSCALE)
-#define IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE_BIT    \
-        IIO_CHAN_INFO_SEPARATE_BIT(                             \
-                IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW)
-#define IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED_BIT      \
-        IIO_CHAN_INFO_SHARED_BIT(                               \
-                IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW)
-#define IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT                  \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_AVERAGE_RAW)
-#define IIO_CHAN_INFO_AVERAGE_RAW_SHARED_BIT                    \
-        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_AVERAGE_RAW)
-#define IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT \
-        IIO_CHAN_INFO_SHARED_BIT(                              \
-                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY)
-#define IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SEPARATE_BIT \
-        IIO_CHAN_INFO_SEPARATE_BIT(                            \
-                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY)
-#define IIO_CHAN_INFO_SAMP_FREQ_SEPARATE_BIT            \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_SAMP_FREQ)
-#define IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT                      \
-        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_SAMP_FREQ)
-#define IIO_CHAN_INFO_FREQUENCY_SEPARATE_BIT                    \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_FREQUENCY)
-#define IIO_CHAN_INFO_FREQUENCY_SHARED_BIT                      \
-        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_FREQUENCY)
-#define IIO_CHAN_INFO_PHASE_SEPARATE_BIT                        \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PHASE)
-#define IIO_CHAN_INFO_PHASE_SHARED_BIT                  \
-        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PHASE)
-#define IIO_CHAN_INFO_HARDWAREGAIN_SEPARATE_BIT                 \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_HARDWAREGAIN)
-#define IIO_CHAN_INFO_HARDWAREGAIN_SHARED_BIT                   \
-        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_HARDWAREGAIN)
-#define IIO_CHAN_INFO_HYSTERESIS_SEPARATE_BIT                   \
-        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_HYSTERESIS)
-#define IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT                     \
-        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_HYSTERESIS)
 enum iio_endian {
        IIO_CPU,
        IIO_BE,
@@ -218,6 +148,10 @@ ssize_t iio_enum_write(struct iio_dev *indio_dev,
 *                      endianness:     little or big endian
 * @info_mask:          What information is to be exported about this channel.
 *                      This includes calibbias, scale etc.
+ * @info_mask_separate: What information is to be exported that is specific to
+ *                      this channel.
+ * @info_mask_shared_by_type: What information is to be exported that is shared
+*                       by all channels of the same type.
 * @event_mask:         What events can this channel produce.
 * @ext_info:           Array of extended info attributes for this channel.
 *                      The array is NULL terminated, the last element should
@@ -253,6 +187,8 @@ struct iio_chan_spec {
                enum iio_endian endianness;
        } scan_type;
        long                    info_mask;
+        long                    info_mask_separate;
+        long                    info_mask_shared_by_type;
        long                    event_mask;
        const struct iio_chan_spec_ext_info *ext_info;
        const char              *extend_name;
@@ -275,7 +211,8 @@ struct iio_chan_spec {
 static inline bool iio_channel_has_info(const struct iio_chan_spec *chan,
        enum iio_chan_info_enum type)
 {
-        return chan->info_mask & IIO_CHAN_INFO_BITS(type);
+        return (chan->info_mask_separate & type) |
+               (chan->info_mask_shared_by_type & type);
 }
 #define IIO_ST(si, rb, sb, sh)                                          \
diff --git a/include/linux/iio/imu/adis.h b/include/linux/iio/imu/adis.h
index ff781dca2e9a..b665dc7f017b 100644
--- a/include/linux/iio/imu/adis.h
+++ b/include/linux/iio/imu/adis.h
@@ -162,8 +162,8 @@ int adis_single_conversion(struct iio_dev *indio_dev,
        .indexed = 1, \
        .channel = (chan), \
        .extend_name = name, \
-        .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \
+                BIT(IIO_CHAN_INFO_SCALE), \
        .address = (addr), \
        .scan_index = (si), \
        .scan_type = { \
@@ -184,9 +184,9 @@ int adis_single_conversion(struct iio_dev *indio_dev,
        .type = IIO_TEMP, \
        .indexed = 1, \
        .channel = 0, \
-        .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-                IIO_CHAN_INFO_SCALE_SEPARATE_BIT | \
+                BIT(IIO_CHAN_INFO_SCALE) | \
-                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT, \
+                BIT(IIO_CHAN_INFO_OFFSET), \
        .address = (addr), \
        .scan_index = (si), \
        .scan_type = { \
@@ -197,13 +197,13 @@ int adis_single_conversion(struct iio_dev *indio_dev,
        }, \
 }
-#define ADIS_MOD_CHAN(_type, mod, addr, si, info, bits) { \
+#define ADIS_MOD_CHAN(_type, mod, addr, si, info_sep, bits) { \
        .type = (_type), \
        .modified = 1, \
        .channel2 = IIO_MOD_ ## mod, \
-        .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-                 IIO_CHAN_INFO_SCALE_SHARED_BIT | \
+                 info_sep, \
-                 info, \
+        .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
        .address = (addr), \
        .scan_index = (si), \
        .scan_type = { \
@@ -214,17 +214,17 @@ int adis_single_conversion(struct iio_dev *indio_dev,
        }, \
 }
-#define ADIS_ACCEL_CHAN(mod, addr, si, info, bits) \
+#define ADIS_ACCEL_CHAN(mod, addr, si, info_sep, bits) \
-        ADIS_MOD_CHAN(IIO_ACCEL, mod, addr, si, info, bits)
+        ADIS_MOD_CHAN(IIO_ACCEL, mod, addr, si, info_sep, bits)
-#define ADIS_GYRO_CHAN(mod, addr, si, info, bits) \
+#define ADIS_GYRO_CHAN(mod, addr, si, info_sep, bits) \
-        ADIS_MOD_CHAN(IIO_ANGL_VEL, mod, addr, si, info, bits)
+        ADIS_MOD_CHAN(IIO_ANGL_VEL, mod, addr, si, info_sep, bits)
-#define ADIS_INCLI_CHAN(mod, addr, si, info, bits) \
+#define ADIS_INCLI_CHAN(mod, addr, si, info_sep, bits) \
-        ADIS_MOD_CHAN(IIO_INCLI, mod, addr, si, info, bits)
+        ADIS_MOD_CHAN(IIO_INCLI, mod, addr, si, info_sep, bits)
-#define ADIS_ROT_CHAN(mod, addr, si, info, bits) \
+#define ADIS_ROT_CHAN(mod, addr, si, info_sep, bits) \
-        ADIS_MOD_CHAN(IIO_ROT, mod, addr, si, info, bits)
+        ADIS_MOD_CHAN(IIO_ROT, mod, addr, si, info_sep, bits)
 #ifdef CONFIG_IIO_ADIS_LIB_BUFFER
diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
index c66e0a96f6e8..3869c525b052 100644
--- a/include/linux/iio/trigger.h
+++ b/include/linux/iio/trigger.h
@@ -44,7 +44,6 @@ struct iio_trigger_ops {
 * @id:                 [INTERN] unique id number
 * @name:               [DRIVER] unique name
 * @dev:                [DRIVER] associated device (if relevant)
- * @private_data:       [DRIVER] device specific data
 * @list:               [INTERN] used in maintenance of global trigger list
 * @alloc_list:         [DRIVER] used for driver specific trigger list
 * @use_count:          use count for the trigger
@@ -60,7 +59,6 @@ struct iio_trigger {
        const char                      *name;
        struct device                   dev;
-        void                            *private_data;
        struct list_head                list;
        struct list_head                alloc_list;
        int use_count;
@@ -92,6 +90,30 @@ static inline void iio_trigger_get(struct iio_trigger *trig)
 }
 /**
+ * iio_device_set_drvdata() - Set trigger driver data
+ * @trig: IIO trigger structure
+ * @data: Driver specific data
+ *
+ * Allows to attach an arbitrary pointer to an IIO trigger, which can later be
+ * retrieved by iio_trigger_get_drvdata().
+ */
+static inline void iio_trigger_set_drvdata(struct iio_trigger *trig, void *data)
+{
+        dev_set_drvdata(&trig->dev, data);
+}
+/**
+ * iio_trigger_get_drvdata() - Get trigger driver data
+ * @trig: IIO trigger structure
+ *
+ * Returns the data previously set with iio_trigger_set_drvdata()
+ */
+static inline void *iio_trigger_get_drvdata(struct iio_trigger *trig)
+{
+        return dev_get_drvdata(&trig->dev);
+}
+/**
 * iio_trigger_register() - register a trigger with the IIO core
 * @trig_info:  trigger to be registered
 **/
diff --git a/include/linux/ima.h b/include/linux/ima.h
index 86c361e947b9..1b7f268cddce 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -46,7 +46,7 @@ static inline int ima_module_check(struct file *file)
        return 0;
 }
-#endif /* CONFIG_IMA_H */
+#endif /* CONFIG_IMA */
 #ifdef CONFIG_IMA_APPRAISE
 extern void ima_inode_post_setattr(struct dentry *dentry);
@@ -72,5 +72,5 @@ static inline int ima_inode_removexattr(struct dentry *dentry,
 {
        return 0;
 }
-#endif /* CONFIG_IMA_APPRAISE_H */
+#endif /* CONFIG_IMA_APPRAISE */
 #endif /* _LINUX_IMA_H */
diff --git a/include/linux/integrity.h b/include/linux/integrity.h
index 66c5fe9550a5..83222cebd47b 100644
--- a/include/linux/integrity.h
+++ b/include/linux/integrity.h
@@ -36,5 +36,5 @@ static inline void integrity_inode_free(struct inode *inode)
 {
        return;
 }
-#endif /* CONFIG_INTEGRITY_H */
+#endif /* CONFIG_INTEGRITY */
 #endif /* _LINUX_INTEGRITY_H */
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 85ac9b9b72a2..89b7c24a36e9 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -192,6 +192,10 @@ extern struct resource * __request_region(struct resource *,
 extern int __check_region(struct resource *, resource_size_t, resource_size_t);
 extern void __release_region(struct resource *, resource_size_t,
                                resource_size_t);
+#ifdef CONFIG_MEMORY_HOTREMOVE
+extern int release_mem_region_adjustable(struct resource *, resource_size_t,
+                                resource_size_t);
+#endif
 static inline int __deprecated check_region(resource_size_t s,
                                                resource_size_t n)
diff --git a/include/linux/ipack.h b/include/linux/ipack.h
index fea12cbb2aeb..1888e06ddf64 100644
--- a/include/linux/ipack.h
+++ b/include/linux/ipack.h
@@ -207,19 +207,41 @@ int ipack_driver_register(struct ipack_driver *edrv, struct module *owner,
 void ipack_driver_unregister(struct ipack_driver *edrv);
 /**
- *      ipack_device_register -- register an IPack device with the kernel
+ *      ipack_device_init -- initialize an IPack device
- *      @dev: the new device to register.
+ * @dev: the new device to initialize.
 *
- *      Register a new IPack device ("module" in IndustryPack jargon). The call
+ * Initialize a new IPack device ("module" in IndustryPack jargon). The call
- *      is done by the carrier driver.  The carrier should populate the fields
+ * is done by the carrier driver.  The carrier should populate the fields
- *      bus and slot as well as the region array of @dev prior to calling this
+ * bus and slot as well as the region array of @dev prior to calling this
- *      function.  The rest of the fields will be allocated and populated
+ * function.  The rest of the fields will be allocated and populated
- *      during registration.
+ * during initalization.
 *
- *      Return zero on success or error code on failure.
+ * Return zero on success or error code on failure.
+ *
+ * NOTE: _Never_ directly free @dev after calling this function, even
+ * if it returned an error! Always use ipack_put_device() to give up the
+ * reference initialized in this function instead.
+ */
+int ipack_device_init(struct ipack_device *dev);
+/**
+ *      ipack_device_add -- Add an IPack device
+ * @dev: the new device to add.
+ *
+ * Add a new IPack device. The call is done by the carrier driver
+ * after calling ipack_device_init().
+ *
+ * Return zero on success or error code on failure.
+ *
+ * NOTE: _Never_ directly free @dev after calling this function, even
+ * if it returned an error! Always use ipack_put_device() to give up the
+ * reference initialized in this function instead.
 */
-int ipack_device_register(struct ipack_device *dev);
+int ipack_device_add(struct ipack_device *dev);
-void ipack_device_unregister(struct ipack_device *dev);
+void ipack_device_del(struct ipack_device *dev);
+void ipack_get_device(struct ipack_device *dev);
+void ipack_put_device(struct ipack_device *dev);
 /**
 * DEFINE_IPACK_DEVICE_TABLE - macro used to describe a IndustryPack table
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index ae221a7b5092..c4d870b0d5e6 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -43,8 +43,8 @@ struct ipc_namespace {
        size_t          shm_ctlmax;
        size_t          shm_ctlall;
+        unsigned long   shm_tot;
        int             shm_ctlmni;
-        int             shm_tot;
        /*
         * Defines whether IPC_RMID is forced for _all_ shm segments regardless
         * of shmctl()
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 50e5a5e6a712..6e051f472edb 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -480,6 +480,7 @@ struct transaction_s
                T_COMMIT,
                T_COMMIT_DFLUSH,
                T_COMMIT_JFLUSH,
+                T_COMMIT_CALLBACK,
                T_FINISHED
        }                       t_state;
@@ -1144,7 +1145,7 @@ extern struct kmem_cache *jbd2_handle_cache;
 static inline handle_t *jbd2_alloc_handle(gfp_t gfp_flags)
 {
-        return kmem_cache_alloc(jbd2_handle_cache, gfp_flags);
+        return kmem_cache_zalloc(jbd2_handle_cache, gfp_flags);
 }
 static inline void jbd2_free_handle(handle_t *handle)
@@ -1200,6 +1201,7 @@ int __jbd2_log_start_commit(journal_t *journal, tid_t tid);
 int jbd2_journal_start_commit(journal_t *journal, tid_t *tid);
 int jbd2_journal_force_commit_nested(journal_t *journal);
 int jbd2_log_wait_commit(journal_t *journal, tid_t tid);
+int jbd2_complete_transaction(journal_t *journal, tid_t tid);
 int jbd2_log_do_checkpoint(journal_t *journal);
 int jbd2_trans_will_send_data_barrier(journal_t *journal, tid_t tid);
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index 82ed068b1ebe..8fb8edf12417 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -75,7 +75,6 @@ extern int register_refined_jiffies(long clock_tick_rate);
 */
 extern u64 __jiffy_data jiffies_64;
 extern unsigned long volatile __jiffy_data jiffies;
-extern seqlock_t jiffies_lock;
 #if (BITS_PER_LONG < 64)
 u64 get_jiffies_64(void);
diff --git a/include/linux/journal-head.h b/include/linux/journal-head.h
index c18b46f8aeeb..13a3da25ff07 100644
--- a/include/linux/journal-head.h
+++ b/include/linux/journal-head.h
@@ -31,21 +31,14 @@ struct journal_head {
        /*
         * Journalling list for this buffer [jbd_lock_bh_state()]
         */
-        unsigned b_jlist;
+        unsigned b_jlist:4;
        /*
         * This flag signals the buffer has been modified by
         * the currently running transaction
         * [jbd_lock_bh_state()]
         */
-        unsigned b_modified;
+        unsigned b_modified:1;
-        /*
-         * This feild tracks the last transaction id in which this buffer
-         * has been cowed
-         * [jbd_lock_bh_state()]
-         */
-        tid_t b_cow_tid;
        /*
         * Copy of the buffer data frozen for writing to the log.
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 79fdd80a42d4..6d1844f393c0 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -486,6 +486,8 @@ enum ftrace_dump_mode {
 void tracing_on(void);
 void tracing_off(void);
 int tracing_is_on(void);
+void tracing_snapshot(void);
+void tracing_snapshot_alloc(void);
 extern void tracing_start(void);
 extern void tracing_stop(void);
@@ -515,10 +517,32 @@ do {									\
 *
 * This is intended as a debugging tool for the developer only.
 * Please refrain from leaving trace_printks scattered around in
- * your code.
+ * your code. (Extra memory is used for special buffers that are
+ * allocated when trace_printk() is used)
+ *
+ * A little optization trick is done here. If there's only one
+ * argument, there's no need to scan the string for printf formats.
+ * The trace_puts() will suffice. But how can we take advantage of
+ * using trace_puts() when trace_printk() has only one argument?
+ * By stringifying the args and checking the size we can tell
+ * whether or not there are args. __stringify((__VA_ARGS__)) will
+ * turn into "()\0" with a size of 3 when there are no args, anything
+ * else will be bigger. All we need to do is define a string to this,
+ * and then take its size and compare to 3. If it's bigger, use
+ * do_trace_printk() otherwise, optimize it to trace_puts(). Then just
+ * let gcc optimize the rest.
 */
-#define trace_printk(fmt, args...)                                      \
+#define trace_printk(fmt, ...)                          \
+do {                                                    \
+        char _______STR[] = __stringify((__VA_ARGS__)); \
+        if (sizeof(_______STR) > 3)                     \
+                do_trace_printk(fmt, ##__VA_ARGS__);    \
+        else                                            \
+                trace_puts(fmt);                        \
+} while (0)
+#define do_trace_printk(fmt, args...)                                   \
 do {                                                                    \
        static const char *trace_printk_fmt                             \
                __attribute__((section("__trace_printk_fmt"))) =        \
@@ -538,7 +562,45 @@ int __trace_bprintk(unsigned long ip, const char *fmt, ...);
 extern __printf(2, 3)
 int __trace_printk(unsigned long ip, const char *fmt, ...);
-extern void trace_dump_stack(void);
+/**
+ * trace_puts - write a string into the ftrace buffer
+ * @str: the string to record
+ *
+ * Note: __trace_bputs is an internal function for trace_puts and
+ *       the @ip is passed in via the trace_puts macro.
+ *
+ * This is similar to trace_printk() but is made for those really fast
+ * paths that a developer wants the least amount of "Heisenbug" affects,
+ * where the processing of the print format is still too much.
+ *
+ * This function allows a kernel developer to debug fast path sections
+ * that printk is not appropriate for. By scattering in various
+ * printk like tracing in the code, a developer can quickly see
+ * where problems are occurring.
+ *
+ * This is intended as a debugging tool for the developer only.
+ * Please refrain from leaving trace_puts scattered around in
+ * your code. (Extra memory is used for special buffers that are
+ * allocated when trace_puts() is used)
+ *
+ * Returns: 0 if nothing was written, positive # if string was.
+ *  (1 when __trace_bputs is used, strlen(str) when __trace_puts is used)
+ */
+extern int __trace_bputs(unsigned long ip, const char *str);
+extern int __trace_puts(unsigned long ip, const char *str, int size);
+#define trace_puts(str) ({                                              \
+        static const char *trace_printk_fmt                             \
+                __attribute__((section("__trace_printk_fmt"))) =        \
+                __builtin_constant_p(str) ? str : NULL;                 \
+                                                                        \
+        if (__builtin_constant_p(str))                                  \
+                __trace_bputs(_THIS_IP_, trace_printk_fmt);             \
+        else                                                            \
+                __trace_puts(_THIS_IP_, str, strlen(str));              \
+})
+extern void trace_dump_stack(int skip);
 /*
 * The double __builtin_constant_p is because gcc will give us an error
@@ -573,6 +635,8 @@ static inline void trace_dump_stack(void) { }
 static inline void tracing_on(void) { }
 static inline void tracing_off(void) { }
 static inline int tracing_is_on(void) { return 0; }
+static inline void tracing_snapshot(void) { }
+static inline void tracing_snapshot_alloc(void) { }
 static inline __printf(1, 2)
 int trace_printk(const char *fmt, ...)
@@ -734,6 +798,4 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
 # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
 #endif
-extern int do_sysinfo(struct sysinfo *info);
 #endif
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index d2e6927bbaae..d78d28a733b1 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -200,6 +200,8 @@ extern size_t vmcoreinfo_max_size;
 int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
                unsigned long long *crash_size, unsigned long long *crash_base);
+int parse_crashkernel_high(char *cmdline, unsigned long long system_ram,
+                unsigned long long *crash_size, unsigned long long *crash_base);
 int parse_crashkernel_low(char *cmdline, unsigned long long system_ram,
                unsigned long long *crash_size, unsigned long long *crash_base);
 int crash_shrink_memory(unsigned long new_size);
diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 5398d5807075..0555cc66a15b 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -67,16 +67,15 @@ struct subprocess_info {
 };
 extern int
-call_usermodehelper_fns(char *path, char **argv, char **envp, int wait,
+call_usermodehelper(char *path, char **argv, char **envp, int wait);
-                        int (*init)(struct subprocess_info *info, struct cred *new),
-                        void (*cleanup)(struct subprocess_info *), void *data);
-static inline int
+extern struct subprocess_info *
-call_usermodehelper(char *path, char **argv, char **envp, int wait)
+call_usermodehelper_setup(char *path, char **argv, char **envp, gfp_t gfp_mask,
-{
+                          int (*init)(struct subprocess_info *info, struct cred *new),
-        return call_usermodehelper_fns(path, argv, envp, wait,
+                          void (*cleanup)(struct subprocess_info *), void *data);
-                                       NULL, NULL, NULL);
-}
+extern int
+call_usermodehelper_exec(struct subprocess_info *info, int wait);
 extern struct ctl_table usermodehelper_table[];
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 4b6ef4d33cc2..ca1d27a0d6a6 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -29,6 +29,7 @@
 *              <jkenisto@us.ibm.com>  and Prasanna S Panchamukhi
 *              <prasanna@in.ibm.com> added function-return probes.
 */
+#include <linux/compiler.h>     /* for __kprobes */
 #include <linux/linkage.h>
 #include <linux/list.h>
 #include <linux/notifier.h>
@@ -49,16 +50,11 @@
 #define KPROBE_REENTER          0x00000004
 #define KPROBE_HIT_SSDONE       0x00000008
-/* Attach to insert probes on any functions which should be ignored*/
-#define __kprobes       __attribute__((__section__(".kprobes.text")))
 #else /* CONFIG_KPROBES */
 typedef int kprobe_opcode_t;
 struct arch_specific_insn {
        int dummy;
 };
-#define __kprobes
 #endif /* CONFIG_KPROBES */
 struct kprobe;
diff --git a/include/linux/kthread.h b/include/linux/kthread.h
index 8d816646f766..7dcef3317689 100644
--- a/include/linux/kthread.h
+++ b/include/linux/kthread.h
@@ -43,6 +43,7 @@ bool kthread_should_stop(void);
 bool kthread_should_park(void);
 bool kthread_freezable_should_stop(bool *was_frozen);
 void *kthread_data(struct task_struct *k);
+void *probe_kthread_data(struct task_struct *k);
 int kthread_park(struct task_struct *k);
 void kthread_unpark(struct task_struct *k);
 void kthread_parkme(void);
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index cad77fe09d77..c13958251927 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -518,7 +518,7 @@ int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data,
 int kvm_write_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
                           void *data, unsigned long len);
 int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
-                              gpa_t gpa);
+                              gpa_t gpa, unsigned long len);
 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len);
 int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len);
 struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);
diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h
index fa7cc7244cbd..b0bcce0ddc95 100644
--- a/include/linux/kvm_types.h
+++ b/include/linux/kvm_types.h
@@ -71,6 +71,7 @@ struct gfn_to_hva_cache {
        u64 generation;
        gpa_t gpa;
        unsigned long hva;
+        unsigned long len;
        struct kvm_memory_slot *memslot;
 };
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 91c9d109e5f1..eae7a053dc51 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -398,6 +398,7 @@ enum {
        ATA_HORKAGE_NOSETXFER   = (1 << 14),    /* skip SETXFER, SATA only */
        ATA_HORKAGE_BROKEN_FPDMA_AA     = (1 << 15),    /* skip AA */
        ATA_HORKAGE_DUMP_ID     = (1 << 16),    /* dump IDENTIFY data */
+        ATA_HORKAGE_MAX_SEC_LBA48 = (1 << 17),  /* Set max sects to 65535 */
         /* DMA mask for user DMA control: User visible values; DO NOT
            renumber */
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 807f1e533226..829d66c67fc2 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -2,6 +2,7 @@
 #define _LINUX_LINKAGE_H
 #include <linux/compiler.h>
+#include <linux/stringify.h>
 #include <asm/linkage.h>
 #ifdef __cplusplus
@@ -14,6 +15,26 @@
 #define asmlinkage CPP_ASMLINKAGE
 #endif
+#ifndef SYMBOL_NAME
+#ifdef CONFIG_SYMBOL_PREFIX
+#define SYMBOL_NAME(x) CONFIG_SYMBOL_PREFIX ## x
+#else
+#define SYMBOL_NAME(x) x
+#endif
+#endif
+#define __SYMBOL_NAME(x) __stringify(SYMBOL_NAME(x))
+#ifndef cond_syscall
+#define cond_syscall(x) asm(".weak\t" __SYMBOL_NAME(x) \
+        "\n\t.set\t" __SYMBOL_NAME(x) "," __SYMBOL_NAME(sys_ni_syscall));
+#endif
+#ifndef SYSCALL_ALIAS
+#define SYSCALL_ALIAS(alias, name)                              \
+        asm ("\t.globl " __SYMBOL_NAME(alias)                   \
+        "\n\t.set\t" __SYMBOL_NAME(alias) "," __SYMBOL_NAME(name))
+#endif
 #define __page_aligned_data     __section(.data..page_aligned) __aligned(PAGE_SIZE)
 #define __page_aligned_bss      __section(.bss..page_aligned) __aligned(PAGE_SIZE)
diff --git a/include/linux/list_bl.h b/include/linux/list_bl.h
index 31f9d75adc5b..2eb88556c5c5 100644
--- a/include/linux/list_bl.h
+++ b/include/linux/list_bl.h
@@ -125,6 +125,11 @@ static inline void hlist_bl_unlock(struct hlist_bl_head *b)
        __bit_spin_unlock(0, (unsigned long *)b);
 }
+static inline bool hlist_bl_is_locked(struct hlist_bl_head *b)
+{
+        return bit_spin_is_locked(0, (unsigned long *)b);
+}
 /**
 * hlist_bl_for_each_entry      - iterate over list of given type
 * @tpos:       the type * to use as a loop cursor.
diff --git a/include/linux/math64.h b/include/linux/math64.h
index b8ba85544721..931a619407bf 100644
--- a/include/linux/math64.h
+++ b/include/linux/math64.h
@@ -30,6 +30,15 @@ static inline s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
 }
 /**
+ * div64_u64_rem - unsigned 64bit divide with 64bit divisor
+ */
+static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
+{
+        *remainder = dividend % divisor;
+        return dividend / divisor;
+}
+/**
 * div64_u64 - unsigned 64bit divide with 64bit divisor
 */
 static inline u64 div64_u64(u64 dividend, u64 divisor)
@@ -61,8 +70,16 @@ static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
 extern s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder);
 #endif
+#ifndef div64_u64_rem
+extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
+#endif
 #ifndef div64_u64
-extern u64 div64_u64(u64 dividend, u64 divisor);
+static inline u64 div64_u64(u64 dividend, u64 divisor)
+{
+        u64 remainder;
+        return div64_u64_rem(dividend, divisor, &remainder);
+}
 #endif
 #ifndef div64_s64
diff --git a/include/linux/mei_cl_bus.h b/include/linux/mei_cl_bus.h
new file mode 100644
index 000000000000..d14af7b722ef
--- /dev/null
+++ b/include/linux/mei_cl_bus.h
@@ -0,0 +1,44 @@
+#ifndef _LINUX_MEI_CL_BUS_H
+#define _LINUX_MEI_CL_BUS_H
+#include <linux/device.h>
+#include <linux/uuid.h>
+struct mei_cl_device;
+struct mei_cl_driver {
+        struct device_driver driver;
+        const char *name;
+        const struct mei_cl_device_id *id_table;
+        int (*probe)(struct mei_cl_device *dev,
+                     const struct mei_cl_device_id *id);
+        int (*remove)(struct mei_cl_device *dev);
+};
+int __mei_cl_driver_register(struct mei_cl_driver *driver,
+                                struct module *owner);
+#define mei_cl_driver_register(driver)             \
+        __mei_cl_driver_register(driver, THIS_MODULE)
+void mei_cl_driver_unregister(struct mei_cl_driver *driver);
+int mei_cl_send(struct mei_cl_device *device, u8 *buf, size_t length);
+int mei_cl_recv(struct mei_cl_device *device, u8 *buf, size_t length);
+typedef void (*mei_cl_event_cb_t)(struct mei_cl_device *device,
+                               u32 events, void *context);
+int mei_cl_register_event_cb(struct mei_cl_device *device,
+                          mei_cl_event_cb_t read_cb, void *context);
+#define MEI_CL_EVENT_RX 0
+#define MEI_CL_EVENT_TX 1
+void *mei_cl_get_drvdata(const struct mei_cl_device *device);
+void mei_cl_set_drvdata(struct mei_cl_device *device, void *data);
+int mei_cl_enable_device(struct mei_cl_device *device);
+int mei_cl_disable_device(struct mei_cl_device *device);
+#endif /* _LINUX_MEI_CL_BUS_H */
diff --git a/include/linux/memory.h b/include/linux/memory.h
index 45e93b468878..85c31a8e2904 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -18,6 +18,7 @@
 #include <linux/node.h>
 #include <linux/compiler.h>
 #include <linux/mutex.h>
+#include <linux/notifier.h>
 #define MIN_MEMORY_BLOCK_SIZE     (1UL << SECTION_SIZE_BITS)
@@ -114,9 +115,10 @@ extern void unregister_memory_notifier(struct notifier_block *nb);
 extern int register_memory_isolate_notifier(struct notifier_block *nb);
 extern void unregister_memory_isolate_notifier(struct notifier_block *nb);
 extern int register_new_memory(int, struct mem_section *);
+#ifdef CONFIG_MEMORY_HOTREMOVE
 extern int unregister_memory_section(struct mem_section *);
+#endif
 extern int memory_dev_init(void);
-extern int remove_memory_block(unsigned long, struct mem_section *, int);
 extern int memory_notify(unsigned long val, void *v);
 extern int memory_isolate_notify(unsigned long val, void *v);
 extern struct memory_block *find_memory_block_hinted(struct mem_section *,
@@ -127,13 +129,18 @@ enum mem_add_context { BOOT, HOTPLUG };
 #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
 #ifdef CONFIG_MEMORY_HOTPLUG
-#define hotplug_memory_notifier(fn, pri) {                      \
+#define hotplug_memory_notifier(fn, pri) ({             \
        static __meminitdata struct notifier_block fn##_mem_nb =\
-                { .notifier_call = fn, .priority = pri };       \
+                { .notifier_call = fn, .priority = pri };\
        register_memory_notifier(&fn##_mem_nb);                 \
-}
+})
+#define register_hotmemory_notifier(nb)         register_memory_notifier(nb)
+#define unregister_hotmemory_notifier(nb)       unregister_memory_notifier(nb)
 #else
-#define hotplug_memory_notifier(fn, pri) do { } while (0)
+#define hotplug_memory_notifier(fn, pri)        ({ 0; })
+/* These aren't inline functions due to a GCC bug. */
+#define register_hotmemory_notifier(nb)    ({ (void)(nb); 0; })
+#define unregister_hotmemory_notifier(nb)  ({ (void)(nb); })
 #endif
 /*
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index b6a3be7d47bf..3e622c610925 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -97,13 +97,13 @@ extern void __online_page_free(struct page *page);
 #ifdef CONFIG_MEMORY_HOTREMOVE
 extern bool is_pageblock_removable_nolock(struct page *page);
 extern int arch_remove_memory(u64 start, u64 size);
+extern int __remove_pages(struct zone *zone, unsigned long start_pfn,
+        unsigned long nr_pages);
 #endif /* CONFIG_MEMORY_HOTREMOVE */
 /* reasonably generic interface to expand the physical pages in a zone  */
 extern int __add_pages(int nid, struct zone *zone, unsigned long start_pfn,
        unsigned long nr_pages);
-extern int __remove_pages(struct zone *zone, unsigned long start_pfn,
-        unsigned long nr_pages);
 #ifdef CONFIG_NUMA
 extern int memory_add_physaddr_to_nid(u64 start);
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index 9ead60bc66b7..3301b2031c8d 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -89,6 +89,11 @@ struct abx500_fg;
 *                              points.
 * @maint_thres                 This is the threshold where we stop reporting
 *                              battery full while in maintenance, in per cent
+ * @pcut_enable:                        Enable power cut feature in ab8505
+ * @pcut_max_time:              Max time threshold
+ * @pcut_flag_time:             Flagtime threshold
+ * @pcut_max_restart:           Max number of restarts
+ * @pcut_debounce_time:         Sets battery debounce time
 */
 struct abx500_fg_parameters {
        int recovery_sleep_timer;
@@ -106,6 +111,11 @@ struct abx500_fg_parameters {
        int battok_raising_th_sel1;
        int user_cap_limit;
        int maint_thres;
+        bool pcut_enable;
+        u8 pcut_max_time;
+        u8 pcut_flag_time;
+        u8 pcut_max_restart;
+        u8 pcut_debounce_time;
 };
 /**
@@ -173,11 +183,11 @@ struct abx500_battery_type {
        int low_high_vol_lvl;
        int battery_resistance;
        int n_temp_tbl_elements;
-        struct abx500_res_to_temp *r_to_t_tbl;
+        const struct abx500_res_to_temp *r_to_t_tbl;
        int n_v_cap_tbl_elements;
-        struct abx500_v_to_cap *v_to_cap_tbl;
+        const struct abx500_v_to_cap *v_to_cap_tbl;
        int n_batres_tbl_elements;
-        struct batres_vs_temp *batres_tbl;
+        const struct batres_vs_temp *batres_tbl;
 };
 /**
@@ -236,7 +246,11 @@ struct abx500_bm_charger_parameters {
 * @interval_not_charging charge alg cycle period time when not charging (sec)
 * @temp_hysteresis     temperature hysteresis
 * @gnd_lift_resistance Battery ground to phone ground resistance (mOhm)
- * @maxi:               maximization parameters
+ * @n_chg_out_curr              number of elements in array chg_output_curr
+ * @n_chg_in_curr               number of elements in array chg_input_curr
+ * @chg_output_curr     charger output current level map
+ * @chg_input_curr              charger input current level map
+ * @maxi                maximization parameters
 * @cap_levels          capacity in percent for the different capacity levels
 * @bat_type            table of supported battery types
 * @chg_params          charger parameters
@@ -257,6 +271,7 @@ struct abx500_bm_data {
        bool autopower_cfg;
        bool ac_enabled;
        bool usb_enabled;
+        bool usb_power_path;
        bool no_maintenance;
        bool capacity_scaling;
        bool chg_unknown_bat;
@@ -270,6 +285,10 @@ struct abx500_bm_data {
        int interval_not_charging;
        int temp_hysteresis;
        int gnd_lift_resistance;
+        int n_chg_out_curr;
+        int n_chg_in_curr;
+        int *chg_output_curr;
+        int *chg_input_curr;
        const struct abx500_maxim_parameters *maxi;
        const struct abx500_bm_capacity_levels *cap_levels;
        struct abx500_battery_type *bat_type;
diff --git a/include/linux/mfd/abx500/ab8500-bm.h b/include/linux/mfd/abx500/ab8500-bm.h
index 8d35bfe164c8..cc892a8d8d6e 100644
--- a/include/linux/mfd/abx500/ab8500-bm.h
+++ b/include/linux/mfd/abx500/ab8500-bm.h
@@ -23,6 +23,7 @@
 * Bank : 0x5
 */
 #define AB8500_USB_LINE_STAT_REG        0x80
+#define AB8500_USB_LINE_CTRL2_REG       0x82
 #define AB8500_USB_LINK1_STAT_REG       0x94
 /*
@@ -33,7 +34,7 @@
 #define AB8500_CH_STATUS2_REG           0x01
 #define AB8500_CH_USBCH_STAT1_REG       0x02
 #define AB8500_CH_USBCH_STAT2_REG       0x03
-#define AB8500_CH_FSM_STAT_REG          0x04
+#define AB8540_CH_USBCH_STAT3_REG       0x04
 #define AB8500_CH_STAT_REG              0x05
 /*
@@ -69,6 +70,8 @@
 #define AB8500_USBCH_CTRL1_REG          0xC0
 #define AB8500_USBCH_CTRL2_REG          0xC1
 #define AB8500_USBCH_IPT_CRNTLVL_REG    0xC2
+#define AB8540_USB_PP_MODE_REG          0xC5
+#define AB8540_USB_PP_CHR_REG           0xC6
 /*
 * Gas Gauge register offsets
@@ -105,6 +108,7 @@
 #define AB8500_RTC_BACKUP_CHG_REG       0x0C
 #define AB8500_RTC_CC_CONF_REG          0x01
 #define AB8500_RTC_CTRL_REG             0x0B
+#define AB8500_RTC_CTRL1_REG            0x11
 /*
 * OTP register offsets
@@ -154,6 +158,7 @@
 #define CH_OP_CUR_LVL_1P4               0x0D
 #define CH_OP_CUR_LVL_1P5               0x0E
 #define CH_OP_CUR_LVL_1P6               0x0F
+#define CH_OP_CUR_LVL_2P                0x3F
 /* BTEMP High thermal limits */
 #define BTEMP_HIGH_TH_57_0              0x00
@@ -179,10 +184,25 @@
 #define BUP_ICH_SEL_300UA               0x08
 #define BUP_ICH_SEL_700UA               0x0C
-#define BUP_VCH_SEL_2P5V                0x00
+enum bup_vch_sel {
-#define BUP_VCH_SEL_2P6V                0x01
+        BUP_VCH_SEL_2P5V,
-#define BUP_VCH_SEL_2P8V                0x02
+        BUP_VCH_SEL_2P6V,
-#define BUP_VCH_SEL_3P1V                0x03
+        BUP_VCH_SEL_2P8V,
+        BUP_VCH_SEL_3P1V,
+        /*
+         * Note that the following 5 values 2.7v, 2.9v, 3.0v, 3.2v, 3.3v
+         * are only available on ab8540. You can't choose these 5
+         * voltage on ab8500/ab8505/ab9540.
+         */
+        BUP_VCH_SEL_2P7V,
+        BUP_VCH_SEL_2P9V,
+        BUP_VCH_SEL_3P0V,
+        BUP_VCH_SEL_3P2V,
+        BUP_VCH_SEL_3P3V,
+};
+#define BUP_VCH_RANGE           0x02
+#define VBUP33_VRTCN            0x01
 /* Battery OVV constants */
 #define BATT_OVV_ENA                    0x02
@@ -228,6 +248,8 @@
 #define BAT_CTRL_20U_ENA                0x02
 #define BAT_CTRL_18U_ENA                0x01
 #define BAT_CTRL_16U_ENA                0x02
+#define BAT_CTRL_60U_ENA                0x01
+#define BAT_CTRL_120U_ENA               0x02
 #define BAT_CTRL_CMP_ENA                0x04
 #define FORCE_BAT_CTRL_CMP_HIGH         0x08
 #define BAT_CTRL_PULL_UP_ENA            0x10
@@ -235,6 +257,24 @@
 /* Battery type */
 #define BATTERY_UNKNOWN                 00
+/* Registers for pcut feature in ab8505 and ab9540 */
+#define AB8505_RTC_PCUT_CTL_STATUS_REG  0x12
+#define AB8505_RTC_PCUT_TIME_REG        0x13
+#define AB8505_RTC_PCUT_MAX_TIME_REG    0x14
+#define AB8505_RTC_PCUT_FLAG_TIME_REG   0x15
+#define AB8505_RTC_PCUT_RESTART_REG     0x16
+#define AB8505_RTC_PCUT_DEBOUNCE_REG    0x17
+/* USB Power Path constants for ab8540 */
+#define BUS_VSYS_VOL_SELECT_MASK                0x06
+#define BUS_VSYS_VOL_SELECT_3P6V                0x00
+#define BUS_VSYS_VOL_SELECT_3P325V              0x02
+#define BUS_VSYS_VOL_SELECT_3P9V                0x04
+#define BUS_VSYS_VOL_SELECT_4P3V                0x06
+#define BUS_POWER_PATH_MODE_ENA                 0x01
+#define BUS_PP_PRECHG_CURRENT_MASK              0x0E
+#define BUS_POWER_PATH_PRECHG_ENA               0x01
 /**
 * struct res_to_temp - defines one point in a temp to res curve. To
 * be used in battery packs that combines the identification resistor with a
@@ -283,6 +323,11 @@ struct ab8500_fg;
 *                              points.
 * @maint_thres                 This is the threshold where we stop reporting
 *                              battery full while in maintenance, in per cent
+ * @pcut_enable:                        Enable power cut feature in ab8505
+ * @pcut_max_time:              Max time threshold
+ * @pcut_flag_time:             Flagtime threshold
+ * @pcut_max_restart:           Max number of restarts
+ * @pcut_debunce_time:  Sets battery debounce time
 */
 struct ab8500_fg_parameters {
        int recovery_sleep_timer;
@@ -299,6 +344,11 @@ struct ab8500_fg_parameters {
        int battok_raising_th_sel1;
        int user_cap_limit;
        int maint_thres;
+        bool pcut_enable;
+        u8 pcut_max_time;
+        u8 pcut_flag_time;
+        u8 pcut_max_restart;
+        u8 pcut_debunce_time;
 };
 /**
@@ -415,6 +465,7 @@ void ab8500_fg_reinit(void);
 void ab8500_charger_usb_state_changed(u8 bm_usb_state, u16 mA);
 struct ab8500_btemp *ab8500_btemp_get(void);
 int ab8500_btemp_get_batctrl_temp(struct ab8500_btemp *btemp);
+int ab8500_btemp_get_temp(struct ab8500_btemp *btemp);
 struct ab8500_fg *ab8500_fg_get(void);
 int ab8500_fg_inst_curr_blocking(struct ab8500_fg *dev);
 int ab8500_fg_inst_curr_start(struct ab8500_fg *di);
diff --git a/include/linux/mfd/abx500/ab8500-gpadc.h b/include/linux/mfd/abx500/ab8500-gpadc.h
index 252966769d93..49ded001049b 100644
--- a/include/linux/mfd/abx500/ab8500-gpadc.h
+++ b/include/linux/mfd/abx500/ab8500-gpadc.h
@@ -4,32 +4,72 @@
 *
 * Author: Arun R Murthy <arun.murthy@stericsson.com>
 * Author: Daniel Willerud <daniel.willerud@stericsson.com>
+ * Author: M'boumba Cedric Madianga <cedric.madianga@stericsson.com>
 */
 #ifndef _AB8500_GPADC_H
 #define _AB8500_GPADC_H
-/* GPADC source: From datasheet(ADCSwSel[4:0] in GPADCCtrl2) */
+/* GPADC source: From datasheet(ADCSwSel[4:0] in GPADCCtrl2
-#define BAT_CTRL        0x01
+ * and ADCHwSel[4:0] in GPADCCtrl3 ) */
-#define BTEMP_BALL      0x02
+#define BAT_CTRL                0x01
-#define MAIN_CHARGER_V  0x03
+#define BTEMP_BALL              0x02
-#define ACC_DETECT1     0x04
+#define MAIN_CHARGER_V          0x03
-#define ACC_DETECT2     0x05
+#define ACC_DETECT1             0x04
-#define ADC_AUX1        0x06
+#define ACC_DETECT2             0x05
-#define ADC_AUX2        0x07
+#define ADC_AUX1                0x06
-#define MAIN_BAT_V      0x08
+#define ADC_AUX2                0x07
-#define VBUS_V          0x09
+#define MAIN_BAT_V              0x08
-#define MAIN_CHARGER_C  0x0A
+#define VBUS_V                  0x09
-#define USB_CHARGER_C   0x0B
+#define MAIN_CHARGER_C          0x0A
-#define BK_BAT_V        0x0C
+#define USB_CHARGER_C           0x0B
-#define DIE_TEMP        0x0D
+#define BK_BAT_V                0x0C
+#define DIE_TEMP                0x0D
+#define USB_ID                  0x0E
+#define XTAL_TEMP               0x12
+#define VBAT_TRUE_MEAS          0x13
+#define BAT_CTRL_AND_IBAT       0x1C
+#define VBAT_MEAS_AND_IBAT      0x1D
+#define VBAT_TRUE_MEAS_AND_IBAT 0x1E
+#define BAT_TEMP_AND_IBAT       0x1F
+/* Virtual channel used only for ibat convertion to ampere
+ * Battery current conversion (ibat) cannot be requested as a single conversion
+ *  but it is always in combination with other input requests
+ */
+#define IBAT_VIRTUAL_CHANNEL            0xFF
+#define SAMPLE_1        1
+#define SAMPLE_4        4
+#define SAMPLE_8        8
+#define SAMPLE_16       16
+#define RISING_EDGE     0
+#define FALLING_EDGE    1
+/* Arbitrary ADC conversion type constants */
+#define ADC_SW                          0
+#define ADC_HW                          1
 struct ab8500_gpadc;
 struct ab8500_gpadc *ab8500_gpadc_get(char *name);
-int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 channel);
+int ab8500_gpadc_sw_hw_convert(struct ab8500_gpadc *gpadc, u8 channel,
-int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel);
+                u8 avg_sample, u8 trig_edge, u8 trig_timer, u8 conv_type);
+static inline int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 channel)
+{
+        return ab8500_gpadc_sw_hw_convert(gpadc, channel,
+                        SAMPLE_16, 0, 0, ADC_SW);
+}
+int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel,
+                u8 avg_sample, u8 trig_edge, u8 trig_timer, u8 conv_type);
+int ab8500_gpadc_double_read_raw(struct ab8500_gpadc *gpadc, u8 channel,
+                u8 avg_sample, u8 trig_edge, u8 trig_timer, u8 conv_type,
+                int *ibat);
 int ab8500_gpadc_ad_to_voltage(struct ab8500_gpadc *gpadc,
-    u8 channel, int ad_value);
+                u8 channel, int ad_value);
+void ab8540_gpadc_get_otp(struct ab8500_gpadc *gpadc,
+                        u16 *vmain_l, u16 *vmain_h, u16 *btemp_l, u16 *btemp_h,
+                        u16 *vbat_l, u16 *vbat_h, u16 *ibat_l, u16 *ibat_h);
 #endif /* _AB8500_GPADC_H */
diff --git a/include/linux/mfd/abx500/ab8500-sysctrl.h b/include/linux/mfd/abx500/ab8500-sysctrl.h
index ebf12e793db9..990bc93f46e1 100644
--- a/include/linux/mfd/abx500/ab8500-sysctrl.h
+++ b/include/linux/mfd/abx500/ab8500-sysctrl.h
@@ -12,6 +12,7 @@
 int ab8500_sysctrl_read(u16 reg, u8 *value);
 int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value);
+void ab8500_restart(char mode, const char *cmd);
 #else
@@ -40,6 +41,7 @@ static inline int ab8500_sysctrl_clear(u16 reg, u8 bits)
 /* Configuration data for SysClkReq1RfClkBuf - SysClkReq8RfClkBuf */
 struct ab8500_sysctrl_platform_data {
        u8 initial_req_buf_config[8];
+        u16 (*reboot_reason_code)(const char *cmd);
 };
 /* Registers */
@@ -299,4 +301,8 @@ struct ab8500_sysctrl_platform_data {
 #define AB9540_SYSCLK12BUF4VALID_SYSCLK12BUF4VALID_MASK 0xFF
 #define AB9540_SYSCLK12BUF4VALID_SYSCLK12BUF4VALID_SHIFT 0
+#define AB8500_ENABLE_WD 0x1
+#define AB8500_KICK_WD 0x2
+#define AB8500_WD_RESTART_ON_EXPIRE 0x10
 #endif /* __AB8500_SYSCTRL_H */
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index 9db0bda446a0..fb1bf7d6a410 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -362,10 +362,10 @@ struct ab8500 {
        u8 *oldmask;
        int mask_size;
        const int *irq_reg_offset;
+        int it_latchhier_num;
 };
-struct regulator_reg_init;
+struct ab8500_regulator_platform_data;
-struct regulator_init_data;
 struct ab8500_gpio_platform_data;
 struct ab8500_codec_platform_data;
 struct ab8500_sysctrl_platform_data;
@@ -375,19 +375,13 @@ struct ab8500_sysctrl_platform_data;
 * @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used
 * @pm_power_off: Should machine pm power off hook be registered or not
 * @init: board-specific initialization after detection of ab8500
- * @num_regulator_reg_init: number of regulator init registers
- * @regulator_reg_init: regulator init registers
- * @num_regulator: number of regulators
 * @regulator: machine-specific constraints for regulators
 */
 struct ab8500_platform_data {
        int irq_base;
        bool pm_power_off;
        void (*init) (struct ab8500 *);
-        int num_regulator_reg_init;
+        struct ab8500_regulator_platform_data *regulator;
-        struct ab8500_regulator_reg_init *regulator_reg_init;
-        int num_regulator;
-        struct regulator_init_data *regulator;
        struct abx500_gpio_platform_data *gpio;
        struct ab8500_codec_platform_data *codec;
        struct ab8500_sysctrl_platform_data *sysctrl;
@@ -512,6 +506,8 @@ static inline int is_ab9540_2p0_or_earlier(struct ab8500 *ab)
        return (is_ab9540(ab) && (ab->chip_id < AB8500_CUT2P0));
 }
+void ab8500_override_turn_on_stat(u8 mask, u8 set);
 #ifdef CONFIG_AB8500_DEBUG
 void ab8500_dump_all_banks(struct device *dev);
 void ab8500_debug_register_interrupt(int line);
diff --git a/include/linux/mfd/abx500/ux500_chargalg.h b/include/linux/mfd/abx500/ux500_chargalg.h
index d43ac0f35526..234c99143bf7 100644
--- a/include/linux/mfd/abx500/ux500_chargalg.h
+++ b/include/linux/mfd/abx500/ux500_chargalg.h
@@ -17,8 +17,11 @@ struct ux500_charger;
 struct ux500_charger_ops {
        int (*enable) (struct ux500_charger *, int, int, int);
+        int (*check_enable) (struct ux500_charger *, int, int);
        int (*kick_wd) (struct ux500_charger *);
        int (*update_curr) (struct ux500_charger *, int);
+        int (*pp_enable) (struct ux500_charger *, bool);
+        int (*pre_chg_enable) (struct ux500_charger *, bool);
 };
 /**
@@ -29,6 +32,7 @@ struct ux500_charger_ops {
 * @max_out_curr        maximum output charger current in mA
 * @enabled             indicates if this charger is used or not
 * @external            external charger unit (pm2xxx)
+ * @power_path          USB power path support
 */
 struct ux500_charger {
        struct power_supply psy;
@@ -38,6 +42,9 @@ struct ux500_charger {
        int wdt_refresh;
        bool enabled;
        bool external;
+        bool power_path;
 };
+extern struct blocking_notifier_head charger_notifier_list;
 #endif
diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h
index a710255528d7..cc281368dc55 100644
--- a/include/linux/mfd/arizona/core.h
+++ b/include/linux/mfd/arizona/core.h
@@ -100,6 +100,9 @@ struct arizona {
        struct regmap_irq_chip_data *aod_irq_chip;
        struct regmap_irq_chip_data *irq_chip;
+        bool hpdet_magic;
+        unsigned int hp_ena;
        struct mutex clk_lock;
        int clk32k_ref;
diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 455c51d22d6b..a0f940987a3e 100644
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -86,6 +86,11 @@ struct arizona_micd_config {
        bool gpio;
 };
+struct arizona_micd_range {
+        int max;  /** Ohms */
+        int key;  /** Key to report to input layer */
+};
 struct arizona_pdata {
        int reset;      /** GPIO controlling /RESET, if any */
        int ldoena;     /** GPIO controlling LODENA, if any */
@@ -117,12 +122,21 @@ struct arizona_pdata {
        /** GPIO5 is used for jack detection */
        bool jd_gpio5;
+        /** Internal pull on GPIO5 is disabled when used for jack detection */
+        bool jd_gpio5_nopull;
        /** Use the headphone detect circuit to identify the accessory */
        bool hpdet_acc_id;
+        /** Check for line output with HPDET method */
+        bool hpdet_acc_id_line;
        /** GPIO used for mic isolation with HPDET */
        int hpdet_id_gpio;
+        /** Extra debounce timeout used during initial mic detection (ms) */
+        int micd_detect_debounce;
        /** GPIO for mic detection polarity */
        int micd_pol_gpio;
@@ -135,9 +149,16 @@ struct arizona_pdata {
        /** Mic detect debounce level */
        int micd_dbtime;
+        /** Mic detect timeout (ms) */
+        int micd_timeout;
        /** Force MICBIAS on for mic detect */
        bool micd_force_micbias;
+        /** Mic detect level parameters */
+        const struct arizona_micd_range *micd_ranges;
+        int num_micd_ranges;
        /** Headset polarity configurations */
        struct arizona_micd_config *micd_configs;
        int num_micd_configs;
diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
index 340355136069..f43aa7c8d040 100644
--- a/include/linux/mfd/arizona/registers.h
+++ b/include/linux/mfd/arizona/registers.h
@@ -124,6 +124,10 @@
 #define ARIZONA_MIC_DETECT_1                     0x2A3
 #define ARIZONA_MIC_DETECT_2                     0x2A4
 #define ARIZONA_MIC_DETECT_3                     0x2A5
+#define ARIZONA_MIC_DETECT_LEVEL_1               0x2A6
+#define ARIZONA_MIC_DETECT_LEVEL_2               0x2A7
+#define ARIZONA_MIC_DETECT_LEVEL_3               0x2A8
+#define ARIZONA_MIC_DETECT_LEVEL_4               0x2A9
 #define ARIZONA_MIC_NOISE_MIX_CONTROL_1          0x2C3
 #define ARIZONA_ISOLATION_CONTROL                0x2CB
 #define ARIZONA_JACK_DETECT_ANALOGUE             0x2D3
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 3bbda22721ea..ecddc5173c7c 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -109,19 +109,6 @@ struct palmas_reg_init {
         */
        int mode_sleep;
-        /* tstep is the timestep loaded to the TSTEP register
-         *
-         * For SMPS
-         *
-         * 0: Jump (no slope control)
-         * 1: 10mV/us
-         * 2: 5mV/us
-         * 3: 2.5mV/us
-         *
-         * For LDO unused
-         */
-        int tstep;
        /* voltage_sel is the bitfield loaded onto the SMPSX_VOLTAGE
         * register. Set this is the default voltage set in OTP needs
         * to be overridden.
@@ -154,6 +141,12 @@ enum palmas_regulators {
        PALMAS_REG_LDO9,
        PALMAS_REG_LDOLN,
        PALMAS_REG_LDOUSB,
+        /* External regulators */
+        PALMAS_REG_REGEN1,
+        PALMAS_REG_REGEN2,
+        PALMAS_REG_REGEN3,
+        PALMAS_REG_SYSEN1,
+        PALMAS_REG_SYSEN2,
        /* Total number of regulators */
        PALMAS_NUM_REGS,
 };
@@ -171,6 +164,9 @@ struct palmas_pmic_platform_data {
        /* use LDO6 for vibrator control */
        int ldo6_vibrator;
+        /* Enable tracking mode of LDO8 */
+        bool enable_ldo8_tracking;
 };
 struct palmas_usb_platform_data {
@@ -331,6 +327,8 @@ struct palmas_pmic {
        int smps457;
        int range[PALMAS_REG_SMPS10];
+        unsigned int ramp_delay[PALMAS_REG_SMPS10];
+        unsigned int current_reg_mode[PALMAS_REG_SMPS10];
 };
 struct palmas_resource {
diff --git a/include/linux/mfd/si476x-core.h b/include/linux/mfd/si476x-core.h
deleted file mode 100644
index 2136b2631dc3..000000000000
--- a/include/linux/mfd/si476x-core.h
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- * include/media/si476x-core.h -- Common definitions for si476x core
- * device
- *
- * Copyright (C) 2012 Innovative Converged Devices(ICD)
- *
- * Author: Andrey Smirnov <andrey.smirnov@convergeddevices.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- */
-#ifndef SI476X_CORE_H
-#define SI476X_CORE_H
-#include <linux/kfifo.h>
-#include <linux/atomic.h>
-#include <linux/i2c.h>
-#include <linux/regmap.h>
-#include <linux/mutex.h>
-#include <linux/mfd/core.h>
-#include <linux/videodev2.h>
-#include <linux/regulator/consumer.h>
-#include <media/si476x.h>
-/* Command Timeouts */
-#define SI476X_DEFAULT_TIMEOUT  100000
-#define SI476X_TIMEOUT_TUNE     700000
-#define SI476X_TIMEOUT_POWER_UP 330000
-#define SI476X_STATUS_POLL_US   0
-/* -------------------- si476x-i2c.c ----------------------- */
-enum si476x_freq_supported_chips {
-        SI476X_CHIP_SI4761 = 1,
-        SI476X_CHIP_SI4764,
-        SI476X_CHIP_SI4768,
-};
-enum si476x_mfd_cells {
-        SI476X_RADIO_CELL = 0,
-        SI476X_CODEC_CELL,
-        SI476X_MFD_CELLS,
-};
-/**
- * enum si476x_power_state - possible power state of the si476x
- * device.
- *
- * @SI476X_POWER_DOWN: In this state all regulators are turned off
- * and the reset line is pulled low. The device is completely
- * inactive.
- * @SI476X_POWER_UP_FULL: In this state all the power regualtors are
- * turned on, reset line pulled high, IRQ line is enabled(polling is
- * active for polling use scenario) and device is turned on with
- * POWER_UP command. The device is ready to be used.
- * @SI476X_POWER_INCONSISTENT: This state indicates that previous
- * power down was inconsistent, meaning some of the regulators were
- * not turned down and thus use of the device, without power-cycling
- * is impossible.
- */
-enum si476x_power_state {
-        SI476X_POWER_DOWN               = 0,
-        SI476X_POWER_UP_FULL            = 1,
-        SI476X_POWER_INCONSISTENT       = 2,
-};
-/**
- * struct si476x_core - internal data structure representing the
- * underlying "core" device which all the MFD cell-devices use.
- *
- * @client: Actual I2C client used to transfer commands to the chip.
- * @chip_id: Last digit of the chip model(E.g. "1" for SI4761)
- * @cells: MFD cell devices created by this driver.
- * @cmd_lock: Mutex used to serialize all the requests to the core
- * device. This filed should not be used directly. Instead
- * si476x_core_lock()/si476x_core_unlock() should be used to get
- * exclusive access to the "core" device.
- * @users: Active users counter(Used by the radio cell)
- * @rds_read_queue: Wait queue used to wait for RDS data.
- * @rds_fifo: FIFO in which all the RDS data received from the chip is
- * placed.
- * @rds_fifo_drainer: Worker that drains on-chip RDS FIFO.
- * @rds_drainer_is_working: Flag used for launching only one instance
- * of the @rds_fifo_drainer.
- * @rds_drainer_status_lock: Lock used to guard access to the
- * @rds_drainer_is_working variable.
- * @command: Wait queue for wainting on the command comapletion.
- * @cts: Clear To Send flag set upon receiving first status with CTS
- * set.
- * @tuning: Wait queue used for wainting for tune/seek comand
- * completion.
- * @stc: Similar to @cts, but for the STC bit of the status value.
- * @power_up_parameters: Parameters used as argument for POWER_UP
- * command when the device is started.
- * @state: Current power state of the device.
- * @supplues: Structure containing handles to all power supplies used
- * by the device (NULL ones are ignored).
- * @gpio_reset: GPIO pin connectet to the RSTB pin of the chip.
- * @pinmux: Chip's configurable pins configuration.
- * @diversity_mode: Chips role when functioning in diversity mode.
- * @status_monitor: Polling worker used in polling use case scenarion
- * (when IRQ is not avalible).
- * @revision: Chip's running firmware revision number(Used for correct
- * command set support).
- */
-struct si476x_core {
-        struct i2c_client *client;
-        struct regmap *regmap;
-        int chip_id;
-        struct mfd_cell cells[SI476X_MFD_CELLS];
-        struct mutex cmd_lock; /* for serializing fm radio operations */
-        atomic_t users;
-        wait_queue_head_t  rds_read_queue;
-        struct kfifo       rds_fifo;
-        struct work_struct rds_fifo_drainer;
-        bool               rds_drainer_is_working;
-        struct mutex       rds_drainer_status_lock;
-        wait_queue_head_t command;
-        atomic_t          cts;
-        wait_queue_head_t tuning;
-        atomic_t          stc;
-        struct si476x_power_up_args power_up_parameters;
-        enum si476x_power_state power_state;
-        struct regulator_bulk_data supplies[4];
-        int gpio_reset;
-        struct si476x_pinmux pinmux;
-        enum si476x_phase_diversity_mode diversity_mode;
-        atomic_t is_alive;
-        struct delayed_work status_monitor;
-#define SI476X_WORK_TO_CORE(w) container_of(to_delayed_work(w), \
-                                            struct si476x_core, \
-                                            status_monitor)
-        int revision;
-        int rds_fifo_depth;
-};
-static inline struct si476x_core *i2c_mfd_cell_to_core(struct device *dev)
-{
-        struct i2c_client *client = to_i2c_client(dev->parent);
-        return i2c_get_clientdata(client);
-}
-/**
- * si476x_core_lock() - lock the core device to get an exclusive access
- * to it.
- */
-static inline void si476x_core_lock(struct si476x_core *core)
-{
-        mutex_lock(&core->cmd_lock);
-}
-/**
- * si476x_core_unlock() - unlock the core device to relinquish an
- * exclusive access to it.
- */
-static inline void si476x_core_unlock(struct si476x_core *core)
-{
-        mutex_unlock(&core->cmd_lock);
-}
-/* *_TUNE_FREQ family of commands accept frequency in multiples of
-    10kHz */
-static inline u16 hz_to_si476x(struct si476x_core *core, int freq)
-{
-        u16 result;
-        switch (core->power_up_parameters.func) {
-        default:
-        case SI476X_FUNC_FM_RECEIVER:
-                result = freq / 10000;
-                break;
-        case SI476X_FUNC_AM_RECEIVER:
-                result = freq / 1000;
-                break;
-        }
-        return result;
-}
-static inline int si476x_to_hz(struct si476x_core *core, u16 freq)
-{
-        int result;
-        switch (core->power_up_parameters.func) {
-        default:
-        case SI476X_FUNC_FM_RECEIVER:
-                result = freq * 10000;
-                break;
-        case SI476X_FUNC_AM_RECEIVER:
-                result = freq * 1000;
-                break;
-        }
-        return result;
-}
-/* Since the V4L2_TUNER_CAP_LOW flag is supplied, V4L2 subsystem
- * mesures frequency in 62.5 Hz units */
-static inline int hz_to_v4l2(int freq)
-{
-        return (freq * 10) / 625;
-}
-static inline int v4l2_to_hz(int freq)
-{
-        return (freq * 625) / 10;
-}
-static inline u16 v4l2_to_si476x(struct si476x_core *core, int freq)
-{
-        return hz_to_si476x(core, v4l2_to_hz(freq));
-}
-static inline int si476x_to_v4l2(struct si476x_core *core, u16 freq)
-{
-        return hz_to_v4l2(si476x_to_hz(core, freq));
-}
-/**
- * struct si476x_func_info - structure containing result of the
- * FUNC_INFO command.
- *
- * @firmware.major: Firmware major number.
- * @firmware.minor[...]: Firmware minor numbers.
- * @patch_id:
- * @func: Mode tuner is working in.
- */
-struct si476x_func_info {
-        struct {
-                u8 major, minor[2];
-        } firmware;
-        u16 patch_id;
-        enum si476x_func func;
-};
-/**
- * struct si476x_power_down_args - structure used to pass parameters
- * to POWER_DOWN command
- *
- * @xosc: true - Power down, but leav oscillator running.
- *        false - Full power down.
- */
-struct si476x_power_down_args {
-        bool xosc;
-};
-/**
- * enum si476x_tunemode - enum representing possible tune modes for
- * the chip.
- * @SI476X_TM_VALIDATED_NORMAL_TUNE: Unconditionally stay on the new
- * channel after tune, tune status is valid.
- * @SI476X_TM_INVALIDATED_FAST_TUNE: Unconditionally stay in the new
- * channel after tune, tune status invalid.
- * @SI476X_TM_VALIDATED_AF_TUNE: Jump back to previous channel if
- * metric thresholds are not met.
- * @SI476X_TM_VALIDATED_AF_CHECK: Unconditionally jump back to the
- * previous channel.
- */
-enum si476x_tunemode {
-        SI476X_TM_VALIDATED_NORMAL_TUNE = 0,
-        SI476X_TM_INVALIDATED_FAST_TUNE = 1,
-        SI476X_TM_VALIDATED_AF_TUNE     = 2,
-        SI476X_TM_VALIDATED_AF_CHECK    = 3,
-};
-/**
- * enum si476x_smoothmetrics - enum containing the possible setting fo
- * audio transitioning of the chip
- * @SI476X_SM_INITIALIZE_AUDIO: Initialize audio state to match this
- * new channel
- * @SI476X_SM_TRANSITION_AUDIO: Transition audio state from previous
- * channel values to the new values
- */
-enum si476x_smoothmetrics {
-        SI476X_SM_INITIALIZE_AUDIO = 0,
-        SI476X_SM_TRANSITION_AUDIO = 1,
-};
-/**
- * struct si476x_rds_status_report - the structure representing the
- * response to 'FM_RD_STATUS' command
- * @rdstpptyint: Traffic program flag(TP) and/or program type(PTY)
- * code has changed.
- * @rdspiint: Program indentifiaction(PI) code has changed.
- * @rdssyncint: RDS synchronization has changed.
- * @rdsfifoint: RDS was received and the RDS FIFO has at least
- * 'FM_RDS_INTERRUPT_FIFO_COUNT' elements in it.
- * @tpptyvalid: TP flag and PTY code are valid falg.
- * @pivalid: PI code is valid flag.
- * @rdssync: RDS is currently synchronized.
- * @rdsfifolost: On or more RDS groups have been lost/discarded flag.
- * @tp: Current channel's TP flag.
- * @pty: Current channel's PTY code.
- * @pi: Current channel's PI code.
- * @rdsfifoused: Number of blocks remaining in the RDS FIFO (0 if
- * empty).
- */
-struct si476x_rds_status_report {
-        bool rdstpptyint, rdspiint, rdssyncint, rdsfifoint;
-        bool tpptyvalid, pivalid, rdssync, rdsfifolost;
-        bool tp;
-        u8 pty;
-        u16 pi;
-        u8 rdsfifoused;
-        u8 ble[4];
-        struct v4l2_rds_data rds[4];
-};
-struct si476x_rsq_status_args {
-        bool primary;
-        bool rsqack;
-        bool attune;
-        bool cancel;
-        bool stcack;
-};
-enum si476x_injside {
-        SI476X_INJSIDE_AUTO     = 0,
-        SI476X_INJSIDE_LOW      = 1,
-        SI476X_INJSIDE_HIGH     = 2,
-};
-struct si476x_tune_freq_args {
-        bool zifsr;
-        bool hd;
-        enum si476x_injside injside;
-        int freq;
-        enum si476x_tunemode tunemode;
-        enum si476x_smoothmetrics smoothmetrics;
-        int antcap;
-};
-int  si476x_core_stop(struct si476x_core *, bool);
-int  si476x_core_start(struct si476x_core *, bool);
-int  si476x_core_set_power_state(struct si476x_core *, enum si476x_power_state);
-bool si476x_core_has_am(struct si476x_core *);
-bool si476x_core_has_diversity(struct si476x_core *);
-bool si476x_core_is_a_secondary_tuner(struct si476x_core *);
-bool si476x_core_is_a_primary_tuner(struct si476x_core *);
-bool si476x_core_is_in_am_receiver_mode(struct si476x_core *core);
-bool si476x_core_is_powered_up(struct si476x_core *core);
-enum si476x_i2c_type {
-        SI476X_I2C_SEND,
-        SI476X_I2C_RECV
-};
-int si476x_core_i2c_xfer(struct si476x_core *,
-                         enum si476x_i2c_type,
-                         char *, int);
-/* -------------------- si476x-cmd.c ----------------------- */
-int si476x_core_cmd_func_info(struct si476x_core *, struct si476x_func_info *);
-int si476x_core_cmd_set_property(struct si476x_core *, u16, u16);
-int si476x_core_cmd_get_property(struct si476x_core *, u16);
-int si476x_core_cmd_dig_audio_pin_cfg(struct si476x_core *,
-                                      enum si476x_dclk_config,
-                                      enum si476x_dfs_config,
-                                      enum si476x_dout_config,
-                                      enum si476x_xout_config);
-int si476x_core_cmd_zif_pin_cfg(struct si476x_core *,
-                                enum si476x_iqclk_config,
-                                enum si476x_iqfs_config,
-                                enum si476x_iout_config,
-                                enum si476x_qout_config);
-int si476x_core_cmd_ic_link_gpo_ctl_pin_cfg(struct si476x_core *,
-                                            enum si476x_icin_config,
-                                            enum si476x_icip_config,
-                                            enum si476x_icon_config,
-                                            enum si476x_icop_config);
-int si476x_core_cmd_ana_audio_pin_cfg(struct si476x_core *,
-                                      enum si476x_lrout_config);
-int si476x_core_cmd_intb_pin_cfg(struct si476x_core *, enum si476x_intb_config,
-                                 enum si476x_a1_config);
-int si476x_core_cmd_fm_seek_start(struct si476x_core *, bool, bool);
-int si476x_core_cmd_am_seek_start(struct si476x_core *, bool, bool);
-int si476x_core_cmd_fm_rds_status(struct si476x_core *, bool, bool, bool,
-                                  struct si476x_rds_status_report *);
-int si476x_core_cmd_fm_rds_blockcount(struct si476x_core *, bool,
-                                      struct si476x_rds_blockcount_report *);
-int si476x_core_cmd_fm_tune_freq(struct si476x_core *,
-                                 struct si476x_tune_freq_args *);
-int si476x_core_cmd_am_tune_freq(struct si476x_core *,
-                                 struct si476x_tune_freq_args *);
-int si476x_core_cmd_am_rsq_status(struct si476x_core *,
-                                  struct si476x_rsq_status_args *,
-                                  struct si476x_rsq_status_report *);
-int si476x_core_cmd_fm_rsq_status(struct si476x_core *,
-                                  struct si476x_rsq_status_args *,
-                                  struct si476x_rsq_status_report *);
-int si476x_core_cmd_power_up(struct si476x_core *,
-                             struct si476x_power_up_args *);
-int si476x_core_cmd_power_down(struct si476x_core *,
-                               struct si476x_power_down_args *);
-int si476x_core_cmd_fm_phase_div_status(struct si476x_core *);
-int si476x_core_cmd_fm_phase_diversity(struct si476x_core *,
-                                       enum si476x_phase_diversity_mode);
-int si476x_core_cmd_fm_acf_status(struct si476x_core *,
-                                  struct si476x_acf_status_report *);
-int si476x_core_cmd_am_acf_status(struct si476x_core *,
-                                  struct si476x_acf_status_report *);
-int si476x_core_cmd_agc_status(struct si476x_core *,
-                               struct si476x_agc_status_report *);
-enum si476x_power_grid_type {
-        SI476X_POWER_GRID_50HZ = 0,
-        SI476X_POWER_GRID_60HZ,
-};
-/* Properties  */
-enum si476x_interrupt_flags {
-        SI476X_STCIEN = (1 << 0),
-        SI476X_ACFIEN = (1 << 1),
-        SI476X_RDSIEN = (1 << 2),
-        SI476X_RSQIEN = (1 << 3),
-        SI476X_ERRIEN = (1 << 6),
-        SI476X_CTSIEN = (1 << 7),
-        SI476X_STCREP = (1 << 8),
-        SI476X_ACFREP = (1 << 9),
-        SI476X_RDSREP = (1 << 10),
-        SI476X_RSQREP = (1 << 11),
-};
-enum si476x_rdsint_sources {
-        SI476X_RDSTPPTY = (1 << 4),
-        SI476X_RDSPI    = (1 << 3),
-        SI476X_RDSSYNC  = (1 << 1),
-        SI476X_RDSRECV  = (1 << 0),
-};
-enum si476x_status_response_bits {
-        SI476X_CTS        = (1 << 7),
-        SI476X_ERR        = (1 << 6),
-        /* Status response for WB receiver */
-        SI476X_WB_ASQ_INT = (1 << 4),
-        SI476X_RSQ_INT    = (1 << 3),
-        /* Status response for FM receiver */
-        SI476X_FM_RDS_INT = (1 << 2),
-        SI476X_ACF_INT    = (1 << 1),
-        SI476X_STC_INT    = (1 << 0),
-};
-/* -------------------- si476x-prop.c ----------------------- */
-enum si476x_common_receiver_properties {
-        SI476X_PROP_INT_CTL_ENABLE                      = 0x0000,
-        SI476X_PROP_DIGITAL_IO_INPUT_SAMPLE_RATE        = 0x0200,
-        SI476X_PROP_DIGITAL_IO_INPUT_FORMAT             = 0x0201,
-        SI476X_PROP_DIGITAL_IO_OUTPUT_SAMPLE_RATE       = 0x0202,
-        SI476X_PROP_DIGITAL_IO_OUTPUT_FORMAT            = 0x0203,
-        SI476X_PROP_SEEK_BAND_BOTTOM                    = 0x1100,
-        SI476X_PROP_SEEK_BAND_TOP                       = 0x1101,
-        SI476X_PROP_SEEK_FREQUENCY_SPACING              = 0x1102,
-        SI476X_PROP_VALID_MAX_TUNE_ERROR                = 0x2000,
-        SI476X_PROP_VALID_SNR_THRESHOLD                 = 0x2003,
-        SI476X_PROP_VALID_RSSI_THRESHOLD                = 0x2004,
-};
-enum si476x_am_receiver_properties {
-        SI476X_PROP_AUDIO_PWR_LINE_FILTER               = 0x0303,
-};
-enum si476x_fm_receiver_properties {
-        SI476X_PROP_AUDIO_DEEMPHASIS                    = 0x0302,
-        SI476X_PROP_FM_RDS_INTERRUPT_SOURCE             = 0x4000,
-        SI476X_PROP_FM_RDS_INTERRUPT_FIFO_COUNT         = 0x4001,
-        SI476X_PROP_FM_RDS_CONFIG                       = 0x4002,
-};
-enum si476x_prop_audio_pwr_line_filter_bits {
-        SI476X_PROP_PWR_HARMONICS_MASK  = 0b0000000000011111,
-        SI476X_PROP_PWR_GRID_MASK       = 0b0000000100000000,
-        SI476X_PROP_PWR_ENABLE_MASK     = 0b0000001000000000,
-        SI476X_PROP_PWR_GRID_50HZ       = 0b0000000000000000,
-        SI476X_PROP_PWR_GRID_60HZ       = 0b0000000100000000,
-};
-enum si476x_prop_fm_rds_config_bits {
-        SI476X_PROP_RDSEN_MASK  = 0x1,
-        SI476X_PROP_RDSEN       = 0x1,
-};
-struct regmap *devm_regmap_init_si476x(struct si476x_core *);
-#endif  /* SI476X_CORE_H */
diff --git a/include/linux/mfd/tps65090.h b/include/linux/mfd/tps65090.h
index 6694cf43e8b8..998628a2b08b 100644
--- a/include/linux/mfd/tps65090.h
+++ b/include/linux/mfd/tps65090.h
@@ -86,6 +86,11 @@ struct tps65090_regulator_plat_data {
 struct tps65090_platform_data {
        int irq_base;
+        char **supplied_to;
+        size_t num_supplicants;
+        int enable_low_current_chrg;
        struct tps65090_regulator_plat_data *reg_pdata[TPS65090_REGULATOR_MAX];
 };
diff --git a/include/linux/mfd/tps65217.h b/include/linux/mfd/tps65217.h
index 290762f93930..29eab2bd3dfa 100644
--- a/include/linux/mfd/tps65217.h
+++ b/include/linux/mfd/tps65217.h
@@ -228,6 +228,7 @@ enum tps65217_bl_fdim {
 struct tps65217_bl_pdata {
        enum tps65217_bl_isel isel;
        enum tps65217_bl_fdim fdim;
+        int dft_brightness;
 };
 /**
diff --git a/include/linux/mm.h b/include/linux/mm.h
index e19ff30ad0a2..1a7f19e7f1a0 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -44,6 +44,9 @@ extern int sysctl_legacy_va_layout;
 #include <asm/pgtable.h>
 #include <asm/processor.h>
+extern unsigned long sysctl_user_reserve_kbytes;
+extern unsigned long sysctl_admin_reserve_kbytes;
 #define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n))
 /* to align the pointer to the (next) page boundary */
@@ -899,7 +902,8 @@ extern void pagefault_out_of_memory(void);
 * Flags passed to show_mem() and show_free_areas() to suppress output in
 * various contexts.
 */
-#define SHOW_MEM_FILTER_NODES   (0x0001u)       /* filter disallowed nodes */
+#define SHOW_MEM_FILTER_NODES           (0x0001u)       /* disallowed nodes */
+#define SHOW_MEM_FILTER_PAGE_COUNT      (0x0002u)       /* page type count */
 extern void show_free_areas(unsigned int flags);
 extern bool skip_free_areas_node(unsigned int flags, int nid);
@@ -1078,9 +1082,6 @@ extern unsigned long move_page_tables(struct vm_area_struct *vma,
                unsigned long old_addr, struct vm_area_struct *new_vma,
                unsigned long new_addr, unsigned long len,
                bool need_rmap_locks);
-extern unsigned long do_mremap(unsigned long addr,
-                               unsigned long old_len, unsigned long new_len,
-                               unsigned long flags, unsigned long new_addr);
 extern unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
                              unsigned long end, pgprot_t newprot,
                              int dirty_accountable, int prot_numa);
@@ -1294,6 +1295,61 @@ extern void free_area_init_node(int nid, unsigned long * zones_size,
                unsigned long zone_start_pfn, unsigned long *zholes_size);
 extern void free_initmem(void);
+/*
+ * Free reserved pages within range [PAGE_ALIGN(start), end & PAGE_MASK)
+ * into the buddy system. The freed pages will be poisoned with pattern
+ * "poison" if it's non-zero.
+ * Return pages freed into the buddy system.
+ */
+extern unsigned long free_reserved_area(unsigned long start, unsigned long end,
+                                        int poison, char *s);
+#ifdef  CONFIG_HIGHMEM
+/*
+ * Free a highmem page into the buddy system, adjusting totalhigh_pages
+ * and totalram_pages.
+ */
+extern void free_highmem_page(struct page *page);
+#endif
+static inline void adjust_managed_page_count(struct page *page, long count)
+{
+        totalram_pages += count;
+}
+/* Free the reserved page into the buddy system, so it gets managed. */
+static inline void __free_reserved_page(struct page *page)
+{
+        ClearPageReserved(page);
+        init_page_count(page);
+        __free_page(page);
+}
+static inline void free_reserved_page(struct page *page)
+{
+        __free_reserved_page(page);
+        adjust_managed_page_count(page, 1);
+}
+static inline void mark_page_reserved(struct page *page)
+{
+        SetPageReserved(page);
+        adjust_managed_page_count(page, -1);
+}
+/*
+ * Default method to free all the __init memory into the buddy system.
+ * The freed pages will be poisoned with pattern "poison" if it is
+ * non-zero. Return pages freed into the buddy system.
+ */
+static inline unsigned long free_initmem_default(int poison)
+{
+        extern char __init_begin[], __init_end[];
+        return free_reserved_area(PAGE_ALIGN((unsigned long)&__init_begin) ,
+                                  ((unsigned long)&__init_end) & PAGE_MASK,
+                                  poison, "unused kernel");
+}
 #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
 /*
 * With CONFIG_HAVE_MEMBLOCK_NODE_MAP set, an architecture may initialise its
@@ -1611,6 +1667,8 @@ int vm_insert_pfn(struct vm_area_struct *vma, unsigned long addr,
                        unsigned long pfn);
 int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
                        unsigned long pfn);
+int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len);
 struct page *follow_page_mask(struct vm_area_struct *vma,
                              unsigned long address, unsigned int foll_flags,
@@ -1673,8 +1731,12 @@ int in_gate_area_no_mm(unsigned long addr);
 #define in_gate_area(mm, addr) ({(void)mm; in_gate_area_no_mm(addr);})
 #endif  /* __HAVE_ARCH_GATE_AREA */
+#ifdef CONFIG_SYSCTL
+extern int sysctl_drop_caches;
 int drop_caches_sysctl_handler(struct ctl_table *, int,
                                        void __user *, size_t *, loff_t *);
+#endif
 unsigned long shrink_slab(struct shrink_control *shrink,
                          unsigned long nr_pages_scanned,
                          unsigned long lru_pages);
@@ -1702,12 +1764,12 @@ pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node);
 void *vmemmap_alloc_block(unsigned long size, int node);
 void *vmemmap_alloc_block_buf(unsigned long size, int node);
 void vmemmap_verify(pte_t *, int, unsigned long, unsigned long);
-int vmemmap_populate_basepages(struct page *start_page,
+int vmemmap_populate_basepages(unsigned long start, unsigned long end,
-                                                unsigned long pages, int node);
+                               int node);
-int vmemmap_populate(struct page *start_page, unsigned long pages, int node);
+int vmemmap_populate(unsigned long start, unsigned long end, int node);
 void vmemmap_populate_print_last(void);
 #ifdef CONFIG_MEMORY_HOTPLUG
-void vmemmap_free(struct page *memmap, unsigned long nr_pages);
+void vmemmap_free(unsigned long start, unsigned long end);
 #endif
 void register_page_bootmem_memmap(unsigned long section_nr, struct page *map,
                                  unsigned long size);
@@ -1754,5 +1816,11 @@ static inline unsigned int debug_guardpage_minorder(void) { return 0; }
 static inline bool page_is_guard(struct page *page) { return false; }
 #endif /* CONFIG_DEBUG_PAGEALLOC */
+#if MAX_NUMNODES > 1
+void __init setup_nr_node_ids(void);
+#else
+static inline void setup_nr_node_ids(void) {}
+#endif
 #endif /* __KERNEL__ */
 #endif /* _LINUX_MM_H */
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index c74092eebf5c..5c76737d836b 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -450,7 +450,7 @@ struct zone {
         *
         * present_pages is physical pages existing within the zone, which
         * is calculated as:
-         *      present_pages = spanned_pages - absent_pages(pags in holes);
+         *      present_pages = spanned_pages - absent_pages(pages in holes);
         *
         * managed_pages is present pages managed by the buddy system, which
         * is calculated as (reserved_pages includes pages allocated by the
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 779cf7c4a3d1..b508016fb76d 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -9,6 +9,7 @@
 #ifdef __KERNEL__
 #include <linux/types.h>
+#include <linux/uuid.h>
 typedef unsigned long kernel_ulong_t;
 #endif
@@ -568,4 +569,12 @@ struct ipack_device_id {
        __u32 device;                   /* Device ID or IPACK_ANY_ID */
 };
+#define MEI_CL_MODULE_PREFIX "mei:"
+#define MEI_CL_NAME_SIZE 32
+struct mei_cl_device_id {
+        char name[MEI_CL_NAME_SIZE];
+        kernel_ulong_t driver_info;
+};
 #endif /* LINUX_MOD_DEVICETABLE_H */
diff --git a/include/linux/msi.h b/include/linux/msi.h
index ce93a341337d..20c2d6dd5d25 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -13,14 +13,14 @@ struct msi_msg {
 /* Helper functions */
 struct irq_data;
 struct msi_desc;
-extern void mask_msi_irq(struct irq_data *data);
+void mask_msi_irq(struct irq_data *data);
-extern void unmask_msi_irq(struct irq_data *data);
+void unmask_msi_irq(struct irq_data *data);
-extern void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
+void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
-extern void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
+void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
-extern void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
+void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
-extern void read_msi_msg(unsigned int irq, struct msi_msg *msg);
+void read_msi_msg(unsigned int irq, struct msi_msg *msg);
-extern void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg);
+void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg);
-extern void write_msi_msg(unsigned int irq, struct msi_msg *msg);
+void write_msi_msg(unsigned int irq, struct msi_msg *msg);
 struct msi_desc {
        struct {
@@ -54,9 +54,8 @@ struct msi_desc {
 */
 int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc);
 void arch_teardown_msi_irq(unsigned int irq);
-extern int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
+int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
-extern void arch_teardown_msi_irqs(struct pci_dev *dev);
+void arch_teardown_msi_irqs(struct pci_dev *dev);
-extern int arch_msi_check_device(struct pci_dev* dev, int nvec, int type);
+int arch_msi_check_device(struct pci_dev* dev, int nvec, int type);
 #endif /* LINUX_MSI_H */
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 9121595a8ebf..433da8a1a426 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -53,6 +53,9 @@ struct mutex {
 #if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP)
        struct task_struct      *owner;
 #endif
+#ifdef CONFIG_MUTEX_SPIN_ON_OWNER
+        void                    *spin_mlock;    /* Spinner MCS lock */
+#endif
 #ifdef CONFIG_DEBUG_MUTEXES
        const char              *name;
        void                    *magic;
diff --git a/include/linux/net.h b/include/linux/net.h
index aa1673160a45..99c9f0c103c2 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -240,8 +240,8 @@ do {								\
 #define net_dbg_ratelimited(fmt, ...)                           \
        net_ratelimited_function(pr_debug, fmt, ##__VA_ARGS__)
-#define net_random()            random32()
+#define net_random()            prandom_u32()
-#define net_srandom(seed)       srandom32((__force u32)seed)
+#define net_srandom(seed)       prandom_seed((__force u32)(seed))
 extern int           kernel_sendmsg(struct socket *sock, struct msghdr *msg,
                                    struct kvec *vec, size_t num, size_t len);
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index b3d00fa4b314..6151e903eef0 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -210,9 +210,9 @@ struct netdev_hw_addr {
 #define NETDEV_HW_ADDR_T_SLAVE          3
 #define NETDEV_HW_ADDR_T_UNICAST        4
 #define NETDEV_HW_ADDR_T_MULTICAST      5
-        bool                    synced;
        bool                    global_use;
        int                     refcount;
+        int                     synced;
        struct rcu_head         rcu_head;
 };
@@ -895,7 +895,7 @@ struct netdev_fcoe_hbainfo {
 *
 * int (*ndo_bridge_setlink)(struct net_device *dev, struct nlmsghdr *nlh)
 * int (*ndo_bridge_getlink)(struct sk_buff *skb, u32 pid, u32 seq,
- *                           struct net_device *dev)
+ *                           struct net_device *dev, u32 filter_mask)
 *
 * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier);
 *      Called to change device carrier. Soft-devices (like dummy, team, etc)
diff --git a/include/linux/netfilter/ipset/ip_set_ahash.h b/include/linux/netfilter/ipset/ip_set_ahash.h
index 01d25e6fc792..0214c4c146fa 100644
--- a/include/linux/netfilter/ipset/ip_set_ahash.h
+++ b/include/linux/netfilter/ipset/ip_set_ahash.h
@@ -291,6 +291,7 @@ ip_set_hash_destroy(struct ip_set *set)
 #define type_pf_data_tlist      TOKEN(TYPE, PF, _data_tlist)
 #define type_pf_data_next       TOKEN(TYPE, PF, _data_next)
 #define type_pf_data_flags      TOKEN(TYPE, PF, _data_flags)
+#define type_pf_data_reset_flags TOKEN(TYPE, PF, _data_reset_flags)
 #ifdef IP_SET_HASH_WITH_NETS
 #define type_pf_data_match      TOKEN(TYPE, PF, _data_match)
 #else
@@ -385,9 +386,9 @@ type_pf_resize(struct ip_set *set, bool retried)
        struct ip_set_hash *h = set->data;
        struct htable *t, *orig = h->table;
        u8 htable_bits = orig->htable_bits;
-        const struct type_pf_elem *data;
+        struct type_pf_elem *data;
        struct hbucket *n, *m;
-        u32 i, j;
+        u32 i, j, flags = 0;
        int ret;
 retry:
@@ -412,9 +413,16 @@ retry:
                n = hbucket(orig, i);
                for (j = 0; j < n->pos; j++) {
                        data = ahash_data(n, j);
+#ifdef IP_SET_HASH_WITH_NETS
+                        flags = 0;
+                        type_pf_data_reset_flags(data, &flags);
+#endif
                        m = hbucket(t, HKEY(data, h->initval, htable_bits));
-                        ret = type_pf_elem_add(m, data, AHASH_MAX(h), 0);
+                        ret = type_pf_elem_add(m, data, AHASH_MAX(h), flags);
                        if (ret < 0) {
+#ifdef IP_SET_HASH_WITH_NETS
+                                type_pf_data_flags(data, flags);
+#endif
                                read_unlock_bh(&set->lock);
                                ahash_destroy(t);
                                if (ret == -EAGAIN)
@@ -836,9 +844,9 @@ type_pf_tresize(struct ip_set *set, bool retried)
        struct ip_set_hash *h = set->data;
        struct htable *t, *orig = h->table;
        u8 htable_bits = orig->htable_bits;
-        const struct type_pf_elem *data;
+        struct type_pf_elem *data;
        struct hbucket *n, *m;
-        u32 i, j;
+        u32 i, j, flags = 0;
        int ret;
        /* Try to cleanup once */
@@ -873,10 +881,17 @@ retry:
                n = hbucket(orig, i);
                for (j = 0; j < n->pos; j++) {
                        data = ahash_tdata(n, j);
+#ifdef IP_SET_HASH_WITH_NETS
+                        flags = 0;
+                        type_pf_data_reset_flags(data, &flags);
+#endif
                        m = hbucket(t, HKEY(data, h->initval, htable_bits));
-                        ret = type_pf_elem_tadd(m, data, AHASH_MAX(h), 0,
+                        ret = type_pf_elem_tadd(m, data, AHASH_MAX(h), flags,
-                                                ip_set_timeout_get(type_pf_data_timeout(data)));
+                                ip_set_timeout_get(type_pf_data_timeout(data)));
                        if (ret < 0) {
+#ifdef IP_SET_HASH_WITH_NETS
+                                type_pf_data_flags(data, flags);
+#endif
                                read_unlock_bh(&set->lock);
                                ahash_destroy(t);
                                if (ret == -EAGAIN)
@@ -1187,6 +1202,7 @@ type_pf_gc_init(struct ip_set *set)
 #undef type_pf_data_tlist
 #undef type_pf_data_next
 #undef type_pf_data_flags
+#undef type_pf_data_reset_flags
 #undef type_pf_data_match
 #undef type_pf_elem
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 1cc25682b20b..fc01d5cb4cf1 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -59,11 +59,18 @@ struct nfs_lockowner {
        pid_t l_pid;
 };
+#define NFS_IO_INPROGRESS 0
+struct nfs_io_counter {
+        unsigned long flags;
+        atomic_t io_count;
+};
 struct nfs_lock_context {
        atomic_t count;
        struct list_head list;
        struct nfs_open_context *open_context;
        struct nfs_lockowner lockowner;
+        struct nfs_io_counter io_count;
 };
 struct nfs4_state;
@@ -77,6 +84,7 @@ struct nfs_open_context {
        unsigned long flags;
 #define NFS_CONTEXT_ERROR_WRITE         (0)
 #define NFS_CONTEXT_RESEND_WRITES       (1)
+#define NFS_CONTEXT_BAD                 (2)
        int error;
        struct list_head list;
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 6c6ed153a9b4..3b7fa2abecca 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -40,6 +40,7 @@ struct nfs_client {
 #define NFS_CS_NORESVPORT       0               /* - use ephemeral src port */
 #define NFS_CS_DISCRTRY         1               /* - disconnect on RPC retry */
 #define NFS_CS_MIGRATION        2               /* - transparent state migr */
+#define NFS_CS_INFINITE_SLOTS   3               /* - don't limit TCP slots */
        struct sockaddr_storage cl_addr;        /* server identifier */
        size_t                  cl_addrlen;
        char *                  cl_hostname;    /* hostname of server */
@@ -197,5 +198,7 @@ struct nfs_server {
 #define NFS_CAP_MTIME           (1U << 13)
 #define NFS_CAP_POSIX_LOCK      (1U << 14)
 #define NFS_CAP_UIDGID_NOMAP    (1U << 15)
+#define NFS_CAP_STATEID_NFSV41  (1U << 16)
+#define NFS_CAP_ATOMIC_OPEN_V1  (1U << 17)
 #endif
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 4b993d358dad..766c5bc9d441 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -14,9 +14,6 @@
 #define NFS_DEF_FILE_IO_SIZE    (4096U)
 #define NFS_MIN_FILE_IO_SIZE    (1024U)
-/* Forward declaration for NFS v3 */
-struct nfs4_secinfo_flavors;
 struct nfs4_string {
        unsigned int len;
        char *data;
@@ -349,6 +346,7 @@ struct nfs_openargs {
        const u32 *             bitmask;
        const u32 *             open_bitmap;
        __u32                   claim;
+        enum createmode4        createmode;
 };
 struct nfs_openres {
@@ -486,6 +484,7 @@ struct nfs_readargs {
        struct nfs_fh *         fh;
        struct nfs_open_context *context;
        struct nfs_lock_context *lock_context;
+        nfs4_stateid            stateid;
        __u64                   offset;
        __u32                   count;
        unsigned int            pgbase;
@@ -507,6 +506,7 @@ struct nfs_writeargs {
        struct nfs_fh *         fh;
        struct nfs_open_context *context;
        struct nfs_lock_context *lock_context;
+        nfs4_stateid            stateid;
        __u64                   offset;
        __u32                   count;
        enum nfs3_stable_how    stable;
@@ -1050,25 +1050,14 @@ struct nfs4_fs_locations_res {
        struct nfs4_fs_locations       *fs_locations;
 };
-struct nfs4_secinfo_oid {
+struct nfs4_secinfo4 {
-        unsigned int len;
+        u32                     flavor;
-        char data[GSS_OID_MAX_LEN];
+        struct rpcsec_gss_info  flavor_info;
-};
-struct nfs4_secinfo_gss {
-        struct nfs4_secinfo_oid sec_oid4;
-        unsigned int qop4;
-        unsigned int service;
-};
-struct nfs4_secinfo_flavor {
-        unsigned int            flavor;
-        struct nfs4_secinfo_gss gss;
 };
 struct nfs4_secinfo_flavors {
-        unsigned int num_flavors;
+        unsigned int            num_flavors;
-        struct nfs4_secinfo_flavor flavors[0];
+        struct nfs4_secinfo4    flavors[0];
 };
 struct nfs4_secinfo_arg {
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index d65746efc954..d14a4c362465 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -47,8 +47,11 @@
 * runtime initialization.
 */
+typedef int (*notifier_fn_t)(struct notifier_block *nb,
+                        unsigned long action, void *data);
 struct notifier_block {
-        int (*notifier_call)(struct notifier_block *, unsigned long, void *);
+        notifier_fn_t notifier_call;
        struct notifier_block __rcu *next;
        int priority;
 };
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 0e38e13eb249..e3dea75a078b 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -149,7 +149,7 @@ static inline int page_cache_get_speculative(struct page *page)
 {
        VM_BUG_ON(in_interrupt());
-#if !defined(CONFIG_SMP) && defined(CONFIG_TREE_RCU)
+#ifdef CONFIG_TINY_RCU
 # ifdef CONFIG_PREEMPT_COUNT
        VM_BUG_ON(!in_atomic());
 # endif
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
index 9a22b5efb384..81b31613eb25 100644
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
@@ -41,8 +41,37 @@ static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
        return DEVICE_ACPI_HANDLE(dev);
 }
+void acpi_pci_add_bus(struct pci_bus *bus);
+void acpi_pci_remove_bus(struct pci_bus *bus);
+#ifdef  CONFIG_ACPI_PCI_SLOT
+void acpi_pci_slot_init(void);
+void acpi_pci_slot_enumerate(struct pci_bus *bus, acpi_handle handle);
+void acpi_pci_slot_remove(struct pci_bus *bus);
+#else
+static inline void acpi_pci_slot_init(void) { }
+static inline void acpi_pci_slot_enumerate(struct pci_bus *bus,
+                                           acpi_handle handle) { }
+static inline void acpi_pci_slot_remove(struct pci_bus *bus) { }
 #endif
+#ifdef  CONFIG_HOTPLUG_PCI_ACPI
+void acpiphp_init(void);
+void acpiphp_enumerate_slots(struct pci_bus *bus, acpi_handle handle);
+void acpiphp_remove_slots(struct pci_bus *bus);
+#else
+static inline void acpiphp_init(void) { }
+static inline void acpiphp_enumerate_slots(struct pci_bus *bus,
+                                           acpi_handle handle) { }
+static inline void acpiphp_remove_slots(struct pci_bus *bus) { }
+#endif
+#else   /* CONFIG_ACPI */
+static inline void acpi_pci_add_bus(struct pci_bus *bus) { }
+static inline void acpi_pci_remove_bus(struct pci_bus *bus) { }
+#endif  /* CONFIG_ACPI */
 #ifdef CONFIG_ACPI_APEI
 extern bool aer_acpi_firmware_first(void);
 #else
diff --git a/include/linux/pci-aspm.h b/include/linux/pci-aspm.h
index c8320144fe79..8af4610c2e41 100644
--- a/include/linux/pci-aspm.h
+++ b/include/linux/pci-aspm.h
@@ -23,14 +23,14 @@
 #define PCIE_LINK_STATE_CLKPM   4
 #ifdef CONFIG_PCIEASPM
-extern void pcie_aspm_init_link_state(struct pci_dev *pdev);
+void pcie_aspm_init_link_state(struct pci_dev *pdev);
-extern void pcie_aspm_exit_link_state(struct pci_dev *pdev);
+void pcie_aspm_exit_link_state(struct pci_dev *pdev);
-extern void pcie_aspm_pm_state_change(struct pci_dev *pdev);
+void pcie_aspm_pm_state_change(struct pci_dev *pdev);
-extern void pcie_aspm_powersave_config_link(struct pci_dev *pdev);
+void pcie_aspm_powersave_config_link(struct pci_dev *pdev);
-extern void pci_disable_link_state(struct pci_dev *pdev, int state);
+void pci_disable_link_state(struct pci_dev *pdev, int state);
-extern void pci_disable_link_state_locked(struct pci_dev *pdev, int state);
+void pci_disable_link_state_locked(struct pci_dev *pdev, int state);
-extern void pcie_clear_aspm(struct pci_bus *bus);
+void pcie_clear_aspm(struct pci_bus *bus);
-extern void pcie_no_aspm(void);
+void pcie_no_aspm(void);
 #else
 static inline void pcie_aspm_init_link_state(struct pci_dev *pdev)
 {
@@ -56,8 +56,8 @@ static inline void pcie_no_aspm(void)
 #endif
 #ifdef CONFIG_PCIEASPM_DEBUG /* this depends on CONFIG_PCIEASPM */
-extern void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev);
+void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev);
-extern void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev);
+void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev);
 #else
 static inline void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev)
 {
diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h
index 7ef68724f0f0..68bcefd7fca0 100644
--- a/include/linux/pci-ats.h
+++ b/include/linux/pci-ats.h
@@ -14,9 +14,9 @@ struct pci_ats {
 #ifdef CONFIG_PCI_ATS
-extern int pci_enable_ats(struct pci_dev *dev, int ps);
+int pci_enable_ats(struct pci_dev *dev, int ps);
-extern void pci_disable_ats(struct pci_dev *dev);
+void pci_disable_ats(struct pci_dev *dev);
-extern int pci_ats_queue_depth(struct pci_dev *dev);
+int pci_ats_queue_depth(struct pci_dev *dev);
 /**
 * pci_ats_enabled - query the ATS status
@@ -54,12 +54,12 @@ static inline int pci_ats_enabled(struct pci_dev *dev)
 #ifdef CONFIG_PCI_PRI
-extern int  pci_enable_pri(struct pci_dev *pdev, u32 reqs);
+int pci_enable_pri(struct pci_dev *pdev, u32 reqs);
-extern void pci_disable_pri(struct pci_dev *pdev);
+void pci_disable_pri(struct pci_dev *pdev);
-extern bool pci_pri_enabled(struct pci_dev *pdev);
+bool pci_pri_enabled(struct pci_dev *pdev);
-extern int  pci_reset_pri(struct pci_dev *pdev);
+int pci_reset_pri(struct pci_dev *pdev);
-extern bool pci_pri_stopped(struct pci_dev *pdev);
+bool pci_pri_stopped(struct pci_dev *pdev);
-extern int  pci_pri_status(struct pci_dev *pdev);
+int pci_pri_status(struct pci_dev *pdev);
 #else /* CONFIG_PCI_PRI */
@@ -95,10 +95,10 @@ static inline int pci_pri_status(struct pci_dev *pdev)
 #ifdef CONFIG_PCI_PASID
-extern int pci_enable_pasid(struct pci_dev *pdev, int features);
+int pci_enable_pasid(struct pci_dev *pdev, int features);
-extern void pci_disable_pasid(struct pci_dev *pdev);
+void pci_disable_pasid(struct pci_dev *pdev);
-extern int pci_pasid_features(struct pci_dev *pdev);
+int pci_pasid_features(struct pci_dev *pdev);
-extern int pci_max_pasids(struct pci_dev *pdev);
+int pci_max_pasids(struct pci_dev *pdev);
 #else  /* CONFIG_PCI_PASID */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 2461033a7987..e73dfa308b87 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -35,6 +35,21 @@
 /* Include the ID list */
 #include <linux/pci_ids.h>
+/*
+ * The PCI interface treats multi-function devices as independent
+ * devices.  The slot/function address of each device is encoded
+ * in a single byte as follows:
+ *
+ *      7:3 = slot
+ *      2:0 = function
+ * PCI_DEVFN(), PCI_SLOT(), and PCI_FUNC() are defined uapi/linux/pci.h
+ * In the interest of not exposing interfaces to user-space unnecessarily,
+ * the following kernel only defines are being added here.
+ */
+#define PCI_DEVID(bus, devfn)  ((((u16)bus) << 8) | devfn)
+/* return bus from PCI devid = ((u16)bus_number) << 8) | devfn */
+#define PCI_BUS_NUM(x) (((x) >> 8) & 0xff)
 /* pci_slot represents a physical slot */
 struct pci_slot {
        struct pci_bus *bus;            /* The bus this slot is on */
@@ -232,6 +247,8 @@ struct pci_dev {
        u8              revision;       /* PCI revision, low byte of class word */
        u8              hdr_type;       /* PCI header type (`multi' flag masked out) */
        u8              pcie_cap;       /* PCI-E capability offset */
+        u8              msi_cap;        /* MSI capability offset */
+        u8              msix_cap;       /* MSI-X capability offset */
        u8              pcie_mpss:3;    /* PCI-E Max Payload Size Supported */
        u8              rom_base_reg;   /* which config register controls the ROM */
        u8              pin;            /* which interrupt pin this device uses */
@@ -249,8 +266,7 @@ struct pci_dev {
        pci_power_t     current_state;  /* Current operating state. In ACPI-speak,
                                           this is D0-D3, D0 being fully functional,
                                           and D3 being off. */
-        int             pm_cap;         /* PM capability offset in the
+        u8              pm_cap;         /* PM capability offset */
-                                           configuration space */
        unsigned int    pme_support:5;  /* Bitmask of states from which PME#
                                           can be generated */
        unsigned int    pme_interrupt:1;
@@ -348,7 +364,7 @@ static inline struct pci_dev *pci_physfn(struct pci_dev *dev)
        return dev;
 }
-extern struct pci_dev *alloc_pci_dev(void);
+struct pci_dev *alloc_pci_dev(void);
 #define to_pci_dev(n) container_of(n, struct pci_dev, dev)
 #define for_each_pci_dev(d) while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)
@@ -504,10 +520,10 @@ struct pci_ops {
 * ACPI needs to be able to access PCI config space before we've done a
 * PCI bus scan and created pci_bus structures.
 */
-extern int raw_pci_read(unsigned int domain, unsigned int bus,
+int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
-                        unsigned int devfn, int reg, int len, u32 *val);
+                 int reg, int len, u32 *val);
-extern int raw_pci_write(unsigned int domain, unsigned int bus,
+int raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn,
-                        unsigned int devfn, int reg, int len, u32 val);
+                  int reg, int len, u32 val);
 struct pci_bus_region {
        resource_size_t start;
@@ -658,7 +674,7 @@ struct pci_driver {
 /* these external functions are only available when PCI support is enabled */
 #ifdef CONFIG_PCI
-extern void pcie_bus_configure_settings(struct pci_bus *bus, u8 smpss);
+void pcie_bus_configure_settings(struct pci_bus *bus, u8 smpss);
 enum pcie_bus_config_types {
        PCIE_BUS_TUNE_OFF,
@@ -675,9 +691,11 @@ extern struct bus_type pci_bus_type;
 * code, or pci core code. */
 extern struct list_head pci_root_buses; /* list of all known PCI buses */
 /* Some device drivers need know if pci is initiated */
-extern int no_pci_devices(void);
+int no_pci_devices(void);
 void pcibios_resource_survey_bus(struct pci_bus *bus);
+void pcibios_add_bus(struct pci_bus *bus);
+void pcibios_remove_bus(struct pci_bus *bus);
 void pcibios_fixup_bus(struct pci_bus *);
 int __must_check pcibios_enable_device(struct pci_dev *, int mask);
 /* Architecture specific versions may override this (weak) */
@@ -699,7 +717,7 @@ void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
 void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
                             struct pci_bus_region *region);
 void pcibios_scan_specific_bus(int busn);
-extern struct pci_bus *pci_find_bus(int domain, int busnr);
+struct pci_bus *pci_find_bus(int domain, int busnr);
 void pci_bus_add_devices(const struct pci_bus *bus);
 struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
                                      struct pci_ops *ops, void *sysdata);
@@ -732,14 +750,14 @@ struct resource *pci_find_parent_resource(const struct pci_dev *dev,
 u8 pci_swizzle_interrupt_pin(const struct pci_dev *dev, u8 pin);
 int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge);
 u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp);
-extern struct pci_dev *pci_dev_get(struct pci_dev *dev);
+struct pci_dev *pci_dev_get(struct pci_dev *dev);
-extern void pci_dev_put(struct pci_dev *dev);
+void pci_dev_put(struct pci_dev *dev);
-extern void pci_remove_bus(struct pci_bus *b);
+void pci_remove_bus(struct pci_bus *b);
-extern void pci_stop_and_remove_bus_device(struct pci_dev *dev);
+void pci_stop_and_remove_bus_device(struct pci_dev *dev);
 void pci_stop_root_bus(struct pci_bus *bus);
 void pci_remove_root_bus(struct pci_bus *bus);
 void pci_setup_cardbus(struct pci_bus *bus);
-extern void pci_sort_breadthfirst(void);
+void pci_sort_breadthfirst(void);
 #define dev_is_pci(d) ((d)->bus == &pci_bus_type)
 #define dev_is_pf(d) ((dev_is_pci(d) ? to_pci_dev(d)->is_physfn : false))
 #define dev_num_vf(d) ((dev_is_pci(d) ? pci_num_vf(to_pci_dev(d)) : 0))
@@ -916,6 +934,7 @@ void pci_disable_rom(struct pci_dev *pdev);
 void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size);
 void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom);
 size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size);
+void __iomem __must_check *pci_platform_rom(struct pci_dev *pdev, size_t *size);
 /* Power management related routines */
 int pci_save_state(struct pci_dev *dev);
@@ -1141,18 +1160,17 @@ static inline int pci_msi_enabled(void)
        return 0;
 }
 #else
-extern int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec);
+int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec);
-extern int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec);
+int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec);
-extern void pci_msi_shutdown(struct pci_dev *dev);
+void pci_msi_shutdown(struct pci_dev *dev);
-extern void pci_disable_msi(struct pci_dev *dev);
+void pci_disable_msi(struct pci_dev *dev);
-extern int pci_msix_table_size(struct pci_dev *dev);
+int pci_msix_table_size(struct pci_dev *dev);
-extern int pci_enable_msix(struct pci_dev *dev,
+int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec);
-        struct msix_entry *entries, int nvec);
+void pci_msix_shutdown(struct pci_dev *dev);
-extern void pci_msix_shutdown(struct pci_dev *dev);
+void pci_disable_msix(struct pci_dev *dev);
-extern void pci_disable_msix(struct pci_dev *dev);
+void msi_remove_pci_irq_vectors(struct pci_dev *dev);
-extern void msi_remove_pci_irq_vectors(struct pci_dev *dev);
+void pci_restore_msi_state(struct pci_dev *dev);
-extern void pci_restore_msi_state(struct pci_dev *dev);
+int pci_msi_enabled(void);
-extern int pci_msi_enabled(void);
 #endif
 #ifdef CONFIG_PCIEPORTBUS
@@ -1167,8 +1185,8 @@ extern bool pcie_ports_auto;
 static inline int pcie_aspm_enabled(void) { return 0; }
 static inline bool pcie_aspm_support_enabled(void) { return false; }
 #else
-extern int pcie_aspm_enabled(void);
+int pcie_aspm_enabled(void);
-extern bool pcie_aspm_support_enabled(void);
+bool pcie_aspm_support_enabled(void);
 #endif
 #ifdef CONFIG_PCIEAER
@@ -1186,8 +1204,8 @@ static inline void pcie_set_ecrc_checking(struct pci_dev *dev)
 }
 static inline void pcie_ecrc_get_policy(char *str) {};
 #else
-extern void pcie_set_ecrc_checking(struct pci_dev *dev);
+void pcie_set_ecrc_checking(struct pci_dev *dev);
-extern void pcie_ecrc_get_policy(char *str);
+void pcie_ecrc_get_policy(char *str);
 #endif
 #define pci_enable_msi(pdev)    pci_enable_msi_block(pdev, 1)
@@ -1198,9 +1216,9 @@ int  ht_create_irq(struct pci_dev *dev, int idx);
 void ht_destroy_irq(unsigned int irq);
 #endif /* CONFIG_HT_IRQ */
-extern void pci_cfg_access_lock(struct pci_dev *dev);
+void pci_cfg_access_lock(struct pci_dev *dev);
-extern bool pci_cfg_access_trylock(struct pci_dev *dev);
+bool pci_cfg_access_trylock(struct pci_dev *dev);
-extern void pci_cfg_access_unlock(struct pci_dev *dev);
+void pci_cfg_access_unlock(struct pci_dev *dev);
 /*
 * PCI domain support.  Sometimes called PCI segment (eg by ACPI),
@@ -1225,7 +1243,7 @@ static inline int pci_proc_domain(struct pci_bus *bus)
 /* some architectures require additional setup to direct VGA traffic */
 typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode,
                      unsigned int command_bits, u32 flags);
-extern void pci_register_set_vga_state(arch_set_vga_state_t func);
+void pci_register_set_vga_state(arch_set_vga_state_t func);
 #else /* CONFIG_PCI is not enabled */
@@ -1627,8 +1645,8 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev,
 int pcibios_add_device(struct pci_dev *dev);
 #ifdef CONFIG_PCI_MMCONFIG
-extern void __init pci_mmcfg_early_init(void);
+void __init pci_mmcfg_early_init(void);
-extern void __init pci_mmcfg_late_init(void);
+void __init pci_mmcfg_late_init(void);
 #else
 static inline void pci_mmcfg_early_init(void) { }
 static inline void pci_mmcfg_late_init(void) { }
@@ -1639,12 +1657,12 @@ int pci_ext_cfg_avail(void);
 void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
 #ifdef CONFIG_PCI_IOV
-extern int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
+int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
-extern void pci_disable_sriov(struct pci_dev *dev);
+void pci_disable_sriov(struct pci_dev *dev);
-extern irqreturn_t pci_sriov_migration(struct pci_dev *dev);
+irqreturn_t pci_sriov_migration(struct pci_dev *dev);
-extern int pci_num_vf(struct pci_dev *dev);
+int pci_num_vf(struct pci_dev *dev);
-extern int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);
+int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);
-extern int pci_sriov_get_totalvfs(struct pci_dev *dev);
+int pci_sriov_get_totalvfs(struct pci_dev *dev);
 #else
 static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)
 {
@@ -1672,8 +1690,8 @@ static inline int pci_sriov_get_totalvfs(struct pci_dev *dev)
 #endif
 #if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE)
-extern void pci_hp_create_module_link(struct pci_slot *pci_slot);
+void pci_hp_create_module_link(struct pci_slot *pci_slot);
-extern void pci_hp_remove_module_link(struct pci_slot *pci_slot);
+void pci_hp_remove_module_link(struct pci_slot *pci_slot);
 #endif
 /**
@@ -1817,13 +1835,13 @@ int pci_vpd_find_info_keyword(const u8 *buf, unsigned int off,
 /* PCI <-> OF binding helpers */
 #ifdef CONFIG_OF
 struct device_node;
-extern void pci_set_of_node(struct pci_dev *dev);
+void pci_set_of_node(struct pci_dev *dev);
-extern void pci_release_of_node(struct pci_dev *dev);
+void pci_release_of_node(struct pci_dev *dev);
-extern void pci_set_bus_of_node(struct pci_bus *bus);
+void pci_set_bus_of_node(struct pci_bus *bus);
-extern void pci_release_bus_of_node(struct pci_bus *bus);
+void pci_release_bus_of_node(struct pci_bus *bus);
 /* Arch may override this (weak) */
-extern struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus);
+struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);
 static inline struct device_node *
 pci_device_to_OF_node(const struct pci_dev *pdev)
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
index 45fc162cbdc0..8db71dcd6337 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -125,12 +125,12 @@ static inline const char *hotplug_slot_name(const struct hotplug_slot *slot)
        return pci_slot_name(slot->pci_slot);
 }
-extern int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *pbus,
+int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *pbus, int nr,
-                             int nr, const char *name,
+                      const char *name, struct module *owner,
-                             struct module *owner, const char *mod_name);
+                      const char *mod_name);
-extern int pci_hp_deregister(struct hotplug_slot *slot);
+int pci_hp_deregister(struct hotplug_slot *slot);
-extern int __must_check pci_hp_change_slot_info (struct hotplug_slot *slot,
+int __must_check pci_hp_change_slot_info(struct hotplug_slot *slot,
-                                                 struct hotplug_slot_info *info);
+                                         struct hotplug_slot_info *info);
 /* use a define to avoid include chaining to get THIS_MODULE & friends */
 #define pci_hp_register(slot, pbus, devnr, name) \
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index f11c1c2609d5..2b85c521f737 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -524,6 +524,8 @@
 #define PCI_DEVICE_ID_AMD_15H_NB_F3     0x1603
 #define PCI_DEVICE_ID_AMD_15H_NB_F4     0x1604
 #define PCI_DEVICE_ID_AMD_15H_NB_F5     0x1605
+#define PCI_DEVICE_ID_AMD_16H_NB_F3     0x1533
+#define PCI_DEVICE_ID_AMD_16H_NB_F4     0x1534
 #define PCI_DEVICE_ID_AMD_CNB17H_F3     0x1703
 #define PCI_DEVICE_ID_AMD_LANCE         0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME    0x2001
@@ -1604,6 +1606,7 @@
 #define PCI_SUBDEVICE_ID_KEYSPAN_SX2    0x5334
 #define PCI_VENDOR_ID_MARVELL           0x11ab
+#define PCI_VENDOR_ID_MARVELL_EXT       0x1b4b
 #define PCI_DEVICE_ID_MARVELL_GT64111   0x4146
 #define PCI_DEVICE_ID_MARVELL_GT64260   0x6430
 #define PCI_DEVICE_ID_MARVELL_MV64360   0x6460
diff --git a/include/linux/pcieport_if.h b/include/linux/pcieport_if.h
index e6f91b1406d8..9572669eea97 100644
--- a/include/linux/pcieport_if.h
+++ b/include/linux/pcieport_if.h
@@ -62,7 +62,7 @@ struct pcie_port_service_driver {
 #define to_service_driver(d) \
        container_of(d, struct pcie_port_service_driver, driver)
-extern int pcie_port_service_register(struct pcie_port_service_driver *new);
+int pcie_port_service_register(struct pcie_port_service_driver *new);
-extern void pcie_port_service_unregister(struct pcie_port_service_driver *new);
+void pcie_port_service_unregister(struct pcie_port_service_driver *new);
 #endif /* _PCIEPORT_IF_H_ */
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 1d795df6f4cf..e0373d26c244 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -21,7 +21,6 @@
 */
 #ifdef CONFIG_PERF_EVENTS
-# include <linux/cgroup.h>
 # include <asm/perf_event.h>
 # include <asm/local64.h>
 #endif
@@ -128,6 +127,7 @@ struct hw_perf_event {
                        int             event_base_rdpmc;
                        int             idx;
                        int             last_cpu;
+                        int             flags;
                        struct hw_perf_event_extra extra_reg;
                        struct hw_perf_event_extra branch_reg;
@@ -299,22 +299,7 @@ struct swevent_hlist {
 #define PERF_ATTACH_GROUP       0x02
 #define PERF_ATTACH_TASK        0x04
-#ifdef CONFIG_CGROUP_PERF
+struct perf_cgroup;
-/*
- * perf_cgroup_info keeps track of time_enabled for a cgroup.
- * This is a per-cpu dynamically allocated data structure.
- */
-struct perf_cgroup_info {
-        u64                             time;
-        u64                             timestamp;
-};
-struct perf_cgroup {
-        struct                          cgroup_subsys_state css;
-        struct                          perf_cgroup_info *info; /* timing info, one per cpu */
-};
-#endif
 struct ring_buffer;
 /**
@@ -583,11 +568,13 @@ struct perf_sample_data {
                u32     reserved;
        }                               cpu_entry;
        u64                             period;
+        union  perf_mem_data_src        data_src;
        struct perf_callchain_entry     *callchain;
        struct perf_raw_record          *raw;
        struct perf_branch_stack        *br_stack;
        struct perf_regs_user           regs_user;
        u64                             stack_user_size;
+        u64                             weight;
 };
 static inline void perf_sample_data_init(struct perf_sample_data *data,
@@ -601,6 +588,8 @@ static inline void perf_sample_data_init(struct perf_sample_data *data,
        data->regs_user.abi = PERF_SAMPLE_REGS_ABI_NONE;
        data->regs_user.regs = NULL;
        data->stack_user_size = 0;
+        data->weight = 0;
+        data->data_src.val = 0;
 }
 extern void perf_output_sample(struct perf_output_handle *handle,
@@ -831,6 +820,7 @@ do {									\
 struct perf_pmu_events_attr {
        struct device_attribute attr;
        u64 id;
+        const char *event_str;
 };
 #define PMU_EVENT_ATTR(_name, _var, _id, _show)                         \
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
index 215e5e3dda10..8ac32836690e 100644
--- a/include/linux/pid_namespace.h
+++ b/include/linux/pid_namespace.h
@@ -13,7 +13,9 @@ struct pidmap {
       void *page;
 };
-#define PIDMAP_ENTRIES         ((PID_MAX_LIMIT + 8*PAGE_SIZE - 1)/PAGE_SIZE/8)
+#define BITS_PER_PAGE           (PAGE_SIZE * 8)
+#define BITS_PER_PAGE_MASK      (BITS_PER_PAGE-1)
+#define PIDMAP_ENTRIES          ((PID_MAX_LIMIT+BITS_PER_PAGE-1)/BITS_PER_PAGE)
 struct bsd_acct_struct;
diff --git a/include/linux/pinctrl/pinconf.h b/include/linux/pinctrl/pinconf.h
index e7a720104a47..1ad4f31ef6b8 100644
--- a/include/linux/pinctrl/pinconf.h
+++ b/include/linux/pinctrl/pinconf.h
@@ -14,6 +14,8 @@
 #ifdef CONFIG_PINCONF
+#include <linux/pinctrl/machine.h>
 struct pinctrl_dev;
 struct seq_file;
@@ -28,6 +30,7 @@ struct seq_file;
 * @pin_config_set: configure an individual pin
 * @pin_config_group_get: get configurations for an entire pin group
 * @pin_config_group_set: configure all pins in a group
+ * @pin_config_group_dbg_set: optional debugfs to modify a pin configuration
 * @pin_config_dbg_show: optional debugfs display hook that will provide
 *      per-device info for a certain pin in debugfs
 * @pin_config_group_dbg_show: optional debugfs display hook that will provide
@@ -51,6 +54,9 @@ struct pinconf_ops {
        int (*pin_config_group_set) (struct pinctrl_dev *pctldev,
                                     unsigned selector,
                                     unsigned long config);
+        int (*pin_config_dbg_parse_modify) (struct pinctrl_dev *pctldev,
+                                           const char *arg,
+                                           unsigned long *config);
        void (*pin_config_dbg_show) (struct pinctrl_dev *pctldev,
                                     struct seq_file *s,
                                     unsigned offset);
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
index 778804df293f..2c2a9e8d8578 100644
--- a/include/linux/pinctrl/pinctrl.h
+++ b/include/linux/pinctrl/pinctrl.h
@@ -118,9 +118,9 @@ struct pinctrl_desc {
        const char *name;
        struct pinctrl_pin_desc const *pins;
        unsigned int npins;
-        struct pinctrl_ops *pctlops;
+        const struct pinctrl_ops *pctlops;
-        struct pinmux_ops *pmxops;
+        const struct pinmux_ops *pmxops;
-        struct pinconf_ops *confops;
+        const struct pinconf_ops *confops;
        struct module *owner;
 };
diff --git a/include/linux/platform_data/clk-lpss.h b/include/linux/platform_data/clk-lpss.h
new file mode 100644
index 000000000000..528e73ce46d2
--- /dev/null
+++ b/include/linux/platform_data/clk-lpss.h
@@ -0,0 +1,18 @@
+/*
+ * Intel Low Power Subsystem clocks.
+ *
+ * Copyright (C) 2013, Intel Corporation
+ * Authors: Mika Westerberg <mika.westerberg@linux.intel.com>
+ *          Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __CLK_LPSS_H
+#define __CLK_LPSS_H
+extern int lpt_clk_init(void);
+#endif /* __CLK_LPSS_H */
diff --git a/include/linux/platform_data/coda.h b/include/linux/platform_data/coda.h
new file mode 100644
index 000000000000..6ad4410d9e20
--- /dev/null
+++ b/include/linux/platform_data/coda.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2013 Philipp Zabel, Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef PLATFORM_CODA_H
+#define PLATFORM_CODA_H
+struct device;
+struct coda_platform_data {
+        struct device *iram_dev;
+};
+#endif
diff --git a/include/linux/platform_data/dwc3-omap.h b/include/linux/platform_data/dwc3-omap.h
index ada401244e0b..1d36ca874cc8 100644
--- a/include/linux/platform_data/dwc3-omap.h
+++ b/include/linux/platform_data/dwc3-omap.h
@@ -41,7 +41,3 @@ enum dwc3_omap_utmi_mode {
        DWC3_OMAP_UTMI_MODE_HW,
        DWC3_OMAP_UTMI_MODE_SW,
 };
-struct dwc3_omap_data {
-        enum dwc3_omap_utmi_mode        utmi_mode;
-};
diff --git a/include/linux/platform_data/emif_plat.h b/include/linux/platform_data/emif_plat.h
index 03378ca84061..5c19a2a647c4 100644
--- a/include/linux/platform_data/emif_plat.h
+++ b/include/linux/platform_data/emif_plat.h
@@ -40,6 +40,7 @@
 /* Custom config requests */
 #define EMIF_CUSTOM_CONFIG_LPMODE                       0x00000001
 #define EMIF_CUSTOM_CONFIG_TEMP_ALERT_POLL_INTERVAL     0x00000002
+#define EMIF_CUSTOM_CONFIG_EXTENDED_TEMP_PART           0x00000004
 #ifndef __ASSEMBLY__
 /**
diff --git a/include/linux/platform_data/lp855x.h b/include/linux/platform_data/lp855x.h
index 20ee8b221dbd..ea3200527dd3 100644
--- a/include/linux/platform_data/lp855x.h
+++ b/include/linux/platform_data/lp855x.h
@@ -69,11 +69,6 @@ enum lp855x_chip_id {
        LP8557,
 };
-enum lp855x_brightness_ctrl_mode {
-        PWM_BASED = 1,
-        REGISTER_BASED,
-};
 enum lp8550_brighntess_source {
        LP8550_PWM_ONLY,
        LP8550_I2C_ONLY = 2,
@@ -116,24 +111,18 @@ struct lp855x_rom_data {
 /**
 * struct lp855x_platform_data
 * @name : Backlight driver name. If it is not defined, default name is set.
- * @mode : brightness control by pwm or lp855x register
 * @device_control : value of DEVICE CONTROL register
 * @initial_brightness : initial value of backlight brightness
 * @period_ns : platform specific pwm period value. unit is nano.
                Only valid when mode is PWM_BASED.
- * @load_new_rom_data :
-        0 : use default configuration data
-        1 : update values of eeprom or eprom registers on loading driver
 * @size_program : total size of lp855x_rom_data
 * @rom_data : list of new eeprom/eprom registers
 */
 struct lp855x_platform_data {
-        char *name;
+        const char *name;
-        enum lp855x_brightness_ctrl_mode mode;
        u8 device_control;
-        int initial_brightness;
+        u8 initial_brightness;
        unsigned int period_ns;
-        u8 load_new_rom_data;
        int size_program;
        struct lp855x_rom_data *rom_data;
 };
diff --git a/include/linux/platform_data/mv_usb.h b/include/linux/platform_data/mv_usb.h
index 944b01dd103e..98b7925f1a2d 100644
--- a/include/linux/platform_data/mv_usb.h
+++ b/include/linux/platform_data/mv_usb.h
@@ -34,8 +34,6 @@ struct mv_usb_addon_irq {
 };
 struct mv_usb_platform_data {
-        unsigned int            clknum;
-        char                    **clkname;
        struct mv_usb_addon_irq *id;    /* Only valid for OTG. ID pin change*/
        struct mv_usb_addon_irq *vbus;  /* valid for OTG/UDC. VBUS change*/
diff --git a/include/linux/platform_data/ntc_thermistor.h b/include/linux/platform_data/ntc_thermistor.h
index 88734e871e3a..c7285b575462 100644
--- a/include/linux/platform_data/ntc_thermistor.h
+++ b/include/linux/platform_data/ntc_thermistor.h
@@ -21,6 +21,8 @@
 #ifndef _LINUX_NTC_H
 #define _LINUX_NTC_H
+struct iio_channel;
 enum ntc_thermistor_type {
        TYPE_NCPXXWB473,
        TYPE_NCPXXWL333,
@@ -39,13 +41,17 @@ struct ntc_thermistor_platform_data {
         * described at Documentation/hwmon/ntc_thermistor
         *
         * pullup/down_ohm: 0 for infinite / not-connected
+         *
+         * chan: iio_channel pointer to communicate with the ADC which the
+         * thermistor is using for conversion of the analog values.
         */
-        int (*read_uV)(void);
+        int (*read_uv)(struct ntc_thermistor_platform_data *);
-        unsigned int pullup_uV;
+        unsigned int pullup_uv;
        unsigned int pullup_ohm;
        unsigned int pulldown_ohm;
        enum { NTC_CONNECTED_POSITIVE, NTC_CONNECTED_GROUND } connect;
+        struct iio_channel *chan;
        int (*read_ohm)(void);
 };
diff --git a/include/linux/platform_data/serial-sccnxp.h b/include/linux/platform_data/serial-sccnxp.h
index 215574d1e81d..bdc510d03245 100644
--- a/include/linux/platform_data/serial-sccnxp.h
+++ b/include/linux/platform_data/serial-sccnxp.h
@@ -86,10 +86,6 @@ struct sccnxp_pdata {
        const u32               mctrl_cfg[SCCNXP_MAX_UARTS];
        /* Timer value for polling mode (usecs) */
        const unsigned int      poll_time_us;
-        /* Called during startup */
-        void (*init)(void);
-        /* Called before finish */
-        void (*exit)(void);
 };
 #endif
diff --git a/include/linux/platform_data/si5351.h b/include/linux/platform_data/si5351.h
new file mode 100644
index 000000000000..92dabcaf6499
--- /dev/null
+++ b/include/linux/platform_data/si5351.h
@@ -0,0 +1,114 @@
+/*
+ * Si5351A/B/C programmable clock generator platform_data.
+ */
+#ifndef __LINUX_PLATFORM_DATA_SI5351_H__
+#define __LINUX_PLATFORM_DATA_SI5351_H__
+struct clk;
+/**
+ * enum si5351_variant - SiLabs Si5351 chip variant
+ * @SI5351_VARIANT_A: Si5351A (8 output clocks, XTAL input)
+ * @SI5351_VARIANT_A3: Si5351A MSOP10 (3 output clocks, XTAL input)
+ * @SI5351_VARIANT_B: Si5351B (8 output clocks, XTAL/VXCO input)
+ * @SI5351_VARIANT_C: Si5351C (8 output clocks, XTAL/CLKIN input)
+ */
+enum si5351_variant {
+        SI5351_VARIANT_A = 1,
+        SI5351_VARIANT_A3 = 2,
+        SI5351_VARIANT_B = 3,
+        SI5351_VARIANT_C = 4,
+};
+/**
+ * enum si5351_pll_src - Si5351 pll clock source
+ * @SI5351_PLL_SRC_DEFAULT: default, do not change eeprom config
+ * @SI5351_PLL_SRC_XTAL: pll source clock is XTAL input
+ * @SI5351_PLL_SRC_CLKIN: pll source clock is CLKIN input (Si5351C only)
+ */
+enum si5351_pll_src {
+        SI5351_PLL_SRC_DEFAULT = 0,
+        SI5351_PLL_SRC_XTAL = 1,
+        SI5351_PLL_SRC_CLKIN = 2,
+};
+/**
+ * enum si5351_multisynth_src - Si5351 multisynth clock source
+ * @SI5351_MULTISYNTH_SRC_DEFAULT: default, do not change eeprom config
+ * @SI5351_MULTISYNTH_SRC_VCO0: multisynth source clock is VCO0
+ * @SI5351_MULTISYNTH_SRC_VCO1: multisynth source clock is VCO1/VXCO
+ */
+enum si5351_multisynth_src {
+        SI5351_MULTISYNTH_SRC_DEFAULT = 0,
+        SI5351_MULTISYNTH_SRC_VCO0 = 1,
+        SI5351_MULTISYNTH_SRC_VCO1 = 2,
+};
+/**
+ * enum si5351_clkout_src - Si5351 clock output clock source
+ * @SI5351_CLKOUT_SRC_DEFAULT: default, do not change eeprom config
+ * @SI5351_CLKOUT_SRC_MSYNTH_N: clkout N source clock is multisynth N
+ * @SI5351_CLKOUT_SRC_MSYNTH_0_4: clkout N source clock is multisynth 0 (N<4)
+ *                                or 4 (N>=4)
+ * @SI5351_CLKOUT_SRC_XTAL: clkout N source clock is XTAL
+ * @SI5351_CLKOUT_SRC_CLKIN: clkout N source clock is CLKIN (Si5351C only)
+ */
+enum si5351_clkout_src {
+        SI5351_CLKOUT_SRC_DEFAULT = 0,
+        SI5351_CLKOUT_SRC_MSYNTH_N = 1,
+        SI5351_CLKOUT_SRC_MSYNTH_0_4 = 2,
+        SI5351_CLKOUT_SRC_XTAL = 3,
+        SI5351_CLKOUT_SRC_CLKIN = 4,
+};
+/**
+ * enum si5351_drive_strength - Si5351 clock output drive strength
+ * @SI5351_DRIVE_DEFAULT: default, do not change eeprom config
+ * @SI5351_DRIVE_2MA: 2mA clock output drive strength
+ * @SI5351_DRIVE_4MA: 4mA clock output drive strength
+ * @SI5351_DRIVE_6MA: 6mA clock output drive strength
+ * @SI5351_DRIVE_8MA: 8mA clock output drive strength
+ */
+enum si5351_drive_strength {
+        SI5351_DRIVE_DEFAULT = 0,
+        SI5351_DRIVE_2MA = 2,
+        SI5351_DRIVE_4MA = 4,
+        SI5351_DRIVE_6MA = 6,
+        SI5351_DRIVE_8MA = 8,
+};
+/**
+ * struct si5351_clkout_config - Si5351 clock output configuration
+ * @clkout: clkout number
+ * @multisynth_src: multisynth source clock
+ * @clkout_src: clkout source clock
+ * @pll_master: if true, clkout can also change pll rate
+ * @drive: output drive strength
+ * @rate: initial clkout rate, or default if 0
+ */
+struct si5351_clkout_config {
+        enum si5351_multisynth_src multisynth_src;
+        enum si5351_clkout_src clkout_src;
+        enum si5351_drive_strength drive;
+        bool pll_master;
+        unsigned long rate;
+};
+/**
+ * struct si5351_platform_data - Platform data for the Si5351 clock driver
+ * @variant: Si5351 chip variant
+ * @clk_xtal: xtal input clock
+ * @clk_clkin: clkin input clock
+ * @pll_src: array of pll source clock setting
+ * @clkout: array of clkout configuration
+ */
+struct si5351_platform_data {
+        enum si5351_variant variant;
+        struct clk *clk_xtal;
+        struct clk *clk_clkin;
+        enum si5351_pll_src pll_src[2];
+        struct si5351_clkout_config clkout[8];
+};
+#endif
diff --git a/include/linux/platform_data/spi-s3c64xx.h b/include/linux/platform_data/spi-s3c64xx.h
index ceba18d23a5a..8447f634c7f5 100644
--- a/include/linux/platform_data/spi-s3c64xx.h
+++ b/include/linux/platform_data/spi-s3c64xx.h
@@ -11,6 +11,8 @@
 #ifndef __S3C64XX_PLAT_SPI_H
 #define __S3C64XX_PLAT_SPI_H
+#include <linux/dmaengine.h>
 struct platform_device;
 /**
@@ -38,6 +40,7 @@ struct s3c64xx_spi_info {
        int src_clk_nr;
        int num_cs;
        int (*cfg_gpio)(void);
+        dma_filter_fn filter;
 };
 /**
diff --git a/include/linux/platform_data/video-vt8500lcdfb.h b/include/linux/platform_data/video-vt8500lcdfb.h
deleted file mode 100644
index 7f399c370fe0..000000000000
--- a/include/linux/platform_data/video-vt8500lcdfb.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  VT8500/WM8505 Frame Buffer platform data definitions
- *
- *  Copyright (C) 2010 Ed Spiridonov <edo.rus@gmail.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-#ifndef _VT8500FB_H
-#define _VT8500FB_H
-#include <linux/fb.h>
-struct vt8500fb_platform_data {
-        struct fb_videomode     mode;
-        u32                     xres_virtual;
-        u32                     yres_virtual;
-        u32                     bpp;
-        unsigned long           video_mem_phys;
-        void                    *video_mem_virt;
-        unsigned long           video_mem_len;
-};
-#endif /* _VT8500FB_H */
diff --git a/include/linux/platform_data/video_s3c.h b/include/linux/platform_data/video_s3c.h
new file mode 100644
index 000000000000..48883995f47f
--- /dev/null
+++ b/include/linux/platform_data/video_s3c.h
@@ -0,0 +1,54 @@
+#ifndef __PLATFORM_DATA_VIDEO_S3C
+#define __PLATFORM_DATA_VIDEO_S3C
+/* S3C_FB_MAX_WIN
+ * Set to the maximum number of windows that any of the supported hardware
+ * can use. Since the platform data uses this for an array size, having it
+ * set to the maximum of any version of the hardware can do is safe.
+ */
+#define S3C_FB_MAX_WIN  (5)
+/**
+ * struct s3c_fb_pd_win - per window setup data
+ * @xres     : The window X size.
+ * @yres     : The window Y size.
+ * @virtual_x: The virtual X size.
+ * @virtual_y: The virtual Y size.
+ */
+struct s3c_fb_pd_win {
+        unsigned short          default_bpp;
+        unsigned short          max_bpp;
+        unsigned short          xres;
+        unsigned short          yres;
+        unsigned short          virtual_x;
+        unsigned short          virtual_y;
+};
+/**
+ * struct s3c_fb_platdata -  S3C driver platform specific information
+ * @setup_gpio: Setup the external GPIO pins to the right state to transfer
+ *              the data from the display system to the connected display
+ *              device.
+ * @vidcon0: The base vidcon0 values to control the panel data format.
+ * @vidcon1: The base vidcon1 values to control the panel data output.
+ * @vtiming: Video timing when connected to a RGB type panel.
+ * @win: The setup data for each hardware window, or NULL for unused.
+ * @display_mode: The LCD output display mode.
+ *
+ * The platform data supplies the video driver with all the information
+ * it requires to work with the display(s) attached to the machine. It
+ * controls the initial mode, the number of display windows (0 is always
+ * the base framebuffer) that are initialised etc.
+ *
+ */
+struct s3c_fb_platdata {
+        void    (*setup_gpio)(void);
+        struct s3c_fb_pd_win    *win[S3C_FB_MAX_WIN];
+        struct fb_videomode     *vtiming;
+        u32                      vidcon0;
+        u32                      vidcon1;
+};
+#endif
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index c082c71f7225..9abf1db6aea6 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -20,12 +20,12 @@
 struct mfd_cell;
 struct platform_device {
-        const char      * name;
+        const char      *name;
        int             id;
        bool            id_auto;
        struct device   dev;
        u32             num_resources;
-        struct resource * resource;
+        struct resource *resource;
        const struct platform_device_id *id_entry;
@@ -47,9 +47,12 @@ extern struct bus_type platform_bus_type;
 extern struct device platform_bus;
 extern void arch_setup_pdev_archdata(struct platform_device *);
-extern struct resource *platform_get_resource(struct platform_device *, unsigned int, unsigned int);
+extern struct resource *platform_get_resource(struct platform_device *,
+                                              unsigned int, unsigned int);
 extern int platform_get_irq(struct platform_device *, unsigned int);
-extern struct resource *platform_get_resource_byname(struct platform_device *, unsigned int, const char *);
+extern struct resource *platform_get_resource_byname(struct platform_device *,
+                                                     unsigned int,
+                                                     const char *);
 extern int platform_get_irq_byname(struct platform_device *, const char *);
 extern int platform_add_devices(struct platform_device **, int);
@@ -161,7 +164,8 @@ extern struct platform_device *platform_device_alloc(const char *name, int id);
 extern int platform_device_add_resources(struct platform_device *pdev,
                                         const struct resource *res,
                                         unsigned int num);
-extern int platform_device_add_data(struct platform_device *pdev, const void *data, size_t size);
+extern int platform_device_add_data(struct platform_device *pdev,
+                                    const void *data, size_t size);
 extern int platform_device_add(struct platform_device *pdev);
 extern void platform_device_del(struct platform_device *pdev);
 extern void platform_device_put(struct platform_device *pdev);
@@ -190,7 +194,8 @@ static inline void *platform_get_drvdata(const struct platform_device *pdev)
        return dev_get_drvdata(&pdev->dev);
 }
-static inline void platform_set_drvdata(struct platform_device *pdev, void *data)
+static inline void platform_set_drvdata(struct platform_device *pdev,
+                                        void *data)
 {
        dev_set_drvdata(&pdev->dev, data);
 }
@@ -222,10 +227,10 @@ static void __exit __platform_driver##_exit(void) \
 } \
 module_exit(__platform_driver##_exit);
-extern struct platform_device *platform_create_bundle(struct platform_driver *driver,
+extern struct platform_device *platform_create_bundle(
-                                        int (*probe)(struct platform_device *),
+        struct platform_driver *driver, int (*probe)(struct platform_device *),
-                                        struct resource *res, unsigned int n_res,
+        struct resource *res, unsigned int n_res,
-                                        const void *data, size_t size);
+        const void *data, size_t size);
 /* early platform driver interface */
 struct early_platform_driver {
diff --git a/include/linux/pm2301_charger.h b/include/linux/pm2301_charger.h
index fc3f026922ae..85c16defe11a 100644
--- a/include/linux/pm2301_charger.h
+++ b/include/linux/pm2301_charger.h
@@ -48,7 +48,7 @@ struct pm2xxx_charger_platform_data {
        size_t num_supplicants;
        int i2c_bus;
        const char *label;
-        int irq_number;
+        int gpio_irq_number;
        unsigned int lpn_gpio;
        int irq_type;
 };
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 042058fdb0af..60bac697a91b 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -55,6 +55,7 @@ struct cpu_timer_list {
 /* POSIX.1b interval timer structure. */
 struct k_itimer {
        struct list_head list;          /* free/ allocate list */
+        struct hlist_node t_hash;
        spinlock_t it_lock;
        clockid_t it_clock;             /* which timer type */
        timer_t it_id;                  /* timer id */
diff --git a/include/linux/power/ab8500.h b/include/linux/power/ab8500.h
new file mode 100644
index 000000000000..cdbb6c2a8c51
--- /dev/null
+++ b/include/linux/power/ab8500.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) ST-Ericsson 2013
+ * Author: Hongbo Zhang <hongbo.zhang@linaro.com>
+ * License terms: GNU General Public License v2
+ */
+#ifndef PWR_AB8500_H
+#define PWR_AB8500_H
+extern const struct abx500_res_to_temp ab8500_temp_tbl_a_thermistor[];
+extern const int ab8500_temp_tbl_a_size;
+extern const struct abx500_res_to_temp ab8500_temp_tbl_b_thermistor[];
+extern const int ab8500_temp_tbl_b_size;
+#endif /* PWR_AB8500_H */
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 002a99f96331..3828cefb4f65 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -171,6 +171,12 @@ struct power_supply {
        char **supplied_to;
        size_t num_supplicants;
+        char **supplied_from;
+        size_t num_supplies;
+#ifdef CONFIG_OF
+        struct device_node *of_node;
+#endif
        int (*get_property)(struct power_supply *psy,
                            enum power_supply_property psp,
                            union power_supply_propval *val);
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index 5a710b9c578e..87a03c746f17 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -93,14 +93,20 @@ do { \
 #else /* !CONFIG_PREEMPT_COUNT */
-#define preempt_disable()               do { } while (0)
+/*
-#define sched_preempt_enable_no_resched()       do { } while (0)
+ * Even if we don't have any preemption, we need preempt disable/enable
-#define preempt_enable_no_resched()     do { } while (0)
+ * to be barriers, so that we don't have things like get_user/put_user
-#define preempt_enable()                do { } while (0)
+ * that can cause faults and scheduling migrate into our preempt-protected
+ * region.
-#define preempt_disable_notrace()               do { } while (0)
+ */
-#define preempt_enable_no_resched_notrace()     do { } while (0)
+#define preempt_disable()               barrier()
-#define preempt_enable_notrace()                do { } while (0)
+#define sched_preempt_enable_no_resched()       barrier()
+#define preempt_enable_no_resched()     barrier()
+#define preempt_enable()                barrier()
+#define preempt_disable_notrace()               barrier()
+#define preempt_enable_no_resched_notrace()     barrier()
+#define preempt_enable_notrace()                barrier()
 #endif /* CONFIG_PREEMPT_COUNT */
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 822171fcb1c8..6af944ab38f0 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -1,6 +1,7 @@
 #ifndef __KERNEL_PRINTK__
 #define __KERNEL_PRINTK__
+#include <stdarg.h>
 #include <linux/init.h>
 #include <linux/kern_levels.h>
@@ -95,8 +96,14 @@ int no_printk(const char *fmt, ...)
        return 0;
 }
+#ifdef CONFIG_EARLY_PRINTK
 extern asmlinkage __printf(1, 2)
 void early_printk(const char *fmt, ...);
+void early_vprintk(const char *fmt, va_list ap);
+#else
+static inline __printf(1, 2) __cold
+void early_printk(const char *s, ...) { }
+#endif
 #ifdef CONFIG_PRINTK
 asmlinkage __printf(5, 0)
@@ -138,6 +145,9 @@ extern void wake_up_klogd(void);
 void log_buf_kexec_setup(void);
 void __init setup_log_buf(int early);
+void dump_stack_set_arch_desc(const char *fmt, ...);
+void dump_stack_print_info(const char *log_lvl);
+void show_regs_print_info(const char *log_lvl);
 #else
 static inline __printf(1, 0)
 int vprintk(const char *s, va_list args)
@@ -175,6 +185,18 @@ static inline void log_buf_kexec_setup(void)
 static inline void setup_log_buf(int early)
 {
 }
+static inline void dump_stack_set_arch_desc(const char *fmt, ...)
+{
+}
+static inline void dump_stack_print_info(const char *log_lvl)
+{
+}
+static inline void show_regs_print_info(const char *log_lvl)
+{
+}
 #endif
 extern void dump_stack(void) __cold;
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 8307f2f94d86..94dfb2aa5533 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -117,6 +117,7 @@ struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
                                const struct file_operations *proc_fops,
                                void *data);
 extern void remove_proc_entry(const char *name, struct proc_dir_entry *parent);
+extern int remove_proc_subtree(const char *name, struct proc_dir_entry *parent);
 struct pid_namespace;
@@ -202,6 +203,7 @@ static inline struct proc_dir_entry *proc_create_data(const char *name,
        return NULL;
 }
 #define remove_proc_entry(name, parent) do {} while (0)
+#define remove_proc_subtree(name, parent) do {} while (0)
 static inline struct proc_dir_entry *proc_symlink(const char *name,
                struct proc_dir_entry *parent,const char *dest) {return NULL;}
diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h
index 5bf5500db83d..69e37c2d1ea5 100644
--- a/include/linux/ramfs.h
+++ b/include/linux/ramfs.h
@@ -6,7 +6,13 @@ struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir,
 extern struct dentry *ramfs_mount(struct file_system_type *fs_type,
         int flags, const char *dev_name, void *data);
-#ifndef CONFIG_MMU
+#ifdef CONFIG_MMU
+static inline int
+ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize)
+{
+        return 0;
+}
+#else
 extern int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize);
 extern unsigned long ramfs_nommu_get_unmapped_area(struct file *file,
                                                   unsigned long addr,
diff --git a/include/linux/rculist_bl.h b/include/linux/rculist_bl.h
index cf1244fbf3b6..4f216c59e7db 100644
--- a/include/linux/rculist_bl.h
+++ b/include/linux/rculist_bl.h
@@ -20,7 +20,7 @@ static inline void hlist_bl_set_first_rcu(struct hlist_bl_head *h,
 static inline struct hlist_bl_node *hlist_bl_first_rcu(struct hlist_bl_head *h)
 {
        return (struct hlist_bl_node *)
-                ((unsigned long)rcu_dereference(h->first) & ~LIST_BL_LOCKMASK);
+                ((unsigned long)rcu_dereference_check(h->first, hlist_bl_is_locked(h)) & ~LIST_BL_LOCKMASK);
 }
 /**
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index b758ce17b309..9ed2c9a4de45 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -80,6 +80,7 @@ extern void do_trace_rcu_torture_read(char *rcutorturename,
 #define UINT_CMP_LT(a, b)       (UINT_MAX / 2 < (a) - (b))
 #define ULONG_CMP_GE(a, b)      (ULONG_MAX / 2 >= (a) - (b))
 #define ULONG_CMP_LT(a, b)      (ULONG_MAX / 2 < (a) - (b))
+#define ulong2long(a)           (*(long *)(&(a)))
 /* Exported common interfaces */
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index bf77dfdabef9..02d84e24b7c2 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -389,6 +389,7 @@ int regmap_update_bits_check(struct regmap *map, unsigned int reg,
                             bool *change);
 int regmap_get_val_bytes(struct regmap *map);
 int regmap_async_complete(struct regmap *map);
+bool regmap_can_raw_write(struct regmap *map);
 int regcache_sync(struct regmap *map);
 int regcache_sync_region(struct regmap *map, unsigned int min,
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index 7bd73bbdfd1b..7c5ff0c55773 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -5,11 +5,14 @@
 *
 * Authors: Sundar Iyer <sundar.iyer@stericsson.com> for ST-Ericsson
 *          Bengt Jonsson <bengt.g.jonsson@stericsson.com> for ST-Ericsson
+ *          Daniel Willerud <daniel.willerud@stericsson.com> for ST-Ericsson
 */
 #ifndef __LINUX_MFD_AB8500_REGULATOR_H
 #define __LINUX_MFD_AB8500_REGULATOR_H
+#include <linux/platform_device.h>
 /* AB8500 regulators */
 enum ab8500_regulator_id {
        AB8500_LDO_AUX1,
@@ -17,7 +20,6 @@ enum ab8500_regulator_id {
        AB8500_LDO_AUX3,
        AB8500_LDO_INTCORE,
        AB8500_LDO_TVOUT,
-        AB8500_LDO_USB,
        AB8500_LDO_AUDIO,
        AB8500_LDO_ANAMIC1,
        AB8500_LDO_ANAMIC2,
@@ -26,7 +28,28 @@ enum ab8500_regulator_id {
        AB8500_NUM_REGULATORS,
 };
-/* AB9450 regulators */
+/* AB8505 regulators */
+enum ab8505_regulator_id {
+        AB8505_LDO_AUX1,
+        AB8505_LDO_AUX2,
+        AB8505_LDO_AUX3,
+        AB8505_LDO_AUX4,
+        AB8505_LDO_AUX5,
+        AB8505_LDO_AUX6,
+        AB8505_LDO_INTCORE,
+        AB8505_LDO_ADC,
+        AB8505_LDO_USB,
+        AB8505_LDO_AUDIO,
+        AB8505_LDO_ANAMIC1,
+        AB8505_LDO_ANAMIC2,
+        AB8505_LDO_AUX8,
+        AB8505_LDO_ANA,
+        AB8505_SYSCLKREQ_2,
+        AB8505_SYSCLKREQ_4,
+        AB8505_NUM_REGULATORS,
+};
+/* AB9540 regulators */
 enum ab9540_regulator_id {
        AB9540_LDO_AUX1,
        AB9540_LDO_AUX2,
@@ -45,16 +68,39 @@ enum ab9540_regulator_id {
        AB9540_NUM_REGULATORS,
 };
-/* AB8500 and AB9540 register initialization */
+/* AB8540 regulators */
+enum ab8540_regulator_id {
+        AB8540_LDO_AUX1,
+        AB8540_LDO_AUX2,
+        AB8540_LDO_AUX3,
+        AB8540_LDO_AUX4,
+        AB8540_LDO_AUX5,
+        AB8540_LDO_AUX6,
+        AB8540_LDO_INTCORE,
+        AB8540_LDO_TVOUT,
+        AB8540_LDO_AUDIO,
+        AB8540_LDO_ANAMIC1,
+        AB8540_LDO_ANAMIC2,
+        AB8540_LDO_DMIC,
+        AB8540_LDO_ANA,
+        AB8540_LDO_SDIO,
+        AB8540_SYSCLKREQ_2,
+        AB8540_SYSCLKREQ_4,
+        AB8540_NUM_REGULATORS,
+};
+/* AB8500, AB8505, and AB9540 register initialization */
 struct ab8500_regulator_reg_init {
        int id;
+        u8 mask;
        u8 value;
 };
-#define INIT_REGULATOR_REGISTER(_id, _value)    \
+#define INIT_REGULATOR_REGISTER(_id, _mask, _value)     \
-        {                                       \
+        {                                               \
-                .id = _id,                      \
+                .id = _id,                              \
-                .value = _value,                \
+                .mask = _mask,                          \
+                .value = _value,                        \
        }
 /* AB8500 registers */
@@ -86,10 +132,58 @@ enum ab8500_regulator_reg {
        AB8500_REGUCTRL2SPARE,
        AB8500_REGUCTRLDISCH,
        AB8500_REGUCTRLDISCH2,
-        AB8500_VSMPS1SEL1,
        AB8500_NUM_REGULATOR_REGISTERS,
 };
+/* AB8505 registers */
+enum ab8505_regulator_reg {
+        AB8505_REGUREQUESTCTRL1,
+        AB8505_REGUREQUESTCTRL2,
+        AB8505_REGUREQUESTCTRL3,
+        AB8505_REGUREQUESTCTRL4,
+        AB8505_REGUSYSCLKREQ1HPVALID1,
+        AB8505_REGUSYSCLKREQ1HPVALID2,
+        AB8505_REGUHWHPREQ1VALID1,
+        AB8505_REGUHWHPREQ1VALID2,
+        AB8505_REGUHWHPREQ2VALID1,
+        AB8505_REGUHWHPREQ2VALID2,
+        AB8505_REGUSWHPREQVALID1,
+        AB8505_REGUSWHPREQVALID2,
+        AB8505_REGUSYSCLKREQVALID1,
+        AB8505_REGUSYSCLKREQVALID2,
+        AB8505_REGUVAUX4REQVALID,
+        AB8505_REGUMISC1,
+        AB8505_VAUDIOSUPPLY,
+        AB8505_REGUCTRL1VAMIC,
+        AB8505_VSMPSAREGU,
+        AB8505_VSMPSBREGU,
+        AB8505_VSAFEREGU, /* NOTE! PRCMU register */
+        AB8505_VPLLVANAREGU,
+        AB8505_EXTSUPPLYREGU,
+        AB8505_VAUX12REGU,
+        AB8505_VRF1VAUX3REGU,
+        AB8505_VSMPSASEL1,
+        AB8505_VSMPSASEL2,
+        AB8505_VSMPSASEL3,
+        AB8505_VSMPSBSEL1,
+        AB8505_VSMPSBSEL2,
+        AB8505_VSMPSBSEL3,
+        AB8505_VSAFESEL1, /* NOTE! PRCMU register */
+        AB8505_VSAFESEL2, /* NOTE! PRCMU register */
+        AB8505_VSAFESEL3, /* NOTE! PRCMU register */
+        AB8505_VAUX1SEL,
+        AB8505_VAUX2SEL,
+        AB8505_VRF1VAUX3SEL,
+        AB8505_VAUX4REQCTRL,
+        AB8505_VAUX4REGU,
+        AB8505_VAUX4SEL,
+        AB8505_REGUCTRLDISCH,
+        AB8505_REGUCTRLDISCH2,
+        AB8505_REGUCTRLDISCH3,
+        AB8505_CTRLVAUX5,
+        AB8505_CTRLVAUX6,
+        AB8505_NUM_REGULATOR_REGISTERS,
+};
 /* AB9540 registers */
 enum ab9540_regulator_reg {
@@ -139,4 +233,111 @@ enum ab9540_regulator_reg {
        AB9540_NUM_REGULATOR_REGISTERS,
 };
+/* AB8540 registers */
+enum ab8540_regulator_reg {
+        AB8540_REGUREQUESTCTRL1,
+        AB8540_REGUREQUESTCTRL2,
+        AB8540_REGUREQUESTCTRL3,
+        AB8540_REGUREQUESTCTRL4,
+        AB8540_REGUSYSCLKREQ1HPVALID1,
+        AB8540_REGUSYSCLKREQ1HPVALID2,
+        AB8540_REGUHWHPREQ1VALID1,
+        AB8540_REGUHWHPREQ1VALID2,
+        AB8540_REGUHWHPREQ2VALID1,
+        AB8540_REGUHWHPREQ2VALID2,
+        AB8540_REGUSWHPREQVALID1,
+        AB8540_REGUSWHPREQVALID2,
+        AB8540_REGUSYSCLKREQVALID1,
+        AB8540_REGUSYSCLKREQVALID2,
+        AB8540_REGUVAUX4REQVALID,
+        AB8540_REGUVAUX5REQVALID,
+        AB8540_REGUVAUX6REQVALID,
+        AB8540_REGUVCLKBREQVALID,
+        AB8540_REGUVRF1REQVALID,
+        AB8540_REGUMISC1,
+        AB8540_VAUDIOSUPPLY,
+        AB8540_REGUCTRL1VAMIC,
+        AB8540_VHSIC,
+        AB8540_VSDIO,
+        AB8540_VSMPS1REGU,
+        AB8540_VSMPS2REGU,
+        AB8540_VSMPS3REGU,
+        AB8540_VPLLVANAREGU,
+        AB8540_EXTSUPPLYREGU,
+        AB8540_VAUX12REGU,
+        AB8540_VRF1VAUX3REGU,
+        AB8540_VSMPS1SEL1,
+        AB8540_VSMPS1SEL2,
+        AB8540_VSMPS1SEL3,
+        AB8540_VSMPS2SEL1,
+        AB8540_VSMPS2SEL2,
+        AB8540_VSMPS2SEL3,
+        AB8540_VSMPS3SEL1,
+        AB8540_VSMPS3SEL2,
+        AB8540_VAUX1SEL,
+        AB8540_VAUX2SEL,
+        AB8540_VRF1VAUX3SEL,
+        AB8540_REGUCTRL2SPARE,
+        AB8540_VAUX4REQCTRL,
+        AB8540_VAUX4REGU,
+        AB8540_VAUX4SEL,
+        AB8540_VAUX5REQCTRL,
+        AB8540_VAUX5REGU,
+        AB8540_VAUX5SEL,
+        AB8540_VAUX6REQCTRL,
+        AB8540_VAUX6REGU,
+        AB8540_VAUX6SEL,
+        AB8540_VCLKBREQCTRL,
+        AB8540_VCLKBREGU,
+        AB8540_VCLKBSEL,
+        AB8540_VRF1REQCTRL,
+        AB8540_REGUCTRLDISCH,
+        AB8540_REGUCTRLDISCH2,
+        AB8540_REGUCTRLDISCH3,
+        AB8540_REGUCTRLDISCH4,
+        AB8540_VSIMSYSCLKCTRL,
+        AB8540_VANAVPLLSEL,
+        AB8540_NUM_REGULATOR_REGISTERS,
+};
+/* AB8500 external regulators */
+struct ab8500_ext_regulator_cfg {
+        bool hwreq; /* requires hw mode or high power mode */
+};
+enum ab8500_ext_regulator_id {
+        AB8500_EXT_SUPPLY1,
+        AB8500_EXT_SUPPLY2,
+        AB8500_EXT_SUPPLY3,
+        AB8500_NUM_EXT_REGULATORS,
+};
+/* AB8500 regulator platform data */
+struct ab8500_regulator_platform_data {
+        int num_reg_init;
+        struct ab8500_regulator_reg_init *reg_init;
+        int num_regulator;
+        struct regulator_init_data *regulator;
+        int num_ext_regulator;
+        struct regulator_init_data *ext_regulator;
+};
+#ifdef CONFIG_REGULATOR_AB8500_DEBUG
+int ab8500_regulator_debug_init(struct platform_device *pdev);
+int ab8500_regulator_debug_exit(struct platform_device *pdev);
+#else
+static inline int ab8500_regulator_debug_init(struct platform_device *pdev)
+{
+        return 0;
+}
+static inline int ab8500_regulator_debug_exit(struct platform_device *pdev)
+{
+        return 0;
+}
+#endif
+/* AB8500 external regulator functions. */
+int ab8500_ext_regulator_init(struct platform_device *pdev);
+void ab8500_ext_regulator_exit(struct platform_device *pdev);
 #endif
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 7bc732ce6e50..145022a83085 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -141,18 +141,18 @@ void regulator_put(struct regulator *regulator);
 void devm_regulator_put(struct regulator *regulator);
 /* regulator output control and status */
-int regulator_enable(struct regulator *regulator);
+int __must_check regulator_enable(struct regulator *regulator);
 int regulator_disable(struct regulator *regulator);
 int regulator_force_disable(struct regulator *regulator);
 int regulator_is_enabled(struct regulator *regulator);
 int regulator_disable_deferred(struct regulator *regulator, int ms);
-int regulator_bulk_get(struct device *dev, int num_consumers,
+int __must_check regulator_bulk_get(struct device *dev, int num_consumers,
-                       struct regulator_bulk_data *consumers);
+                                    struct regulator_bulk_data *consumers);
-int devm_regulator_bulk_get(struct device *dev, int num_consumers,
+int __must_check devm_regulator_bulk_get(struct device *dev, int num_consumers,
-                            struct regulator_bulk_data *consumers);
+                                         struct regulator_bulk_data *consumers);
-int regulator_bulk_enable(int num_consumers,
+int __must_check regulator_bulk_enable(int num_consumers,
-                          struct regulator_bulk_data *consumers);
+                                       struct regulator_bulk_data *consumers);
 int regulator_bulk_disable(int num_consumers,
                           struct regulator_bulk_data *consumers);
 int regulator_bulk_force_disable(int num_consumers,
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 7df93f52db08..6700cc94bdd1 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -22,6 +22,7 @@
 struct regmap;
 struct regulator_dev;
 struct regulator_init_data;
+struct regulator_enable_gpio;
 enum regulator_status {
        REGULATOR_STATUS_OFF,
@@ -199,6 +200,8 @@ enum regulator_type {
 *                output when using regulator_set_voltage_sel_regmap
 * @enable_reg: Register for control when using regmap enable/disable ops
 * @enable_mask: Mask for control when using regmap enable/disable ops
+ * @enable_is_inverted: A flag to indicate set enable_mask bits to disable
+ *                      when using regulator_enable_regmap and friends APIs.
 * @bypass_reg: Register for control when using regmap set_bypass
 * @bypass_mask: Mask for control when using regmap set_bypass
 *
@@ -228,6 +231,7 @@ struct regulator_desc {
        unsigned int apply_bit;
        unsigned int enable_reg;
        unsigned int enable_mask;
+        bool enable_is_inverted;
        unsigned int bypass_reg;
        unsigned int bypass_mask;
@@ -302,8 +306,7 @@ struct regulator_dev {
        struct dentry *debugfs;
-        int ena_gpio;
+        struct regulator_enable_gpio *ena_pin;
-        unsigned int ena_gpio_invert:1;
        unsigned int ena_gpio_state:1;
 };
@@ -329,6 +332,8 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev,
                                  int min_uV, int max_uV);
 int regulator_map_voltage_iterate(struct regulator_dev *rdev,
                                  int min_uV, int max_uV);
+int regulator_map_voltage_ascend(struct regulator_dev *rdev,
+                                  int min_uV, int max_uV);
 int regulator_get_voltage_sel_regmap(struct regulator_dev *rdev);
 int regulator_set_voltage_sel_regmap(struct regulator_dev *rdev, unsigned sel);
 int regulator_is_enabled_regmap(struct regulator_dev *rdev);
diff --git a/include/linux/regulator/max8952.h b/include/linux/regulator/max8952.h
index 45e42855ad05..4dbb63a1d4ab 100644
--- a/include/linux/regulator/max8952.h
+++ b/include/linux/regulator/max8952.h
@@ -122,13 +122,13 @@ struct max8952_platform_data {
        int gpio_vid1;
        int gpio_en;
-        u8 default_mode;
+        u32 default_mode;
-        u8 dvs_mode[MAX8952_NUM_DVS_MODE]; /* MAX8952_DVS_MODEx_XXXXmV */
+        u32 dvs_mode[MAX8952_NUM_DVS_MODE]; /* MAX8952_DVS_MODEx_XXXXmV */
-        u8 sync_freq;
+        u32 sync_freq;
-        u8 ramp_speed;
+        u32 ramp_speed;
-        struct regulator_init_data reg_data;
+        struct regulator_init_data *reg_data;
 };
diff --git a/include/linux/relay.h b/include/linux/relay.h
index 91cacc34c159..d7c8359693c6 100644
--- a/include/linux/relay.h
+++ b/include/linux/relay.h
@@ -20,9 +20,6 @@
 #include <linux/poll.h>
 #include <linux/kref.h>
-/* Needs a _much_ better name... */
-#define FIX_SIZE(x) ((((x) - 1) & PAGE_MASK) + PAGE_SIZE)
 /*
 * Tracks changes to rchan/rchan_buf structs
 */
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h
index c23099413ad6..96a509b6be04 100644
--- a/include/linux/res_counter.h
+++ b/include/linux/res_counter.h
@@ -13,7 +13,7 @@
 * info about what this counter is.
 */
-#include <linux/cgroup.h>
+#include <linux/spinlock.h>
 #include <linux/errno.h>
 /*
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h
index 1342e69542f3..d69cf637a15a 100644
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
@@ -4,6 +4,7 @@
 #include <linux/kmemcheck.h>
 #include <linux/mm.h>
 #include <linux/seq_file.h>
+#include <linux/poll.h>
 struct ring_buffer;
 struct ring_buffer_iter;
@@ -96,6 +97,11 @@ __ring_buffer_alloc(unsigned long size, unsigned flags, struct lock_class_key *k
        __ring_buffer_alloc((size), (flags), &__key);   \
 })
+void ring_buffer_wait(struct ring_buffer *buffer, int cpu);
+int ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu,
+                          struct file *filp, poll_table *poll_table);
 #define RING_BUFFER_ALL_CPUS -1
 void ring_buffer_free(struct ring_buffer *buffer);
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 580b24c8b8ca..c2c28975293c 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -133,7 +133,13 @@ extern struct rtc_device *rtc_device_register(const char *name,
                                        struct device *dev,
                                        const struct rtc_class_ops *ops,
                                        struct module *owner);
+extern struct rtc_device *devm_rtc_device_register(struct device *dev,
+                                        const char *name,
+                                        const struct rtc_class_ops *ops,
+                                        struct module *owner);
 extern void rtc_device_unregister(struct rtc_device *rtc);
+extern void devm_rtc_device_unregister(struct device *dev,
+                                        struct rtc_device *rtc);
 extern int rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm);
 extern int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm);
diff --git a/include/linux/sched.h b/include/linux/sched.h
index d35d2b6ddbfb..6f950048b6e9 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -127,18 +127,6 @@ extern void proc_sched_show_task(struct task_struct *p, struct seq_file *m);
 extern void proc_sched_set_task(struct task_struct *p);
 extern void
 print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq);
-#else
-static inline void
-proc_sched_show_task(struct task_struct *p, struct seq_file *m)
-{
-}
-static inline void proc_sched_set_task(struct task_struct *p)
-{
-}
-static inline void
-print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
-{
-}
 #endif
 /*
@@ -163,9 +151,10 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
 #define TASK_DEAD               64
 #define TASK_WAKEKILL           128
 #define TASK_WAKING             256
-#define TASK_STATE_MAX          512
+#define TASK_PARKED             512
+#define TASK_STATE_MAX          1024
-#define TASK_STATE_TO_CHAR_STR "RSDTtZXxKW"
+#define TASK_STATE_TO_CHAR_STR "RSDTtZXxKWP"
 extern char ___assert_task_state[1 - 2*!!(
                sizeof(TASK_STATE_TO_CHAR_STR)-1 != ilog2(TASK_STATE_MAX)+1)];
@@ -320,7 +309,6 @@ extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
 asmlinkage void schedule(void);
 extern void schedule_preempt_disabled(void);
-extern int mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner);
 struct nsproxy;
 struct user_namespace;
@@ -526,7 +514,8 @@ struct signal_struct {
        unsigned int            has_child_subreaper:1;
        /* POSIX.1b Interval Timers */
-        struct list_head posix_timers;
+        int                     posix_timer_id;
+        struct list_head        posix_timers;
        /* ITIMER_REAL timer for the process */
        struct hrtimer real_timer;
@@ -570,7 +559,7 @@ struct signal_struct {
        cputime_t utime, stime, cutime, cstime;
        cputime_t gtime;
        cputime_t cgtime;
-#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
        struct cputime prev_cputime;
 #endif
        unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
@@ -637,6 +626,7 @@ struct signal_struct {
 #define SIGNAL_STOP_STOPPED     0x00000001 /* job control stop in effect */
 #define SIGNAL_STOP_CONTINUED   0x00000002 /* SIGCONT since WCONTINUED reap */
 #define SIGNAL_GROUP_EXIT       0x00000004 /* group exit in progress */
+#define SIGNAL_GROUP_COREDUMP   0x00000008 /* coredump in progress */
 /*
 * Pending notifications to parent.
 */
@@ -768,31 +758,6 @@ enum cpu_idle_type {
 };
 /*
- * Increase resolution of nice-level calculations for 64-bit architectures.
- * The extra resolution improves shares distribution and load balancing of
- * low-weight task groups (eg. nice +19 on an autogroup), deeper taskgroup
- * hierarchies, especially on larger systems. This is not a user-visible change
- * and does not change the user-interface for setting shares/weights.
- *
- * We increase resolution only if we have enough bits to allow this increased
- * resolution (i.e. BITS_PER_LONG > 32). The costs for increasing resolution
- * when BITS_PER_LONG <= 32 are pretty high and the returns do not justify the
- * increased costs.
- */
-#if 0 /* BITS_PER_LONG > 32 -- currently broken: it increases power usage under light load  */
-# define SCHED_LOAD_RESOLUTION  10
-# define scale_load(w)          ((w) << SCHED_LOAD_RESOLUTION)
-# define scale_load_down(w)     ((w) >> SCHED_LOAD_RESOLUTION)
-#else
-# define SCHED_LOAD_RESOLUTION  0
-# define scale_load(w)          (w)
-# define scale_load_down(w)     (w)
-#endif
-#define SCHED_LOAD_SHIFT        (10 + SCHED_LOAD_RESOLUTION)
-#define SCHED_LOAD_SCALE        (1L << SCHED_LOAD_SHIFT)
-/*
 * Increase resolution of cpu_power calculations
 */
 #define SCHED_POWER_SHIFT       10
@@ -817,62 +782,6 @@ enum cpu_idle_type {
 extern int __weak arch_sd_sibiling_asym_packing(void);
-struct sched_group_power {
-        atomic_t ref;
-        /*
-         * CPU power of this group, SCHED_LOAD_SCALE being max power for a
-         * single CPU.
-         */
-        unsigned int power, power_orig;
-        unsigned long next_update;
-        /*
-         * Number of busy cpus in this group.
-         */
-        atomic_t nr_busy_cpus;
-        unsigned long cpumask[0]; /* iteration mask */
-};
-struct sched_group {
-        struct sched_group *next;       /* Must be a circular list */
-        atomic_t ref;
-        unsigned int group_weight;
-        struct sched_group_power *sgp;
-        /*
-         * The CPUs this group covers.
-         *
-         * NOTE: this field is variable length. (Allocated dynamically
-         * by attaching extra space to the end of the structure,
-         * depending on how many CPUs the kernel has booted up with)
-         */
-        unsigned long cpumask[0];
-};
-static inline struct cpumask *sched_group_cpus(struct sched_group *sg)
-{
-        return to_cpumask(sg->cpumask);
-}
-/*
- * cpumask masking which cpus in the group are allowed to iterate up the domain
- * tree.
- */
-static inline struct cpumask *sched_group_mask(struct sched_group *sg)
-{
-        return to_cpumask(sg->sgp->cpumask);
-}
-/**
- * group_first_cpu - Returns the first cpu in the cpumask of a sched_group.
- * @group: The group whose first cpu is to be returned.
- */
-static inline unsigned int group_first_cpu(struct sched_group *group)
-{
-        return cpumask_first(sched_group_cpus(group));
-}
 struct sched_domain_attr {
        int relax_domain_level;
 };
@@ -883,6 +792,8 @@ struct sched_domain_attr {
 extern int sched_domain_level_max;
+struct sched_group;
 struct sched_domain {
        /* These fields must be setup */
        struct sched_domain *parent;    /* top domain must be null terminated */
@@ -899,6 +810,8 @@ struct sched_domain {
        unsigned int wake_idx;
        unsigned int forkexec_idx;
        unsigned int smt_gain;
+        int nohz_idle;                  /* NOHZ IDLE status */
        int flags;                      /* See SD_* */
        int level;
@@ -971,18 +884,6 @@ extern void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],
 cpumask_var_t *alloc_sched_domains(unsigned int ndoms);
 void free_sched_domains(cpumask_var_t doms[], unsigned int ndoms);
-/* Test a flag in parent sched domain */
-static inline int test_sd_parent(struct sched_domain *sd, int flag)
-{
-        if (sd->parent && (sd->parent->flags & flag))
-                return 1;
-        return 0;
-}
-unsigned long default_scale_freq_power(struct sched_domain *sd, int cpu);
-unsigned long default_scale_smt_power(struct sched_domain *sd, int cpu);
 bool cpus_share_cache(int this_cpu, int that_cpu);
 #else /* CONFIG_SMP */
@@ -1017,72 +918,6 @@ struct mempolicy;
 struct pipe_inode_info;
 struct uts_namespace;
-struct rq;
-struct sched_domain;
-/*
- * wake flags
- */
-#define WF_SYNC         0x01            /* waker goes to sleep after wakup */
-#define WF_FORK         0x02            /* child wakeup after fork */
-#define WF_MIGRATED     0x04            /* internal use, task got migrated */
-#define ENQUEUE_WAKEUP          1
-#define ENQUEUE_HEAD            2
-#ifdef CONFIG_SMP
-#define ENQUEUE_WAKING          4       /* sched_class::task_waking was called */
-#else
-#define ENQUEUE_WAKING          0
-#endif
-#define DEQUEUE_SLEEP           1
-struct sched_class {
-        const struct sched_class *next;
-        void (*enqueue_task) (struct rq *rq, struct task_struct *p, int flags);
-        void (*dequeue_task) (struct rq *rq, struct task_struct *p, int flags);
-        void (*yield_task) (struct rq *rq);
-        bool (*yield_to_task) (struct rq *rq, struct task_struct *p, bool preempt);
-        void (*check_preempt_curr) (struct rq *rq, struct task_struct *p, int flags);
-        struct task_struct * (*pick_next_task) (struct rq *rq);
-        void (*put_prev_task) (struct rq *rq, struct task_struct *p);
-#ifdef CONFIG_SMP
-        int  (*select_task_rq)(struct task_struct *p, int sd_flag, int flags);
-        void (*migrate_task_rq)(struct task_struct *p, int next_cpu);
-        void (*pre_schedule) (struct rq *this_rq, struct task_struct *task);
-        void (*post_schedule) (struct rq *this_rq);
-        void (*task_waking) (struct task_struct *task);
-        void (*task_woken) (struct rq *this_rq, struct task_struct *task);
-        void (*set_cpus_allowed)(struct task_struct *p,
-                                 const struct cpumask *newmask);
-        void (*rq_online)(struct rq *rq);
-        void (*rq_offline)(struct rq *rq);
-#endif
-        void (*set_curr_task) (struct rq *rq);
-        void (*task_tick) (struct rq *rq, struct task_struct *p, int queued);
-        void (*task_fork) (struct task_struct *p);
-        void (*switched_from) (struct rq *this_rq, struct task_struct *task);
-        void (*switched_to) (struct rq *this_rq, struct task_struct *task);
-        void (*prio_changed) (struct rq *this_rq, struct task_struct *task,
-                             int oldprio);
-        unsigned int (*get_rr_interval) (struct rq *rq,
-                                         struct task_struct *task);
-#ifdef CONFIG_FAIR_GROUP_SCHED
-        void (*task_move_group) (struct task_struct *p, int on_rq);
-#endif
-};
 struct load_weight {
        unsigned long weight, inv_weight;
 };
@@ -1274,8 +1109,10 @@ struct task_struct {
        int exit_code, exit_signal;
        int pdeath_signal;  /*  The signal sent when the parent dies  */
        unsigned int jobctl;    /* JOBCTL_*, siglock protected */
-        /* ??? */
+        /* Used for emulating ABI behavior of previous Linux versions */
        unsigned int personality;
        unsigned did_exec:1;
        unsigned in_execve:1;   /* Tell the LSMs that the process is doing an
                                 * execve */
@@ -1327,7 +1164,7 @@ struct task_struct {
        cputime_t utime, stime, utimescaled, stimescaled;
        cputime_t gtime;
-#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
        struct cputime prev_cputime;
 #endif
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
@@ -1793,7 +1630,7 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut,
 #define PF_SWAPWRITE    0x00800000      /* Allowed to write to swap */
 #define PF_SPREAD_PAGE  0x01000000      /* Spread page cache over cpuset */
 #define PF_SPREAD_SLAB  0x02000000      /* Spread some slab caches over cpuset */
-#define PF_THREAD_BOUND 0x04000000      /* Thread bound to specific cpu */
+#define PF_NO_SETAFFINITY 0x04000000    /* Userland is not allowed to meddle with cpus_allowed */
 #define PF_MCE_EARLY    0x08000000      /* Early kill for mce process policy */
 #define PF_MEMPOLICY    0x10000000      /* Non-default NUMA mempolicy */
 #define PF_MUTEX_TESTER 0x20000000      /* Thread belongs to the rt mutex tester */
@@ -2412,27 +2249,18 @@ static inline void threadgroup_change_end(struct task_struct *tsk)
 *
 * Lock the threadgroup @tsk belongs to.  No new task is allowed to enter
 * and member tasks aren't allowed to exit (as indicated by PF_EXITING) or
- * perform exec.  This is useful for cases where the threadgroup needs to
+ * change ->group_leader/pid.  This is useful for cases where the threadgroup
- * stay stable across blockable operations.
+ * needs to stay stable across blockable operations.
 *
 * fork and exit paths explicitly call threadgroup_change_{begin|end}() for
 * synchronization.  While held, no new task will be added to threadgroup
 * and no existing live task will have its PF_EXITING set.
 *
- * During exec, a task goes and puts its thread group through unusual
+ * de_thread() does threadgroup_change_{begin|end}() when a non-leader
- * changes.  After de-threading, exclusive access is assumed to resources
+ * sub-thread becomes a new leader.
- * which are usually shared by tasks in the same group - e.g. sighand may
- * be replaced with a new one.  Also, the exec'ing task takes over group
- * leader role including its pid.  Exclude these changes while locked by
- * grabbing cred_guard_mutex which is used to synchronize exec path.
 */
 static inline void threadgroup_lock(struct task_struct *tsk)
 {
-        /*
-         * exec uses exit for de-threading nesting group_rwsem inside
-         * cred_guard_mutex. Grab cred_guard_mutex first.
-         */
-        mutex_lock(&tsk->signal->cred_guard_mutex);
        down_write(&tsk->signal->group_rwsem);
 }
@@ -2445,7 +2273,6 @@ static inline void threadgroup_lock(struct task_struct *tsk)
 static inline void threadgroup_unlock(struct task_struct *tsk)
 {
        up_write(&tsk->signal->group_rwsem);
-        mutex_unlock(&tsk->signal->cred_guard_mutex);
 }
 #else
 static inline void threadgroup_change_begin(struct task_struct *tsk) {}
@@ -2622,6 +2449,47 @@ static inline int spin_needbreak(spinlock_t *lock)
 }
 /*
+ * Idle thread specific functions to determine the need_resched
+ * polling state. We have two versions, one based on TS_POLLING in
+ * thread_info.status and one based on TIF_POLLING_NRFLAG in
+ * thread_info.flags
+ */
+#ifdef TS_POLLING
+static inline int tsk_is_polling(struct task_struct *p)
+{
+        return task_thread_info(p)->status & TS_POLLING;
+}
+static inline void current_set_polling(void)
+{
+        current_thread_info()->status |= TS_POLLING;
+}
+static inline void current_clr_polling(void)
+{
+        current_thread_info()->status &= ~TS_POLLING;
+        smp_mb__after_clear_bit();
+}
+#elif defined(TIF_POLLING_NRFLAG)
+static inline int tsk_is_polling(struct task_struct *p)
+{
+        return test_tsk_thread_flag(p, TIF_POLLING_NRFLAG);
+}
+static inline void current_set_polling(void)
+{
+        set_thread_flag(TIF_POLLING_NRFLAG);
+}
+static inline void current_clr_polling(void)
+{
+        clear_thread_flag(TIF_POLLING_NRFLAG);
+}
+#else
+static inline int tsk_is_polling(struct task_struct *p) { return 0; }
+static inline void current_set_polling(void) { }
+static inline void current_clr_polling(void) { }
+#endif
+/*
 * Thread group CPU time accounting.
 */
 void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times);
@@ -2681,28 +2549,7 @@ extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask);
 extern long sched_getaffinity(pid_t pid, struct cpumask *mask);
 #ifdef CONFIG_CGROUP_SCHED
 extern struct task_group root_task_group;
-extern struct task_group *sched_create_group(struct task_group *parent);
-extern void sched_online_group(struct task_group *tg,
-                               struct task_group *parent);
-extern void sched_destroy_group(struct task_group *tg);
-extern void sched_offline_group(struct task_group *tg);
-extern void sched_move_task(struct task_struct *tsk);
-#ifdef CONFIG_FAIR_GROUP_SCHED
-extern int sched_group_set_shares(struct task_group *tg, unsigned long shares);
-extern unsigned long sched_group_shares(struct task_group *tg);
-#endif
-#ifdef CONFIG_RT_GROUP_SCHED
-extern int sched_group_set_rt_runtime(struct task_group *tg,
-                                      long rt_runtime_us);
-extern long sched_group_rt_runtime(struct task_group *tg);
-extern int sched_group_set_rt_period(struct task_group *tg,
-                                      long rt_period_us);
-extern long sched_group_rt_period(struct task_group *tg);
-extern int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk);
-#endif
 #endif /* CONFIG_CGROUP_SCHED */
 extern int task_can_switch_user(struct user_struct *up,
diff --git a/include/linux/security.h b/include/linux/security.h
index eee7478cda70..4686491852a7 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1012,6 +1012,10 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      This hook can be used by the module to update any security state
 *      associated with the TUN device's security structure.
 *      @security pointer to the TUN devices's security structure.
+ * @skb_owned_by:
+ *      This hook sets the packet's owning sock.
+ *      @skb is the packet.
+ *      @sk the sock which owns the packet.
 *
 * Security hooks for XFRM operations.
 *
@@ -1436,7 +1440,7 @@ struct security_operations {
                             struct path *new_path);
        int (*sb_set_mnt_opts) (struct super_block *sb,
                                struct security_mnt_opts *opts);
-        void (*sb_clone_mnt_opts) (const struct super_block *oldsb,
+        int (*sb_clone_mnt_opts) (const struct super_block *oldsb,
                                   struct super_block *newsb);
        int (*sb_parse_opts_str) (char *options, struct security_mnt_opts *opts);
@@ -1638,6 +1642,7 @@ struct security_operations {
        int (*tun_dev_attach_queue) (void *security);
        int (*tun_dev_attach) (struct sock *sk, void *security);
        int (*tun_dev_open) (void *security);
+        void (*skb_owned_by) (struct sk_buff *skb, struct sock *sk);
 #endif  /* CONFIG_SECURITY_NETWORK */
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
@@ -1721,7 +1726,7 @@ int security_sb_mount(const char *dev_name, struct path *path,
 int security_sb_umount(struct vfsmount *mnt, int flags);
 int security_sb_pivotroot(struct path *old_path, struct path *new_path);
 int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *opts);
-void security_sb_clone_mnt_opts(const struct super_block *oldsb,
+int security_sb_clone_mnt_opts(const struct super_block *oldsb,
                                struct super_block *newsb);
 int security_sb_parse_opts_str(char *options, struct security_mnt_opts *opts);
@@ -2011,9 +2016,11 @@ static inline int security_sb_set_mnt_opts(struct super_block *sb,
        return 0;
 }
-static inline void security_sb_clone_mnt_opts(const struct super_block *oldsb,
+static inline int security_sb_clone_mnt_opts(const struct super_block *oldsb,
                                              struct super_block *newsb)
-{ }
+{
+        return 0;
+}
 static inline int security_sb_parse_opts_str(char *options, struct security_mnt_opts *opts)
 {
@@ -2588,6 +2595,8 @@ int security_tun_dev_attach_queue(void *security);
 int security_tun_dev_attach(struct sock *sk, void *security);
 int security_tun_dev_open(void *security);
+void security_skb_owned_by(struct sk_buff *skb, struct sock *sk);
 #else   /* CONFIG_SECURITY_NETWORK */
 static inline int security_unix_stream_connect(struct sock *sock,
                                               struct sock *other,
@@ -2779,6 +2788,11 @@ static inline int security_tun_dev_open(void *security)
 {
        return 0;
 }
+static inline void security_skb_owned_by(struct sk_buff *skb, struct sock *sk)
+{
+}
 #endif  /* CONFIG_SECURITY_NETWORK */
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
diff --git a/include/linux/serial_s3c.h b/include/linux/serial_s3c.h
new file mode 100644
index 000000000000..907d9d1d56cf
--- /dev/null
+++ b/include/linux/serial_s3c.h
@@ -0,0 +1,260 @@
+/*
+ *  Internal header file for Samsung S3C2410 serial ports (UART0-2)
+ *
+ *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
+ *
+ *  Additional defines, Copyright 2003 Simtec Electronics (linux@simtec.co.uk)
+ *
+ *  Adapted from:
+ *
+ *  Internal header file for MX1ADS serial ports (UART1 & 2)
+ *
+ *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+#ifndef __ASM_ARM_REGS_SERIAL_H
+#define __ASM_ARM_REGS_SERIAL_H
+#define S3C2410_URXH      (0x24)
+#define S3C2410_UTXH      (0x20)
+#define S3C2410_ULCON     (0x00)
+#define S3C2410_UCON      (0x04)
+#define S3C2410_UFCON     (0x08)
+#define S3C2410_UMCON     (0x0C)
+#define S3C2410_UBRDIV    (0x28)
+#define S3C2410_UTRSTAT   (0x10)
+#define S3C2410_UERSTAT   (0x14)
+#define S3C2410_UFSTAT    (0x18)
+#define S3C2410_UMSTAT    (0x1C)
+#define S3C2410_LCON_CFGMASK      ((0xF<<3)|(0x3))
+#define S3C2410_LCON_CS5          (0x0)
+#define S3C2410_LCON_CS6          (0x1)
+#define S3C2410_LCON_CS7          (0x2)
+#define S3C2410_LCON_CS8          (0x3)
+#define S3C2410_LCON_CSMASK       (0x3)
+#define S3C2410_LCON_PNONE        (0x0)
+#define S3C2410_LCON_PEVEN        (0x5 << 3)
+#define S3C2410_LCON_PODD         (0x4 << 3)
+#define S3C2410_LCON_PMASK        (0x7 << 3)
+#define S3C2410_LCON_STOPB        (1<<2)
+#define S3C2410_LCON_IRM          (1<<6)
+#define S3C2440_UCON_CLKMASK      (3<<10)
+#define S3C2440_UCON_CLKSHIFT     (10)
+#define S3C2440_UCON_PCLK         (0<<10)
+#define S3C2440_UCON_UCLK         (1<<10)
+#define S3C2440_UCON_PCLK2        (2<<10)
+#define S3C2440_UCON_FCLK         (3<<10)
+#define S3C2443_UCON_EPLL         (3<<10)
+#define S3C6400_UCON_CLKMASK    (3<<10)
+#define S3C6400_UCON_CLKSHIFT   (10)
+#define S3C6400_UCON_PCLK       (0<<10)
+#define S3C6400_UCON_PCLK2      (2<<10)
+#define S3C6400_UCON_UCLK0      (1<<10)
+#define S3C6400_UCON_UCLK1      (3<<10)
+#define S3C2440_UCON2_FCLK_EN     (1<<15)
+#define S3C2440_UCON0_DIVMASK     (15 << 12)
+#define S3C2440_UCON1_DIVMASK     (15 << 12)
+#define S3C2440_UCON2_DIVMASK     (7 << 12)
+#define S3C2440_UCON_DIVSHIFT     (12)
+#define S3C2412_UCON_CLKMASK    (3<<10)
+#define S3C2412_UCON_CLKSHIFT   (10)
+#define S3C2412_UCON_UCLK       (1<<10)
+#define S3C2412_UCON_USYSCLK    (3<<10)
+#define S3C2412_UCON_PCLK       (0<<10)
+#define S3C2412_UCON_PCLK2      (2<<10)
+#define S3C2410_UCON_CLKMASK    (1 << 10)
+#define S3C2410_UCON_CLKSHIFT   (10)
+#define S3C2410_UCON_UCLK         (1<<10)
+#define S3C2410_UCON_SBREAK       (1<<4)
+#define S3C2410_UCON_TXILEVEL     (1<<9)
+#define S3C2410_UCON_RXILEVEL     (1<<8)
+#define S3C2410_UCON_TXIRQMODE    (1<<2)
+#define S3C2410_UCON_RXIRQMODE    (1<<0)
+#define S3C2410_UCON_RXFIFO_TOI   (1<<7)
+#define S3C2443_UCON_RXERR_IRQEN  (1<<6)
+#define S3C2443_UCON_LOOPBACK     (1<<5)
+#define S3C2410_UCON_DEFAULT      (S3C2410_UCON_TXILEVEL  | \
+                                   S3C2410_UCON_RXILEVEL  | \
+                                   S3C2410_UCON_TXIRQMODE | \
+                                   S3C2410_UCON_RXIRQMODE | \
+                                   S3C2410_UCON_RXFIFO_TOI)
+#define S3C2410_UFCON_FIFOMODE    (1<<0)
+#define S3C2410_UFCON_TXTRIG0     (0<<6)
+#define S3C2410_UFCON_RXTRIG8     (1<<4)
+#define S3C2410_UFCON_RXTRIG12    (2<<4)
+/* S3C2440 FIFO trigger levels */
+#define S3C2440_UFCON_RXTRIG1     (0<<4)
+#define S3C2440_UFCON_RXTRIG8     (1<<4)
+#define S3C2440_UFCON_RXTRIG16    (2<<4)
+#define S3C2440_UFCON_RXTRIG32    (3<<4)
+#define S3C2440_UFCON_TXTRIG0     (0<<6)
+#define S3C2440_UFCON_TXTRIG16    (1<<6)
+#define S3C2440_UFCON_TXTRIG32    (2<<6)
+#define S3C2440_UFCON_TXTRIG48    (3<<6)
+#define S3C2410_UFCON_RESETBOTH   (3<<1)
+#define S3C2410_UFCON_RESETTX     (1<<2)
+#define S3C2410_UFCON_RESETRX     (1<<1)
+#define S3C2410_UFCON_DEFAULT     (S3C2410_UFCON_FIFOMODE | \
+                                   S3C2410_UFCON_TXTRIG0  | \
+                                   S3C2410_UFCON_RXTRIG8 )
+#define S3C2410_UMCOM_AFC         (1<<4)
+#define S3C2410_UMCOM_RTS_LOW     (1<<0)
+#define S3C2412_UMCON_AFC_63    (0<<5)          /* same as s3c2443 */
+#define S3C2412_UMCON_AFC_56    (1<<5)
+#define S3C2412_UMCON_AFC_48    (2<<5)
+#define S3C2412_UMCON_AFC_40    (3<<5)
+#define S3C2412_UMCON_AFC_32    (4<<5)
+#define S3C2412_UMCON_AFC_24    (5<<5)
+#define S3C2412_UMCON_AFC_16    (6<<5)
+#define S3C2412_UMCON_AFC_8     (7<<5)
+#define S3C2410_UFSTAT_TXFULL     (1<<9)
+#define S3C2410_UFSTAT_RXFULL     (1<<8)
+#define S3C2410_UFSTAT_TXMASK     (15<<4)
+#define S3C2410_UFSTAT_TXSHIFT    (4)
+#define S3C2410_UFSTAT_RXMASK     (15<<0)
+#define S3C2410_UFSTAT_RXSHIFT    (0)
+/* UFSTAT S3C2443 same as S3C2440 */
+#define S3C2440_UFSTAT_TXFULL     (1<<14)
+#define S3C2440_UFSTAT_RXFULL     (1<<6)
+#define S3C2440_UFSTAT_TXSHIFT    (8)
+#define S3C2440_UFSTAT_RXSHIFT    (0)
+#define S3C2440_UFSTAT_TXMASK     (63<<8)
+#define S3C2440_UFSTAT_RXMASK     (63)
+#define S3C2410_UTRSTAT_TXE       (1<<2)
+#define S3C2410_UTRSTAT_TXFE      (1<<1)
+#define S3C2410_UTRSTAT_RXDR      (1<<0)
+#define S3C2410_UERSTAT_OVERRUN   (1<<0)
+#define S3C2410_UERSTAT_FRAME     (1<<2)
+#define S3C2410_UERSTAT_BREAK     (1<<3)
+#define S3C2443_UERSTAT_PARITY    (1<<1)
+#define S3C2410_UERSTAT_ANY       (S3C2410_UERSTAT_OVERRUN | \
+                                   S3C2410_UERSTAT_FRAME | \
+                                   S3C2410_UERSTAT_BREAK)
+#define S3C2410_UMSTAT_CTS        (1<<0)
+#define S3C2410_UMSTAT_DeltaCTS   (1<<2)
+#define S3C2443_DIVSLOT           (0x2C)
+/* S3C64XX interrupt registers. */
+#define S3C64XX_UINTP           0x30
+#define S3C64XX_UINTSP          0x34
+#define S3C64XX_UINTM           0x38
+#define S3C64XX_UINTM_RXD       (0)
+#define S3C64XX_UINTM_TXD       (2)
+#define S3C64XX_UINTM_RXD_MSK   (1 << S3C64XX_UINTM_RXD)
+#define S3C64XX_UINTM_TXD_MSK   (1 << S3C64XX_UINTM_TXD)
+/* Following are specific to S5PV210 */
+#define S5PV210_UCON_CLKMASK    (1<<10)
+#define S5PV210_UCON_CLKSHIFT   (10)
+#define S5PV210_UCON_PCLK       (0<<10)
+#define S5PV210_UCON_UCLK       (1<<10)
+#define S5PV210_UFCON_TXTRIG0   (0<<8)
+#define S5PV210_UFCON_TXTRIG4   (1<<8)
+#define S5PV210_UFCON_TXTRIG8   (2<<8)
+#define S5PV210_UFCON_TXTRIG16  (3<<8)
+#define S5PV210_UFCON_TXTRIG32  (4<<8)
+#define S5PV210_UFCON_TXTRIG64  (5<<8)
+#define S5PV210_UFCON_TXTRIG128 (6<<8)
+#define S5PV210_UFCON_TXTRIG256 (7<<8)
+#define S5PV210_UFCON_RXTRIG1   (0<<4)
+#define S5PV210_UFCON_RXTRIG4   (1<<4)
+#define S5PV210_UFCON_RXTRIG8   (2<<4)
+#define S5PV210_UFCON_RXTRIG16  (3<<4)
+#define S5PV210_UFCON_RXTRIG32  (4<<4)
+#define S5PV210_UFCON_RXTRIG64  (5<<4)
+#define S5PV210_UFCON_RXTRIG128 (6<<4)
+#define S5PV210_UFCON_RXTRIG256 (7<<4)
+#define S5PV210_UFSTAT_TXFULL   (1<<24)
+#define S5PV210_UFSTAT_RXFULL   (1<<8)
+#define S5PV210_UFSTAT_TXMASK   (255<<16)
+#define S5PV210_UFSTAT_TXSHIFT  (16)
+#define S5PV210_UFSTAT_RXMASK   (255<<0)
+#define S5PV210_UFSTAT_RXSHIFT  (0)
+#define S3C2410_UCON_CLKSEL0    (1 << 0)
+#define S3C2410_UCON_CLKSEL1    (1 << 1)
+#define S3C2410_UCON_CLKSEL2    (1 << 2)
+#define S3C2410_UCON_CLKSEL3    (1 << 3)
+/* Default values for s5pv210 UCON and UFCON uart registers */
+#define S5PV210_UCON_DEFAULT    (S3C2410_UCON_TXILEVEL |        \
+                                 S3C2410_UCON_RXILEVEL |        \
+                                 S3C2410_UCON_TXIRQMODE |       \
+                                 S3C2410_UCON_RXIRQMODE |       \
+                                 S3C2410_UCON_RXFIFO_TOI |      \
+                                 S3C2443_UCON_RXERR_IRQEN)
+#define S5PV210_UFCON_DEFAULT   (S3C2410_UFCON_FIFOMODE |       \
+                                 S5PV210_UFCON_TXTRIG4 |        \
+                                 S5PV210_UFCON_RXTRIG4)
+#ifndef __ASSEMBLY__
+/* configuration structure for per-machine configurations for the
+ * serial port
+ *
+ * the pointer is setup by the machine specific initialisation from the
+ * arch/arm/mach-s3c2410/ directory.
+*/
+struct s3c2410_uartcfg {
+        unsigned char      hwport;       /* hardware port number */
+        unsigned char      unused;
+        unsigned short     flags;
+        upf_t              uart_flags;   /* default uart flags */
+        unsigned int       clk_sel;
+        unsigned int       has_fracval;
+        unsigned long      ucon;         /* value of ucon for port */
+        unsigned long      ulcon;        /* value of ulcon for port */
+        unsigned long      ufcon;        /* value of ufcon for port */
+};
+#endif /* __ASSEMBLY__ */
+#endif /* __ASM_ARM_REGS_SERIAL_H */
diff --git a/include/linux/signal.h b/include/linux/signal.h
index a2dcb94ea49d..9475c5cb28bc 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -250,11 +250,11 @@ extern int show_unhandled_signals;
 extern int sigsuspend(sigset_t *);
 struct sigaction {
-#ifndef __ARCH_HAS_ODD_SIGACTION
+#ifndef __ARCH_HAS_IRIX_SIGACTION
        __sighandler_t  sa_handler;
        unsigned long   sa_flags;
 #else
-        unsigned long   sa_flags;
+        unsigned int    sa_flags;
        __sighandler_t  sa_handler;
 #endif
 #ifdef __ARCH_HAS_SA_RESTORER
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 441f5bfdab8e..b8292d8cc9fa 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2643,6 +2643,13 @@ static inline void nf_reset(struct sk_buff *skb)
 #endif
 }
+static inline void nf_reset_trace(struct sk_buff *skb)
+{
+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
+        skb->nf_trace = 0;
+#endif
+}
 /* Note: This doesn't put any conntrack and bridge info in dst. */
 static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src)
 {
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 3e07a7df6478..e6564c1dc552 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -20,7 +20,6 @@ struct call_single_data {
        smp_call_func_t func;
        void *info;
        u16 flags;
-        u16 priv;
 };
 /* total number of cpus in this system (may exceed NR_CPUS) */
diff --git a/include/linux/spi/spi-tegra.h b/include/linux/spi/spi-tegra.h
deleted file mode 100644
index 786932c62edb..000000000000
--- a/include/linux/spi/spi-tegra.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * spi-tegra.h: SPI interface for Nvidia Tegra20 SLINK controller.
- *
- * Copyright (C) 2011 NVIDIA Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-#ifndef _LINUX_SPI_TEGRA_H
-#define _LINUX_SPI_TEGRA_H
-struct tegra_spi_platform_data {
-        int dma_req_sel;
-        unsigned int spi_max_frequency;
-};
-/*
- * Controller data from device to pass some info like
- * hw based chip select can be used or not and if yes
- * then CS hold and setup time.
- */
-struct tegra_spi_device_controller_data {
-        bool is_hw_based_cs;
-        int cs_setup_clk_count;
-        int cs_hold_clk_count;
-};
-#endif /* _LINUX_SPI_TEGRA_H */
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 38c2b925923d..733eb5ee31c5 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -228,6 +228,11 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
 *      every chipselect is connected to a slave.
 * @dma_alignment: SPI controller constraint on DMA buffers alignment.
 * @mode_bits: flags understood by this controller driver
+ * @bits_per_word_mask: A mask indicating which values of bits_per_word are
+ *      supported by the driver. Bit n indicates that a bits_per_word n+1 is
+ *      suported. If set, the SPI core will reject any transfer with an
+ *      unsupported bits_per_word. If not set, this value is simply ignored,
+ *      and it's up to the individual driver to perform any validation.
 * @flags: other constraints relevant to this driver
 * @bus_lock_spinlock: spinlock for SPI bus locking
 * @bus_lock_mutex: mutex for SPI bus locking
@@ -301,6 +306,9 @@ struct spi_master {
        /* spi_device.mode flags understood by this controller driver */
        u16                     mode_bits;
+        /* bitmask of supported bits_per_word for transfers */
+        u32                     bits_per_word_mask;
        /* other constraints relevant to this driver */
        u16                     flags;
 #define SPI_MASTER_HALF_DUPLEX  BIT(0)          /* can't do full duplex */
diff --git a/include/linux/spinlock_up.h b/include/linux/spinlock_up.h
index a26e2fb604e6..e2369c167dbd 100644
--- a/include/linux/spinlock_up.h
+++ b/include/linux/spinlock_up.h
@@ -16,7 +16,10 @@
 * In the debug case, 1 means unlocked, 0 means locked. (the values
 * are inverted, to catch initialization bugs)
 *
- * No atomicity anywhere, we are on UP.
+ * No atomicity anywhere, we are on UP. However, we still need
+ * the compiler barriers, because we do not want the compiler to
+ * move potentially faulting instructions (notably user accesses)
+ * into the locked sequence, resulting in non-atomic execution.
 */
 #ifdef CONFIG_DEBUG_SPINLOCK
@@ -25,6 +28,7 @@
 static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
        lock->slock = 0;
+        barrier();
 }
 static inline void
@@ -32,6 +36,7 @@ arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
 {
        local_irq_save(flags);
        lock->slock = 0;
+        barrier();
 }
 static inline int arch_spin_trylock(arch_spinlock_t *lock)
@@ -39,32 +44,34 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)
        char oldval = lock->slock;
        lock->slock = 0;
+        barrier();
        return oldval > 0;
 }
 static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
+        barrier();
        lock->slock = 1;
 }
 /*
 * Read-write spinlocks. No debug version.
 */
-#define arch_read_lock(lock)            do { (void)(lock); } while (0)
+#define arch_read_lock(lock)            do { barrier(); (void)(lock); } while (0)
-#define arch_write_lock(lock)           do { (void)(lock); } while (0)
+#define arch_write_lock(lock)           do { barrier(); (void)(lock); } while (0)
-#define arch_read_trylock(lock) ({ (void)(lock); 1; })
+#define arch_read_trylock(lock) ({ barrier(); (void)(lock); 1; })
-#define arch_write_trylock(lock)        ({ (void)(lock); 1; })
+#define arch_write_trylock(lock)        ({ barrier(); (void)(lock); 1; })
-#define arch_read_unlock(lock)          do { (void)(lock); } while (0)
+#define arch_read_unlock(lock)          do { barrier(); (void)(lock); } while (0)
-#define arch_write_unlock(lock) do { (void)(lock); } while (0)
+#define arch_write_unlock(lock) do { barrier(); (void)(lock); } while (0)
 #else /* DEBUG_SPINLOCK */
 #define arch_spin_is_locked(lock)       ((void)(lock), 0)
 /* for sched.c and kernel_lock.c: */
-# define arch_spin_lock(lock)           do { (void)(lock); } while (0)
+# define arch_spin_lock(lock)           do { barrier(); (void)(lock); } while (0)
-# define arch_spin_lock_flags(lock, flags)      do { (void)(lock); } while (0)
+# define arch_spin_lock_flags(lock, flags)      do { barrier(); (void)(lock); } while (0)
-# define arch_spin_unlock(lock) do { (void)(lock); } while (0)
+# define arch_spin_unlock(lock) do { barrier(); (void)(lock); } while (0)
-# define arch_spin_trylock(lock)        ({ (void)(lock); 1; })
+# define arch_spin_trylock(lock)        ({ barrier(); (void)(lock); 1; })
 #endif /* DEBUG_SPINLOCK */
 #define arch_spin_is_contended(lock)    (((void)(lock), 0))
diff --git a/include/linux/ssb/ssb_driver_chipcommon.h b/include/linux/ssb/ssb_driver_chipcommon.h
index 9e492be5244b..6fcfe99bd999 100644
--- a/include/linux/ssb/ssb_driver_chipcommon.h
+++ b/include/linux/ssb/ssb_driver_chipcommon.h
@@ -219,6 +219,7 @@
 #define SSB_CHIPCO_PMU_CTL                      0x0600 /* PMU control */
 #define  SSB_CHIPCO_PMU_CTL_ILP_DIV             0xFFFF0000 /* ILP div mask */
 #define  SSB_CHIPCO_PMU_CTL_ILP_DIV_SHIFT       16
+#define  SSB_CHIPCO_PMU_CTL_PLL_UPD             0x00000400
 #define  SSB_CHIPCO_PMU_CTL_NOILPONW            0x00000200 /* No ILP on wait */
 #define  SSB_CHIPCO_PMU_CTL_HTREQEN             0x00000100 /* HT req enable */
 #define  SSB_CHIPCO_PMU_CTL_ALPREQEN            0x00000080 /* ALP req enable */
@@ -667,5 +668,6 @@ enum ssb_pmu_ldo_volt_id {
 void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
                             enum ssb_pmu_ldo_volt_id id, u32 voltage);
 void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on);
+void ssb_pmu_spuravoid_pllupdate(struct ssb_chipcommon *cc, int spuravoid);
 #endif /* LINUX_SSB_CHIPCO_H_ */
diff --git a/include/linux/ssbi.h b/include/linux/ssbi.h
new file mode 100644
index 000000000000..44ef5da21470
--- /dev/null
+++ b/include/linux/ssbi.h
@@ -0,0 +1,38 @@
+/* Copyright (C) 2010 Google, Inc.
+ * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ * Author: Dima Zavin <dima@android.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef _LINUX_SSBI_H
+#define _LINUX_SSBI_H
+#include <linux/types.h>
+struct ssbi_slave_info {
+        const char      *name;
+        void            *platform_data;
+};
+enum ssbi_controller_type {
+        MSM_SBI_CTRL_SSBI = 0,
+        MSM_SBI_CTRL_SSBI2,
+        MSM_SBI_CTRL_PMIC_ARBITER,
+};
+struct ssbi_platform_data {
+        struct ssbi_slave_info  slave;
+        enum ssbi_controller_type controller_type;
+};
+int ssbi_write(struct device *dev, u16 addr, u8 *buf, int len);
+int ssbi_read(struct device *dev, u16 addr, u8 *buf, int len);
+#endif
diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h
index a3eb2f65b656..3eeee9672a4a 100644
--- a/include/linux/string_helpers.h
+++ b/include/linux/string_helpers.h
@@ -13,4 +13,62 @@ enum string_size_units {
 int string_get_size(u64 size, enum string_size_units units,
                    char *buf, int len);
+#define UNESCAPE_SPACE          0x01
+#define UNESCAPE_OCTAL          0x02
+#define UNESCAPE_HEX            0x04
+#define UNESCAPE_SPECIAL        0x08
+#define UNESCAPE_ANY            \
+        (UNESCAPE_SPACE | UNESCAPE_OCTAL | UNESCAPE_HEX | UNESCAPE_SPECIAL)
+/**
+ * string_unescape - unquote characters in the given string
+ * @src:        source buffer (escaped)
+ * @dst:        destination buffer (unescaped)
+ * @size:       size of the destination buffer (0 to unlimit)
+ * @flags:      combination of the flags (bitwise OR):
+ *      %UNESCAPE_SPACE:
+ *              '\f' - form feed
+ *              '\n' - new line
+ *              '\r' - carriage return
+ *              '\t' - horizontal tab
+ *              '\v' - vertical tab
+ *      %UNESCAPE_OCTAL:
+ *              '\NNN' - byte with octal value NNN (1 to 3 digits)
+ *      %UNESCAPE_HEX:
+ *              '\xHH' - byte with hexadecimal value HH (1 to 2 digits)
+ *      %UNESCAPE_SPECIAL:
+ *              '\"' - double quote
+ *              '\\' - backslash
+ *              '\a' - alert (BEL)
+ *              '\e' - escape
+ *      %UNESCAPE_ANY:
+ *              all previous together
+ *
+ * Returns amount of characters processed to the destination buffer excluding
+ * trailing '\0'.
+ *
+ * Because the size of the output will be the same as or less than the size of
+ * the input, the transformation may be performed in place.
+ *
+ * Caller must provide valid source and destination pointers. Be aware that
+ * destination buffer will always be NULL-terminated. Source string must be
+ * NULL-terminated as well.
+ */
+int string_unescape(char *src, char *dst, size_t size, unsigned int flags);
+static inline int string_unescape_inplace(char *buf, unsigned int flags)
+{
+        return string_unescape(buf, buf, 0, flags);
+}
+static inline int string_unescape_any(char *src, char *dst, size_t size)
+{
+        return string_unescape(src, dst, size, UNESCAPE_ANY);
+}
+static inline int string_unescape_any_inplace(char *buf)
+{
+        return string_unescape_any(buf, buf, 0);
+}
 #endif
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index 58fda1c3c783..0dd00f4f6810 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -22,6 +22,8 @@
 /* size of the nodename buffer */
 #define UNX_MAXNODENAME 32
+struct rpcsec_gss_info;
 /* Work around the lack of a VFS credential */
 struct auth_cred {
        kuid_t  uid;
@@ -103,6 +105,9 @@ struct rpc_authops {
        int                     (*pipes_create)(struct rpc_auth *);
        void                    (*pipes_destroy)(struct rpc_auth *);
        int                     (*list_pseudoflavors)(rpc_authflavor_t *, int);
+        rpc_authflavor_t        (*info2flavor)(struct rpcsec_gss_info *);
+        int                     (*flavor2info)(rpc_authflavor_t,
+                                                struct rpcsec_gss_info *);
 };
 struct rpc_credops {
@@ -137,6 +142,10 @@ int			rpcauth_register(const struct rpc_authops *);
 int                     rpcauth_unregister(const struct rpc_authops *);
 struct rpc_auth *       rpcauth_create(rpc_authflavor_t, struct rpc_clnt *);
 void                    rpcauth_release(struct rpc_auth *);
+rpc_authflavor_t        rpcauth_get_pseudoflavor(rpc_authflavor_t,
+                                struct rpcsec_gss_info *);
+int                     rpcauth_get_gssinfo(rpc_authflavor_t,
+                                struct rpcsec_gss_info *);
 int                     rpcauth_list_flavors(rpc_authflavor_t *, int);
 struct rpc_cred *       rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *, int);
 void                    rpcauth_init_cred(struct rpc_cred *, const struct auth_cred *, struct rpc_auth *, const struct rpc_credops *);
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 2cf4ffaa3cd4..e7d492ce7c18 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -124,6 +124,7 @@ struct rpc_create_args {
 #define RPC_CLNT_CREATE_NOPING          (1UL << 4)
 #define RPC_CLNT_CREATE_DISCRTRY        (1UL << 5)
 #define RPC_CLNT_CREATE_QUIET           (1UL << 6)
+#define RPC_CLNT_CREATE_INFINITE_SLOTS  (1UL << 7)
 struct rpc_clnt *rpc_create(struct rpc_create_args *args);
 struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *,
diff --git a/include/linux/sunrpc/gss_api.h b/include/linux/sunrpc/gss_api.h
index a19e2547ae6a..f32b7a47e13f 100644
--- a/include/linux/sunrpc/gss_api.h
+++ b/include/linux/sunrpc/gss_api.h
@@ -25,10 +25,21 @@ struct gss_ctx {
 #define GSS_C_NO_BUFFER         ((struct xdr_netobj) 0)
 #define GSS_C_NO_CONTEXT        ((struct gss_ctx *) 0)
-#define GSS_C_NULL_OID          ((struct xdr_netobj) 0)
+#define GSS_C_QOP_DEFAULT       (0)
 /*XXX  arbitrary length - is this set somewhere? */
 #define GSS_OID_MAX_LEN 32
+struct rpcsec_gss_oid {
+        unsigned int    len;
+        u8              data[GSS_OID_MAX_LEN];
+};
+/* From RFC 3530 */
+struct rpcsec_gss_info {
+        struct rpcsec_gss_oid   oid;
+        u32                     qop;
+        u32                     service;
+};
 /* gss-api prototypes; note that these are somewhat simplified versions of
 * the prototypes specified in RFC 2744. */
@@ -58,12 +69,14 @@ u32 gss_unwrap(
 u32 gss_delete_sec_context(
                struct gss_ctx          **ctx_id);
-u32 gss_svc_to_pseudoflavor(struct gss_api_mech *, u32 service);
+rpc_authflavor_t gss_svc_to_pseudoflavor(struct gss_api_mech *, u32 qop,
+                                        u32 service);
 u32 gss_pseudoflavor_to_service(struct gss_api_mech *, u32 pseudoflavor);
 char *gss_service_to_auth_domain_name(struct gss_api_mech *, u32 service);
 struct pf_desc {
        u32     pseudoflavor;
+        u32     qop;
        u32     service;
        char    *name;
        char    *auth_domain_name;
@@ -76,7 +89,7 @@ struct pf_desc {
 struct gss_api_mech {
        struct list_head        gm_list;
        struct module           *gm_owner;
-        struct xdr_netobj       gm_oid;
+        struct rpcsec_gss_oid   gm_oid;
        char                    *gm_name;
        const struct gss_api_ops *gm_ops;
        /* pseudoflavors supported by this mechanism: */
@@ -117,9 +130,11 @@ struct gss_api_ops {
 int gss_mech_register(struct gss_api_mech *);
 void gss_mech_unregister(struct gss_api_mech *);
-/* returns a mechanism descriptor given an OID, and increments the mechanism's
+/* Given a GSS security tuple, look up a pseudoflavor */
- * reference count. */
+rpc_authflavor_t gss_mech_info2flavor(struct rpcsec_gss_info *);
-struct gss_api_mech * gss_mech_get_by_OID(struct xdr_netobj *);
+/* Given a pseudoflavor, look up a GSS security tuple */
+int gss_mech_flavor2info(rpc_authflavor_t, struct rpcsec_gss_info *);
 /* Returns a reference to a mechanism, given a name like "krb5" etc. */
 struct gss_api_mech *gss_mech_get_by_name(const char *);
@@ -130,9 +145,6 @@ struct gss_api_mech *gss_mech_get_by_pseudoflavor(u32);
 /* Fill in an array with a list of supported pseudoflavors */
 int gss_mech_list_pseudoflavors(rpc_authflavor_t *, int);
-/* Just increments the mechanism's reference count and returns its input: */
-struct gss_api_mech * gss_mech_get(struct gss_api_mech *);
 /* For every successful gss_mech_get or gss_mech_get_by_* call there must be a
 * corresponding call to gss_mech_put. */
 void gss_mech_put(struct gss_api_mech *);
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 30834be03011..ff5392421cb2 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -255,6 +255,8 @@ static inline int bc_prealloc(struct rpc_rqst *req)
 }
 #endif /* CONFIG_SUNRPC_BACKCHANNEL */
+#define XPRT_CREATE_INFINITE_SLOTS      (1U)
 struct xprt_create {
        int                     ident;          /* XPRT_TRANSPORT identifier */
        struct net *            net;
@@ -263,6 +265,7 @@ struct xprt_create {
        size_t                  addrlen;
        const char              *servername;
        struct svc_xprt         *bc_xprt;       /* NFSv4.1 backchannel */
+        unsigned int            flags;
 };
 struct xprt_class {
@@ -279,6 +282,7 @@ struct xprt_class {
 struct rpc_xprt         *xprt_create_transport(struct xprt_create *args);
 void                    xprt_connect(struct rpc_task *task);
 void                    xprt_reserve(struct rpc_task *task);
+void                    xprt_retry_reserve(struct rpc_task *task);
 int                     xprt_reserve_xprt(struct rpc_xprt *xprt, struct rpc_task *task);
 int                     xprt_reserve_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task);
 void                    xprt_alloc_slot(struct rpc_xprt *xprt, struct rpc_task *task);
@@ -334,6 +338,7 @@ int			xs_swapper(struct rpc_xprt *xprt, int enable);
 #define XPRT_CLOSING            (6)
 #define XPRT_CONNECTION_ABORT   (7)
 #define XPRT_CONNECTION_CLOSE   (8)
+#define XPRT_CONGESTED          (9)
 static inline void xprt_set_connected(struct rpc_xprt *xprt)
 {
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 2818a123f3ea..1701ce4be746 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -236,7 +236,7 @@ extern unsigned long nr_free_pagecache_pages(void);
 extern void __lru_cache_add(struct page *, enum lru_list lru);
 extern void lru_cache_add_lru(struct page *, enum lru_list lru);
 extern void lru_add_page_tail(struct page *page, struct page *page_tail,
-                              struct lruvec *lruvec);
+                         struct lruvec *lruvec, struct list_head *head);
 extern void activate_page(struct page *);
 extern void mark_page_accessed(struct page *);
 extern void lru_add_drain(void);
@@ -330,6 +330,9 @@ static inline void mem_cgroup_uncharge_swap(swp_entry_t ent)
 /* linux/mm/page_io.c */
 extern int swap_readpage(struct page *);
 extern int swap_writepage(struct page *page, struct writeback_control *wbc);
+extern void end_swap_bio_write(struct bio *bio, int err);
+extern int __swap_writepage(struct page *page, struct writeback_control *wbc,
+        void (*end_write_func)(struct bio *, int));
 extern int swap_set_page_dirty(struct page *page);
 extern void end_swap_bio_read(struct bio *bio, int err);
@@ -343,8 +346,9 @@ extern struct address_space swapper_spaces[];
 #define swap_address_space(entry) (&swapper_spaces[swp_type(entry)])
 extern unsigned long total_swapcache_pages(void);
 extern void show_swap_cache_info(void);
-extern int add_to_swap(struct page *);
+extern int add_to_swap(struct page *, struct list_head *list);
 extern int add_to_swap_cache(struct page *, swp_entry_t, gfp_t);
+extern int __add_to_swap_cache(struct page *page, swp_entry_t entry);
 extern void __delete_from_swap_cache(struct page *);
 extern void delete_from_swap_cache(struct page *);
 extern void free_page_and_swap_cache(struct page *);
@@ -461,7 +465,7 @@ static inline struct page *lookup_swap_cache(swp_entry_t swp)
        return NULL;
 }
-static inline int add_to_swap(struct page *page)
+static inline int add_to_swap(struct page *page, struct list_head *list)
 {
        return 0;
 }
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 2de42f9401d2..a5ffd32642fd 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -25,6 +25,7 @@ extern int swiotlb_force;
 extern void swiotlb_init(int verbose);
 int swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
 extern unsigned long swiotlb_nr_tbl(void);
+unsigned long swiotlb_size_or_default(void);
 extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs);
 /*
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 313a8e0a6553..4147d700a293 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -78,49 +78,34 @@ struct sigaltstack;
 #include <linux/key.h>
 #include <trace/syscall.h>
-#define __SC_DECL1(t1, a1)      t1 a1
+/*
-#define __SC_DECL2(t2, a2, ...) t2 a2, __SC_DECL1(__VA_ARGS__)
+ * __MAP - apply a macro to syscall arguments
-#define __SC_DECL3(t3, a3, ...) t3 a3, __SC_DECL2(__VA_ARGS__)
+ * __MAP(n, m, t1, a1, t2, a2, ..., tn, an) will expand to
-#define __SC_DECL4(t4, a4, ...) t4 a4, __SC_DECL3(__VA_ARGS__)
+ *    m(t1, a1), m(t2, a2), ..., m(tn, an)
-#define __SC_DECL5(t5, a5, ...) t5 a5, __SC_DECL4(__VA_ARGS__)
+ * The first argument must be equal to the amount of type/name
-#define __SC_DECL6(t6, a6, ...) t6 a6, __SC_DECL5(__VA_ARGS__)
+ * pairs given.  Note that this list of pairs (i.e. the arguments
+ * of __MAP starting at the third one) is in the same format as
-#define __SC_LONG1(t1, a1)      long a1
+ * for SYSCALL_DEFINE<n>/COMPAT_SYSCALL_DEFINE<n>
-#define __SC_LONG2(t2, a2, ...) long a2, __SC_LONG1(__VA_ARGS__)
+ */
-#define __SC_LONG3(t3, a3, ...) long a3, __SC_LONG2(__VA_ARGS__)
+#define __MAP0(m,...)
-#define __SC_LONG4(t4, a4, ...) long a4, __SC_LONG3(__VA_ARGS__)
+#define __MAP1(m,t,a) m(t,a)
-#define __SC_LONG5(t5, a5, ...) long a5, __SC_LONG4(__VA_ARGS__)
+#define __MAP2(m,t,a,...) m(t,a), __MAP1(m,__VA_ARGS__)
-#define __SC_LONG6(t6, a6, ...) long a6, __SC_LONG5(__VA_ARGS__)
+#define __MAP3(m,t,a,...) m(t,a), __MAP2(m,__VA_ARGS__)
+#define __MAP4(m,t,a,...) m(t,a), __MAP3(m,__VA_ARGS__)
-#define __SC_CAST1(t1, a1)      (t1) a1
+#define __MAP5(m,t,a,...) m(t,a), __MAP4(m,__VA_ARGS__)
-#define __SC_CAST2(t2, a2, ...) (t2) a2, __SC_CAST1(__VA_ARGS__)
+#define __MAP6(m,t,a,...) m(t,a), __MAP5(m,__VA_ARGS__)
-#define __SC_CAST3(t3, a3, ...) (t3) a3, __SC_CAST2(__VA_ARGS__)
+#define __MAP(n,...) __MAP##n(__VA_ARGS__)
-#define __SC_CAST4(t4, a4, ...) (t4) a4, __SC_CAST3(__VA_ARGS__)
-#define __SC_CAST5(t5, a5, ...) (t5) a5, __SC_CAST4(__VA_ARGS__)
+#define __SC_DECL(t, a) t a
-#define __SC_CAST6(t6, a6, ...) (t6) a6, __SC_CAST5(__VA_ARGS__)
+#define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
+#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
-#define __SC_TEST(type)         BUILD_BUG_ON(sizeof(type) > sizeof(long))
+#define __SC_CAST(t, a) (t) a
-#define __SC_TEST1(t1, a1)      __SC_TEST(t1)
+#define __SC_ARGS(t, a) a
-#define __SC_TEST2(t2, a2, ...) __SC_TEST(t2); __SC_TEST1(__VA_ARGS__)
+#define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
-#define __SC_TEST3(t3, a3, ...) __SC_TEST(t3); __SC_TEST2(__VA_ARGS__)
-#define __SC_TEST4(t4, a4, ...) __SC_TEST(t4); __SC_TEST3(__VA_ARGS__)
-#define __SC_TEST5(t5, a5, ...) __SC_TEST(t5); __SC_TEST4(__VA_ARGS__)
-#define __SC_TEST6(t6, a6, ...) __SC_TEST(t6); __SC_TEST5(__VA_ARGS__)
 #ifdef CONFIG_FTRACE_SYSCALLS
-#define __SC_STR_ADECL1(t, a)           #a
+#define __SC_STR_ADECL(t, a)    #a
-#define __SC_STR_ADECL2(t, a, ...)      #a, __SC_STR_ADECL1(__VA_ARGS__)
+#define __SC_STR_TDECL(t, a)    #t
-#define __SC_STR_ADECL3(t, a, ...)      #a, __SC_STR_ADECL2(__VA_ARGS__)
-#define __SC_STR_ADECL4(t, a, ...)      #a, __SC_STR_ADECL3(__VA_ARGS__)
-#define __SC_STR_ADECL5(t, a, ...)      #a, __SC_STR_ADECL4(__VA_ARGS__)
-#define __SC_STR_ADECL6(t, a, ...)      #a, __SC_STR_ADECL5(__VA_ARGS__)
-#define __SC_STR_TDECL1(t, a)           #t
-#define __SC_STR_TDECL2(t, a, ...)      #t, __SC_STR_TDECL1(__VA_ARGS__)
-#define __SC_STR_TDECL3(t, a, ...)      #t, __SC_STR_TDECL2(__VA_ARGS__)
-#define __SC_STR_TDECL4(t, a, ...)      #t, __SC_STR_TDECL3(__VA_ARGS__)
-#define __SC_STR_TDECL5(t, a, ...)      #t, __SC_STR_TDECL4(__VA_ARGS__)
-#define __SC_STR_TDECL6(t, a, ...)      #t, __SC_STR_TDECL5(__VA_ARGS__)
 extern struct ftrace_event_class event_class_syscall_enter;
 extern struct ftrace_event_class event_class_syscall_exit;
@@ -155,7 +140,13 @@ extern struct trace_event_functions exit_syscall_print_funcs;
          __attribute__((section("_ftrace_events")))                    \
        *__event_exit_##sname = &event_exit_##sname;
-#define SYSCALL_METADATA(sname, nb)                             \
+#define SYSCALL_METADATA(sname, nb, ...)                        \
+        static const char *types_##sname[] = {                  \
+                __MAP(nb,__SC_STR_TDECL,__VA_ARGS__)            \
+        };                                                      \
+        static const char *args_##sname[] = {                   \
+                __MAP(nb,__SC_STR_ADECL,__VA_ARGS__)            \
+        };                                                      \
        SYSCALL_TRACE_ENTER_EVENT(sname);                       \
        SYSCALL_TRACE_EXIT_EVENT(sname);                        \
        static struct syscall_metadata __used                   \
@@ -163,8 +154,8 @@ extern struct trace_event_functions exit_syscall_print_funcs;
                .name           = "sys"#sname,                  \
                .syscall_nr     = -1,   /* Filled in at boot */ \
                .nb_args        = nb,                           \
-                .types          = types_##sname,                \
+                .types          = nb ? types_##sname : NULL,    \
-                .args           = args_##sname,                 \
+                .args           = nb ? args_##sname : NULL,     \
                .enter_event    = &event_enter_##sname,         \
                .exit_event     = &event_exit_##sname,          \
                .enter_fields   = LIST_HEAD_INIT(__syscall_meta_##sname.enter_fields), \
@@ -172,26 +163,13 @@ extern struct trace_event_functions exit_syscall_print_funcs;
        static struct syscall_metadata __used                   \
          __attribute__((section("__syscalls_metadata")))       \
         *__p_syscall_meta_##sname = &__syscall_meta_##sname;
+#else
+#define SYSCALL_METADATA(sname, nb, ...)
+#endif
 #define SYSCALL_DEFINE0(sname)                                  \
-        SYSCALL_TRACE_ENTER_EVENT(_##sname);                    \
+        SYSCALL_METADATA(_##sname, 0);                          \
-        SYSCALL_TRACE_EXIT_EVENT(_##sname);                     \
-        static struct syscall_metadata __used                   \
-          __syscall_meta__##sname = {                           \
-                .name           = "sys_"#sname,                 \
-                .syscall_nr     = -1,   /* Filled in at boot */ \
-                .nb_args        = 0,                            \
-                .enter_event    = &event_enter__##sname,        \
-                .exit_event     = &event_exit__##sname,         \
-                .enter_fields   = LIST_HEAD_INIT(__syscall_meta__##sname.enter_fields), \
-        };                                                      \
-        static struct syscall_metadata __used                   \
-          __attribute__((section("__syscalls_metadata")))       \
-         *__p_syscall_meta_##sname = &__syscall_meta__##sname;  \
        asmlinkage long sys_##sname(void)
-#else
-#define SYSCALL_DEFINE0(name)      asmlinkage long sys_##name(void)
-#endif
 #define SYSCALL_DEFINE1(name, ...) SYSCALL_DEFINEx(1, _##name, __VA_ARGS__)
 #define SYSCALL_DEFINE2(name, ...) SYSCALL_DEFINEx(2, _##name, __VA_ARGS__)
@@ -200,57 +178,23 @@ extern struct trace_event_functions exit_syscall_print_funcs;
 #define SYSCALL_DEFINE5(name, ...) SYSCALL_DEFINEx(5, _##name, __VA_ARGS__)
 #define SYSCALL_DEFINE6(name, ...) SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)
-#ifdef CONFIG_PPC64
-#define SYSCALL_ALIAS(alias, name)                                      \
-        asm ("\t.globl " #alias "\n\t.set " #alias ", " #name "\n"      \
-             "\t.globl ." #alias "\n\t.set ." #alias ", ." #name)
-#else
-#if defined(CONFIG_ALPHA) || defined(CONFIG_MIPS)
-#define SYSCALL_ALIAS(alias, name)                                      \
-        asm ( #alias " = " #name "\n\t.globl " #alias)
-#else
-#define SYSCALL_ALIAS(alias, name)                                      \
-        asm ("\t.globl " #alias "\n\t.set " #alias ", " #name)
-#endif
-#endif
-#ifdef CONFIG_FTRACE_SYSCALLS
 #define SYSCALL_DEFINEx(x, sname, ...)                          \
-        static const char *types_##sname[] = {                  \
+        SYSCALL_METADATA(sname, x, __VA_ARGS__)                 \
-                __SC_STR_TDECL##x(__VA_ARGS__)                  \
-        };                                                      \
-        static const char *args_##sname[] = {                   \
-                __SC_STR_ADECL##x(__VA_ARGS__)                  \
-        };                                                      \
-        SYSCALL_METADATA(sname, x);                             \
        __SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
-#else
-#define SYSCALL_DEFINEx(x, sname, ...)                          \
-        __SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
-#endif
-#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS
-#define SYSCALL_DEFINE(name) static inline long SYSC_##name
+#define __PROTECT(...) asmlinkage_protect(__VA_ARGS__)
 #define __SYSCALL_DEFINEx(x, name, ...)                                 \
-        asmlinkage long sys##name(__SC_DECL##x(__VA_ARGS__));           \
+        asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));      \
-        static inline long SYSC##name(__SC_DECL##x(__VA_ARGS__));       \
+        static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));  \
-        asmlinkage long SyS##name(__SC_LONG##x(__VA_ARGS__))            \
+        asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))       \
        {                                                               \
-                __SC_TEST##x(__VA_ARGS__);                              \
+                long ret = SYSC##name(__MAP(x,__SC_CAST,__VA_ARGS__));  \
-                return (long) SYSC##name(__SC_CAST##x(__VA_ARGS__));    \
+                __MAP(x,__SC_TEST,__VA_ARGS__);                         \
+                __PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__));       \
+                return ret;                                             \
        }                                                               \
        SYSCALL_ALIAS(sys##name, SyS##name);                            \
-        static inline long SYSC##name(__SC_DECL##x(__VA_ARGS__))
+        static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
-#else /* CONFIG_HAVE_SYSCALL_WRAPPERS */
-#define SYSCALL_DEFINE(name) asmlinkage long sys_##name
-#define __SYSCALL_DEFINEx(x, name, ...)                                 \
-        asmlinkage long sys##name(__SC_DECL##x(__VA_ARGS__))
-#endif /* CONFIG_HAVE_SYSCALL_WRAPPERS */
 asmlinkage long sys_time(time_t __user *tloc);
 asmlinkage long sys_stime(time_t __user *tptr);
@@ -694,7 +638,7 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
 asmlinkage long sys_semget(key_t key, int nsems, int semflg);
 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
                                unsigned nsops);
-asmlinkage long sys_semctl(int semid, int semnum, int cmd, union semun arg);
+asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
                                unsigned nsops,
                                const struct timespec __user *timeout);
diff --git a/include/linux/time.h b/include/linux/time.h
index d4835dfdf25e..22d81b3c955b 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -181,6 +181,9 @@ extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
 extern int timekeeping_valid_for_hres(void);
 extern u64 timekeeping_max_deferment(void);
 extern int timekeeping_inject_offset(struct timespec *ts);
+extern s32 timekeeping_get_tai_offset(void);
+extern void timekeeping_set_tai_offset(s32 tai_offset);
+extern void timekeeping_clocktai(struct timespec *ts);
 struct tms;
 extern void do_sys_times(struct tms *);
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index e1d558e237ec..c1825eb436ed 100644
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -20,6 +20,8 @@ struct timekeeper {
        u32                     shift;
        /* Number of clock cycles in one NTP interval. */
        cycle_t                 cycle_interval;
+        /* Last cycle value (also stored in clock->cycle_last) */
+        cycle_t                 cycle_last;
        /* Number of clock shifted nano seconds in one NTP interval. */
        u64                     xtime_interval;
        /* shifted nano seconds left over when rounding cycle_interval */
@@ -62,8 +64,11 @@ struct timekeeper {
        ktime_t                 offs_boot;
        /* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */
        struct timespec         raw_time;
-        /* Seqlock for all timekeeper values */
+        /* The current UTC to TAI offset in seconds */
-        seqlock_t               lock;
+        s32                     tai_offset;
+        /* Offset clock monotonic -> clock tai */
+        ktime_t                 offs_tai;
 };
 static inline struct timespec tk_xtime(struct timekeeper *tk)
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 5ec87c60b97c..b3726e61368e 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -125,9 +125,6 @@
 extern unsigned long tick_usec;         /* USER_HZ period (usec) */
 extern unsigned long tick_nsec;         /* SHIFTED_HZ period (nsec) */
-extern void ntp_init(void);
-extern void ntp_clear(void);
 /* Required to safely shift negative values */
 #define shift_right(x, s) ({    \
        __typeof__(x) __x = (x);        \
@@ -140,10 +137,6 @@ extern void ntp_clear(void);
 #define NTP_INTERVAL_FREQ  (HZ)
 #define NTP_INTERVAL_LENGTH (NSEC_PER_SEC/NTP_INTERVAL_FREQ)
-/* Returns how long ticks are at present, in ns / 2^NTP_SCALE_SHIFT. */
-extern u64 ntp_tick_length(void);
-extern int second_overflow(unsigned long secs);
 extern int do_adjtimex(struct timex *);
 extern void hardpps(const struct timespec *, const struct timespec *);
diff --git a/include/linux/trace_clock.h b/include/linux/trace_clock.h
index d563f37e1a1d..1d7ca2739272 100644
--- a/include/linux/trace_clock.h
+++ b/include/linux/trace_clock.h
@@ -16,6 +16,7 @@
 extern u64 notrace trace_clock_local(void);
 extern u64 notrace trace_clock(void);
+extern u64 notrace trace_clock_jiffies(void);
 extern u64 notrace trace_clock_global(void);
 extern u64 notrace trace_clock_counter(void);
diff --git a/include/linux/tty.h b/include/linux/tty.h
index c75d886b0307..367a9dfc4ea2 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -255,9 +255,9 @@ struct tty_struct {
        int count;
        struct winsize winsize;         /* termios mutex */
        unsigned char stopped:1, hw_stopped:1, flow_stopped:1, packet:1;
-        unsigned char warned:1;
        unsigned char ctrl_status;      /* ctrl_lock */
        unsigned int receive_room;      /* Bytes free for queue */
+        int flow_change;
        struct tty_struct *link;
        struct fasync_struct *fasync;
@@ -315,9 +315,25 @@ struct tty_file_private {
 #define TTY_NO_WRITE_SPLIT      17      /* Preserve write boundaries to driver */
 #define TTY_HUPPED              18      /* Post driver->hangup() */
 #define TTY_HUPPING             21      /* ->hangup() in progress */
+#define TTY_LDISC_HALTED        22      /* Line discipline is halted */
 #define TTY_WRITE_FLUSH(tty) tty_write_flush((tty))
+/* Values for tty->flow_change */
+#define TTY_THROTTLE_SAFE 1
+#define TTY_UNTHROTTLE_SAFE 2
+static inline void __tty_set_flow_change(struct tty_struct *tty, int val)
+{
+        tty->flow_change = val;
+}
+static inline void tty_set_flow_change(struct tty_struct *tty, int val)
+{
+        tty->flow_change = val;
+        smp_mb();
+}
 #ifdef CONFIG_TTY
 extern void console_init(void);
 extern void tty_kref_put(struct tty_struct *tty);
@@ -400,6 +416,8 @@ extern int tty_write_room(struct tty_struct *tty);
 extern void tty_driver_flush_buffer(struct tty_struct *tty);
 extern void tty_throttle(struct tty_struct *tty);
 extern void tty_unthrottle(struct tty_struct *tty);
+extern int tty_throttle_safe(struct tty_struct *tty);
+extern int tty_unthrottle_safe(struct tty_struct *tty);
 extern int tty_do_resize(struct tty_struct *tty, struct winsize *ws);
 extern void tty_driver_remove_tty(struct tty_driver *driver,
                                  struct tty_struct *tty);
@@ -419,13 +437,28 @@ extern void tty_flush_to_ldisc(struct tty_struct *tty);
 extern void tty_buffer_free_all(struct tty_port *port);
 extern void tty_buffer_flush(struct tty_struct *tty);
 extern void tty_buffer_init(struct tty_port *port);
-extern speed_t tty_get_baud_rate(struct tty_struct *tty);
 extern speed_t tty_termios_baud_rate(struct ktermios *termios);
 extern speed_t tty_termios_input_baud_rate(struct ktermios *termios);
 extern void tty_termios_encode_baud_rate(struct ktermios *termios,
                                                speed_t ibaud, speed_t obaud);
 extern void tty_encode_baud_rate(struct tty_struct *tty,
                                                speed_t ibaud, speed_t obaud);
+/**
+ *      tty_get_baud_rate       -       get tty bit rates
+ *      @tty: tty to query
+ *
+ *      Returns the baud rate as an integer for this terminal. The
+ *      termios lock must be held by the caller and the terminal bit
+ *      flags may be updated.
+ *
+ *      Locking: none
+ */
+static inline speed_t tty_get_baud_rate(struct tty_struct *tty)
+{
+        return tty_termios_baud_rate(&tty->termios);
+}
 extern void tty_termios_copy_hw(struct ktermios *new, struct ktermios *old);
 extern int tty_termios_hw_change(struct ktermios *a, struct ktermios *b);
 extern int tty_set_termios(struct tty_struct *tty, struct ktermios *kt);
@@ -502,6 +535,8 @@ extern int tty_port_carrier_raised(struct tty_port *port);
 extern void tty_port_raise_dtr_rts(struct tty_port *port);
 extern void tty_port_lower_dtr_rts(struct tty_port *port);
 extern void tty_port_hangup(struct tty_port *port);
+extern void tty_port_tty_hangup(struct tty_port *port, bool check_clocal);
+extern void tty_port_tty_wakeup(struct tty_port *port);
 extern int tty_port_block_til_ready(struct tty_port *port,
                                struct tty_struct *tty, struct file *filp);
 extern int tty_port_close_start(struct tty_port *port,
@@ -526,8 +561,6 @@ extern void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty);
 extern void tty_ldisc_init(struct tty_struct *tty);
 extern void tty_ldisc_deinit(struct tty_struct *tty);
 extern void tty_ldisc_begin(void);
-/* This last one is just for the tty layer internals and shouldn't be used elsewhere */
-extern void tty_ldisc_enable(struct tty_struct *tty);
 /* n_tty.c */
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 455a0d7bf220..58390c73df8b 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -9,89 +9,89 @@
 *
 * int  (*open)(struct tty_struct *);
 *
- *      This function is called when the line discipline is associated
+ *      This function is called when the line discipline is associated
- *      with the tty.  The line discipline can use this as an
+ *      with the tty.  The line discipline can use this as an
- *      opportunity to initialize any state needed by the ldisc routines.
+ *      opportunity to initialize any state needed by the ldisc routines.
- * 
+ *
 * void (*close)(struct tty_struct *);
 *
 *      This function is called when the line discipline is being
- *      shutdown, either because the tty is being closed or because
+ *      shutdown, either because the tty is being closed or because
- *      the tty is being changed to use a new line discipline
+ *      the tty is being changed to use a new line discipline
- * 
+ *
 * void (*flush_buffer)(struct tty_struct *tty);
 *
- *      This function instructs the line discipline to clear its
+ *      This function instructs the line discipline to clear its
- *      buffers of any input characters it may have queued to be
+ *      buffers of any input characters it may have queued to be
- *      delivered to the user mode process.
+ *      delivered to the user mode process.
- * 
+ *
 * ssize_t (*chars_in_buffer)(struct tty_struct *tty);
 *
- *      This function returns the number of input characters the line
+ *      This function returns the number of input characters the line
 *      discipline may have queued up to be delivered to the user mode
 *      process.
- * 
+ *
 * ssize_t (*read)(struct tty_struct * tty, struct file * file,
 *                 unsigned char * buf, size_t nr);
 *
- *      This function is called when the user requests to read from
+ *      This function is called when the user requests to read from
- *      the tty.  The line discipline will return whatever characters
+ *      the tty.  The line discipline will return whatever characters
- *      it has buffered up for the user.  If this function is not
+ *      it has buffered up for the user.  If this function is not
- *      defined, the user will receive an EIO error.
+ *      defined, the user will receive an EIO error.
- * 
+ *
 * ssize_t (*write)(struct tty_struct * tty, struct file * file,
- *                  const unsigned char * buf, size_t nr);
+ *                  const unsigned char * buf, size_t nr);
- *
+ *
- *      This function is called when the user requests to write to the
+ *      This function is called when the user requests to write to the
- *      tty.  The line discipline will deliver the characters to the
+ *      tty.  The line discipline will deliver the characters to the
- *      low-level tty device for transmission, optionally performing
+ *      low-level tty device for transmission, optionally performing
- *      some processing on the characters first.  If this function is
+ *      some processing on the characters first.  If this function is
- *      not defined, the user will receive an EIO error.
+ *      not defined, the user will receive an EIO error.
- * 
+ *
 * int  (*ioctl)(struct tty_struct * tty, struct file * file,
- *               unsigned int cmd, unsigned long arg);
+ *               unsigned int cmd, unsigned long arg);
 *
 *      This function is called when the user requests an ioctl which
- *      is not handled by the tty layer or the low-level tty driver.
+ *      is not handled by the tty layer or the low-level tty driver.
- *      It is intended for ioctls which affect line discpline
+ *      It is intended for ioctls which affect line discpline
- *      operation.  Note that the search order for ioctls is (1) tty
+ *      operation.  Note that the search order for ioctls is (1) tty
- *      layer, (2) tty low-level driver, (3) line discpline.  So a
+ *      layer, (2) tty low-level driver, (3) line discpline.  So a
- *      low-level driver can "grab" an ioctl request before the line
+ *      low-level driver can "grab" an ioctl request before the line
- *      discpline has a chance to see it.
+ *      discpline has a chance to see it.
- * 
+ *
 * long (*compat_ioctl)(struct tty_struct * tty, struct file * file,
- *                      unsigned int cmd, unsigned long arg);
+ *                      unsigned int cmd, unsigned long arg);
 *
- *      Process ioctl calls from 32-bit process on 64-bit system
+ *      Process ioctl calls from 32-bit process on 64-bit system
 *
 * void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
 *
- *      This function notifies the line discpline that a change has
+ *      This function notifies the line discpline that a change has
- *      been made to the termios structure.
+ *      been made to the termios structure.
- * 
+ *
 * int  (*poll)(struct tty_struct * tty, struct file * file,
- *                poll_table *wait);
+ *                poll_table *wait);
 *
- *      This function is called when a user attempts to select/poll on a
+ *      This function is called when a user attempts to select/poll on a
- *      tty device.  It is solely the responsibility of the line
+ *      tty device.  It is solely the responsibility of the line
- *      discipline to handle poll requests.
+ *      discipline to handle poll requests.
 *
 * void (*receive_buf)(struct tty_struct *, const unsigned char *cp,
- *                     char *fp, int count);
+ *                     char *fp, int count);
- *
+ *
- *      This function is called by the low-level tty driver to send
+ *      This function is called by the low-level tty driver to send
- *      characters received by the hardware to the line discpline for
+ *      characters received by the hardware to the line discpline for
- *      processing.  <cp> is a pointer to the buffer of input
+ *      processing.  <cp> is a pointer to the buffer of input
- *      character received by the device.  <fp> is a pointer to a
+ *      character received by the device.  <fp> is a pointer to a
- *      pointer of flag bytes which indicate whether a character was
+ *      pointer of flag bytes which indicate whether a character was
- *      received with a parity error, etc.
+ *      received with a parity error, etc.
- * 
+ *
 * void (*write_wakeup)(struct tty_struct *);
 *
- *      This function is called by the low-level tty driver to signal
+ *      This function is called by the low-level tty driver to signal
- *      that line discpline should try to send more characters to the
+ *      that line discpline should try to send more characters to the
- *      low-level driver for transmission.  If the line discpline does
+ *      low-level driver for transmission.  If the line discpline does
- *      not have any more data to send, it can just return.
+ *      not have any more data to send, it can just return.
 *
 * int (*hangup)(struct tty_struct *)
 *
@@ -115,7 +115,7 @@ struct tty_ldisc_ops {
        char    *name;
        int     num;
        int     flags;
-        
        /*
         * The following routines are called from above.
         */
@@ -123,19 +123,19 @@ struct tty_ldisc_ops {
        void    (*close)(struct tty_struct *);
        void    (*flush_buffer)(struct tty_struct *tty);
        ssize_t (*chars_in_buffer)(struct tty_struct *tty);
-        ssize_t (*read)(struct tty_struct * tty, struct file * file,
+        ssize_t (*read)(struct tty_struct *tty, struct file *file,
-                        unsigned char __user * buf, size_t nr);
+                        unsigned char __user *buf, size_t nr);
-        ssize_t (*write)(struct tty_struct * tty, struct file * file,
+        ssize_t (*write)(struct tty_struct *tty, struct file *file,
-                         const unsigned char * buf, size_t nr); 
+                         const unsigned char *buf, size_t nr);
-        int     (*ioctl)(struct tty_struct * tty, struct file * file,
+        int     (*ioctl)(struct tty_struct *tty, struct file *file,
                         unsigned int cmd, unsigned long arg);
-        long    (*compat_ioctl)(struct tty_struct * tty, struct file * file,
+        long    (*compat_ioctl)(struct tty_struct *tty, struct file *file,
                                unsigned int cmd, unsigned long arg);
-        void    (*set_termios)(struct tty_struct *tty, struct ktermios * old);
+        void    (*set_termios)(struct tty_struct *tty, struct ktermios *old);
        unsigned int (*poll)(struct tty_struct *, struct file *,
                             struct poll_table_struct *);
        int     (*hangup)(struct tty_struct *tty);
-        
        /*
         * The following routines are called from below.
         */
@@ -145,7 +145,7 @@ struct tty_ldisc_ops {
        void    (*dcd_change)(struct tty_struct *, unsigned int);
        struct  module *owner;
-        
        int refcount;
 };
diff --git a/include/linux/ucs2_string.h b/include/linux/ucs2_string.h
new file mode 100644
index 000000000000..cbb20afdbc01
--- /dev/null
+++ b/include/linux/ucs2_string.h
@@ -0,0 +1,14 @@
+#ifndef _LINUX_UCS2_STRING_H_
+#define _LINUX_UCS2_STRING_H_
+#include <linux/types.h>        /* for size_t */
+#include <linux/stddef.h>       /* for NULL */
+typedef u16 ucs2_char_t;
+unsigned long ucs2_strnlen(const ucs2_char_t *s, size_t maxlength);
+unsigned long ucs2_strlen(const ucs2_char_t *s);
+unsigned long ucs2_strsize(const ucs2_char_t *data, unsigned long maxlength);
+int ucs2_strncmp(const ucs2_char_t *a, const ucs2_char_t *b, size_t len);
+#endif /* _LINUX_UCS2_STRING_H_ */
diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
index 02b83db8e2c5..06f28beed7c2 100644
--- a/include/linux/uprobes.h
+++ b/include/linux/uprobes.h
@@ -38,6 +38,8 @@ struct inode;
 #define UPROBE_HANDLER_REMOVE           1
 #define UPROBE_HANDLER_MASK             1
+#define MAX_URETPROBE_DEPTH             64
 enum uprobe_filter_ctx {
        UPROBE_FILTER_REGISTER,
        UPROBE_FILTER_UNREGISTER,
@@ -46,6 +48,9 @@ enum uprobe_filter_ctx {
 struct uprobe_consumer {
        int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs);
+        int (*ret_handler)(struct uprobe_consumer *self,
+                                unsigned long func,
+                                struct pt_regs *regs);
        bool (*filter)(struct uprobe_consumer *self,
                                enum uprobe_filter_ctx ctx,
                                struct mm_struct *mm);
@@ -68,6 +73,8 @@ struct uprobe_task {
        enum uprobe_task_state          state;
        struct arch_uprobe_task         autask;
+        struct return_instance          *return_instances;
+        unsigned int                    depth;
        struct uprobe                   *active_uprobe;
        unsigned long                   xol_vaddr;
@@ -100,6 +107,7 @@ struct uprobes_state {
 extern int __weak set_swbp(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr);
 extern int __weak set_orig_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr);
 extern bool __weak is_swbp_insn(uprobe_opcode_t *insn);
+extern bool __weak is_trap_insn(uprobe_opcode_t *insn);
 extern int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);
 extern int uprobe_apply(struct inode *inode, loff_t offset, struct uprobe_consumer *uc, bool);
 extern void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 4d22d0f6167a..a0bee5a28d1a 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -469,14 +469,12 @@ struct usb3_lpm_parameters {
 * @lpm_capable: device supports LPM
 * @usb2_hw_lpm_capable: device can perform USB2 hardware LPM
 * @usb2_hw_lpm_enabled: USB2 hardware LPM enabled
+ * @usb3_lpm_enabled: USB3 hardware LPM enabled
 * @string_langid: language ID for strings
 * @product: iProduct string, if present (static)
 * @manufacturer: iManufacturer string, if present (static)
 * @serial: iSerialNumber string, if present (static)
 * @filelist: usbfs files that are open to this device
- * @usb_classdev: USB class device that was created for usbfs device
- *      access from userspace
- * @usbfs_dentry: usbfs dentry entry for the device
 * @maxchild: number of ports if hub
 * @quirks: quirks of the whole device
 * @urbnum: number of URBs submitted for the whole device
@@ -619,7 +617,7 @@ static inline bool usb_acpi_power_manageable(struct usb_device *hdev, int index)
 #endif
 /* USB autosuspend and autoresume */
-#ifdef CONFIG_USB_SUSPEND
+#ifdef CONFIG_PM_RUNTIME
 extern void usb_enable_autosuspend(struct usb_device *udev);
 extern void usb_disable_autosuspend(struct usb_device *udev);
@@ -978,7 +976,12 @@ struct usbdrv_wrap {
 *      the "usbfs" filesystem.  This lets devices provide ways to
 *      expose information to user space regardless of where they
 *      do (or don't) show up otherwise in the filesystem.
- * @suspend: Called when the device is going to be suspended by the system.
+ * @suspend: Called when the device is going to be suspended by the
+ *      system either from system sleep or runtime suspend context. The
+ *      return value will be ignored in system sleep context, so do NOT
+ *      try to continue using the device if suspend fails in this case.
+ *      Instead, let the resume or reset-resume routine recover from
+ *      the failure.
 * @resume: Called when the device is being resumed by the system.
 * @reset_resume: Called when the suspended device has been reset instead
 *      of being resumed.
diff --git a/include/linux/usb/cdc-wdm.h b/include/linux/usb/cdc-wdm.h
index 719c332620fa..0b3f4295c025 100644
--- a/include/linux/usb/cdc-wdm.h
+++ b/include/linux/usb/cdc-wdm.h
@@ -11,6 +11,8 @@
 #ifndef __LINUX_USB_CDC_WDM_H
 #define __LINUX_USB_CDC_WDM_H
+#include <uapi/linux/usb/cdc-wdm.h>
 extern struct usb_driver *usb_cdc_wdm_register(struct usb_interface *intf,
                                        struct usb_endpoint_descriptor *ep,
                                        int bufsize,
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index 9c210f2283df..27603bcbb9b9 100644
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -43,4 +43,13 @@
 */
 extern const char *usb_speed_string(enum usb_device_speed speed);
+/**
+ * usb_state_string - Returns human readable name for the state.
+ * @state: The state to return a human-readable name for. If it's not
+ *      any of the states devices in usb_device_state_string enum,
+ *      the string UNKNOWN will be returned.
+ */
+extern const char *usb_state_string(enum usb_device_state state);
 #endif /* __LINUX_USB_CH9_H */
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 8860594d6364..5e61589fc166 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -39,6 +39,7 @@
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/log2.h>
+#include <linux/configfs.h>
 /*
 * USB function drivers should return USB_GADGET_DELAYED_STATUS if they
@@ -464,6 +465,8 @@ struct usb_function_driver {
 };
 struct usb_function_instance {
+        struct config_group group;
+        struct list_head cfs_list;
        struct usb_function_driver *fd;
        void (*free_func_inst)(struct usb_function_instance *inst);
 };
diff --git a/include/linux/usb/dwc3-omap.h b/include/linux/usb/dwc3-omap.h
index 51eae14477f7..5615f4d82724 100644
--- a/include/linux/usb/dwc3-omap.h
+++ b/include/linux/usb/dwc3-omap.h
@@ -19,11 +19,11 @@ enum omap_dwc3_vbus_id_status {
 };
 #if (defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_DWC3_MODULE))
-extern void dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status);
+extern int dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status);
 #else
-static inline void dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status)
+static inline int dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status)
 {
-        return;
+        return -ENODEV;
 }
 #endif
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 2e297e80d59a..c454a88abf2e 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -482,6 +482,7 @@ struct usb_gadget_ops {
 * @speed: Speed of current connection to USB host.
 * @max_speed: Maximal speed the UDC can handle.  UDC must support this
 *      and all slower speeds.
+ * @state: the state we are now (attached, suspended, configured, etc)
 * @sg_supported: true if we can handle scatter-gather
 * @is_otg: True if the USB device port uses a Mini-AB jack, so that the
 *      gadget driver must provide a USB OTG descriptor.
@@ -525,6 +526,7 @@ struct usb_gadget {
        struct list_head                ep_list;        /* of usb_ep */
        enum usb_device_speed           speed;
        enum usb_device_speed           max_speed;
+        enum usb_device_state           state;
        unsigned                        sg_supported:1;
        unsigned                        is_otg:1;
        unsigned                        is_a_peripheral:1;
@@ -872,6 +874,8 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver);
 */
 int usb_gadget_unregister_driver(struct usb_gadget_driver *driver);
+extern int usb_add_gadget_udc_release(struct device *parent,
+                struct usb_gadget *gadget, void (*release)(struct device *dev));
 extern int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget);
 extern void usb_del_gadget_udc(struct usb_gadget *gadget);
 extern int udc_attach_driver(const char *name,
@@ -959,6 +963,13 @@ extern void usb_gadget_unmap_request(struct usb_gadget *gadget,
 /*-------------------------------------------------------------------------*/
+/* utility to set gadget state properly */
+extern void usb_gadget_set_state(struct usb_gadget *gadget,
+                enum usb_device_state state);
+/*-------------------------------------------------------------------------*/
 /* utility wrapping a simple endpoint selection policy */
 extern struct usb_ep *usb_ep_autoconfig(struct usb_gadget *,
diff --git a/include/linux/usb/gadget_configfs.h b/include/linux/usb/gadget_configfs.h
new file mode 100644
index 000000000000..d74c0ae989d5
--- /dev/null
+++ b/include/linux/usb/gadget_configfs.h
@@ -0,0 +1,110 @@
+#ifndef __GADGET_CONFIGFS__
+#define __GADGET_CONFIGFS__
+#include <linux/configfs.h>
+int check_user_usb_string(const char *name,
+                struct usb_gadget_strings *stringtab_dev);
+#define GS_STRINGS_W(__struct, __name)  \
+        static ssize_t __struct##_##__name##_store(struct __struct *gs, \
+                const char *page, size_t len)           \
+{                                                       \
+        int ret;                                        \
+                                                        \
+        ret = usb_string_copy(page, &gs->__name);       \
+        if (ret)                                        \
+                return ret;                             \
+        return len;                                     \
+}
+#define GS_STRINGS_R(__struct, __name)  \
+        static ssize_t __struct##_##__name##_show(struct __struct *gs, \
+                        char *page)     \
+{       \
+        return sprintf(page, "%s\n", gs->__name ?: ""); \
+}
+#define GS_STRING_ITEM_ATTR(struct_name, name)  \
+        static struct struct_name##_attribute struct_name##_##name = \
+                __CONFIGFS_ATTR(name,  S_IRUGO | S_IWUSR,               \
+                                struct_name##_##name##_show,            \
+                                struct_name##_##name##_store)
+#define GS_STRINGS_RW(struct_name, _name)       \
+        GS_STRINGS_R(struct_name, _name)        \
+        GS_STRINGS_W(struct_name, _name)        \
+        GS_STRING_ITEM_ATTR(struct_name, _name)
+#define USB_CONFIG_STRING_RW_OPS(struct_in)                             \
+        CONFIGFS_ATTR_OPS(struct_in);                                   \
+                                                                        \
+static struct configfs_item_operations struct_in##_langid_item_ops = {  \
+        .release                = struct_in##_attr_release,             \
+        .show_attribute         = struct_in##_attr_show,                \
+        .store_attribute        = struct_in##_attr_store,               \
+};                                                                      \
+                                                                        \
+static struct config_item_type struct_in##_langid_type = {              \
+        .ct_item_ops    = &struct_in##_langid_item_ops,                 \
+        .ct_attrs       = struct_in##_langid_attrs,                     \
+        .ct_owner       = THIS_MODULE,                                  \
+}
+#define USB_CONFIG_STRINGS_LANG(struct_in, struct_member)       \
+        static struct config_group *struct_in##_strings_make(           \
+                        struct config_group *group,                     \
+                        const char *name)                               \
+        {                                                               \
+        struct struct_member *gi;                                       \
+        struct struct_in *gs;                                           \
+        struct struct_in *new;                                          \
+        int langs = 0;                                                  \
+        int ret;                                                        \
+                                                                        \
+        new = kzalloc(sizeof(*new), GFP_KERNEL);                        \
+        if (!new)                                                       \
+                return ERR_PTR(-ENOMEM);                                \
+                                                                        \
+        ret = check_user_usb_string(name, &new->stringtab_dev);         \
+        if (ret)                                                        \
+                goto err;                                               \
+        config_group_init_type_name(&new->group, name,                  \
+                        &struct_in##_langid_type);                      \
+                                                                        \
+        gi = container_of(group, struct struct_member, strings_group);  \
+        ret = -EEXIST;                                                  \
+        list_for_each_entry(gs, &gi->string_list, list) {               \
+                if (gs->stringtab_dev.language == new->stringtab_dev.language) \
+                        goto err;                                       \
+                langs++;                                                \
+        }                                                               \
+        ret = -EOVERFLOW;                                               \
+        if (langs >= MAX_USB_STRING_LANGS)                              \
+                goto err;                                               \
+                                                                        \
+        list_add_tail(&new->list, &gi->string_list);                    \
+        return &new->group;                                             \
+err:                                                                    \
+        kfree(new);                                                     \
+        return ERR_PTR(ret);                                            \
+}                                                                       \
+                                                                        \
+static void struct_in##_strings_drop(                                   \
+                struct config_group *group,                             \
+                struct config_item *item)                               \
+{                                                                       \
+        config_item_put(item);                                          \
+}                                                                       \
+                                                                        \
+static struct configfs_group_operations struct_in##_strings_ops = {     \
+        .make_group     = &struct_in##_strings_make,                    \
+        .drop_item      = &struct_in##_strings_drop,                    \
+};                                                                      \
+                                                                        \
+static struct config_item_type struct_in##_strings_type = {             \
+        .ct_group_ops   = &struct_in##_strings_ops,                     \
+        .ct_owner       = THIS_MODULE,                                  \
+}
+#endif
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 59694b5e5e90..f5f5c7dfda90 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -84,7 +84,7 @@ struct usb_hcd {
        struct timer_list       rh_timer;       /* drives root-hub polling */
        struct urb              *status_urb;    /* the current status urb */
-#ifdef CONFIG_USB_SUSPEND
+#ifdef CONFIG_PM_RUNTIME
        struct work_struct      wakeup_work;    /* for remote wakeup */
 #endif
@@ -593,14 +593,14 @@ extern int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg);
 extern int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg);
 #endif /* CONFIG_PM */
-#ifdef CONFIG_USB_SUSPEND
+#ifdef CONFIG_PM_RUNTIME
 extern void usb_hcd_resume_root_hub(struct usb_hcd *hcd);
 #else
 static inline void usb_hcd_resume_root_hub(struct usb_hcd *hcd)
 {
        return;
 }
-#endif /* CONFIG_USB_SUSPEND */
+#endif /* CONFIG_PM_RUNTIME */
 /*-------------------------------------------------------------------------*/
diff --git a/include/linux/usb/musb-ux500.h b/include/linux/usb/musb-ux500.h
new file mode 100644
index 000000000000..1e2c7130f6e1
--- /dev/null
+++ b/include/linux/usb/musb-ux500.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2013 ST-Ericsson AB
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef __MUSB_UX500_H__
+#define __MUSB_UX500_H__
+enum ux500_musb_vbus_id_status {
+        UX500_MUSB_NONE = 0,
+        UX500_MUSB_VBUS,
+        UX500_MUSB_ID,
+        UX500_MUSB_CHARGER,
+        UX500_MUSB_ENUMERATED,
+        UX500_MUSB_RIDA,
+        UX500_MUSB_RIDB,
+        UX500_MUSB_RIDC,
+        UX500_MUSB_PREPARE,
+        UX500_MUSB_CLEAN,
+};
+#endif  /* __MUSB_UX500_H__ */
diff --git a/include/linux/usb/nop-usb-xceiv.h b/include/linux/usb/nop-usb-xceiv.h
index 28884c717411..148d35171aac 100644
--- a/include/linux/usb/nop-usb-xceiv.h
+++ b/include/linux/usb/nop-usb-xceiv.h
@@ -5,6 +5,11 @@
 struct nop_usb_xceiv_platform_data {
        enum usb_phy_type type;
+        unsigned long clk_rate;
+        /* if set fails with -EPROBE_DEFER if can't get regulator */
+        unsigned int needs_vcc:1;
+        unsigned int needs_reset:1;
 };
 #if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index e8a5fe87c6bd..291e01ba32e5 100644
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -36,14 +36,7 @@ struct usb_otg {
 };
-#ifdef CONFIG_USB_OTG_UTILS
+extern const char *usb_otg_state_string(enum usb_otg_state state);
-extern const char *otg_state_string(enum usb_otg_state state);
-#else
-static inline const char *otg_state_string(enum usb_otg_state state)
-{
-        return NULL;
-}
-#endif
 /* Context: can sleep */
 static inline int
diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h
index 15847cbdb512..6b5978f57633 100644
--- a/include/linux/usb/phy.h
+++ b/include/linux/usb/phy.h
@@ -91,6 +91,9 @@ struct usb_phy {
        int     (*init)(struct usb_phy *x);
        void    (*shutdown)(struct usb_phy *x);
+        /* enable/disable VBUS */
+        int     (*set_vbus)(struct usb_phy *x, int on);
        /* effective for B devices, ignored for A-peripheral */
        int     (*set_power)(struct usb_phy *x,
                                unsigned mA);
@@ -160,8 +163,26 @@ usb_phy_shutdown(struct usb_phy *x)
                x->shutdown(x);
 }
+static inline int
+usb_phy_vbus_on(struct usb_phy *x)
+{
+        if (!x->set_vbus)
+                return 0;
+        return x->set_vbus(x, true);
+}
+static inline int
+usb_phy_vbus_off(struct usb_phy *x)
+{
+        if (!x->set_vbus)
+                return 0;
+        return x->set_vbus(x, false);
+}
 /* for usb host and peripheral controller drivers */
-#ifdef CONFIG_USB_OTG_UTILS
+#if IS_ENABLED(CONFIG_USB_PHY)
 extern struct usb_phy *usb_get_phy(enum usb_phy_type type);
 extern struct usb_phy *devm_usb_get_phy(struct device *dev,
        enum usb_phy_type type);
@@ -176,29 +197,29 @@ extern int usb_bind_phy(const char *dev_name, u8 index,
 #else
 static inline struct usb_phy *usb_get_phy(enum usb_phy_type type)
 {
-        return NULL;
+        return ERR_PTR(-ENXIO);
 }
 static inline struct usb_phy *devm_usb_get_phy(struct device *dev,
        enum usb_phy_type type)
 {
-        return NULL;
+        return ERR_PTR(-ENXIO);
 }
 static inline struct usb_phy *usb_get_phy_dev(struct device *dev, u8 index)
 {
-        return NULL;
+        return ERR_PTR(-ENXIO);
 }
 static inline struct usb_phy *devm_usb_get_phy_dev(struct device *dev, u8 index)
 {
-        return NULL;
+        return ERR_PTR(-ENXIO);
 }
 static inline struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev,
        const char *phandle, u8 index)
 {
-        return NULL;
+        return ERR_PTR(-ENXIO);
 }
 static inline void usb_put_phy(struct usb_phy *x)
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index c5d36c65c33b..e452ba6ec6bd 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -62,14 +62,14 @@ struct renesas_usbhs_platform_callback {
         * Hardware exit function for platform.
         * it is called when driver was removed
         */
-        void (*hardware_exit)(struct platform_device *pdev);
+        int (*hardware_exit)(struct platform_device *pdev);
        /*
         * option:
         *
         * for board specific clock control
         */
-        void (*power_ctrl)(struct platform_device *pdev,
+        int (*power_ctrl)(struct platform_device *pdev,
                           void __iomem *base, int enable);
        /*
@@ -77,7 +77,7 @@ struct renesas_usbhs_platform_callback {
         *
         * Phy reset for platform
         */
-        void (*phy_reset)(struct platform_device *pdev);
+        int (*phy_reset)(struct platform_device *pdev);
        /*
         * get USB ID function
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 1819b59aab2a..b9b0f7b4e43b 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -15,6 +15,7 @@
 #include <linux/kref.h>
 #include <linux/mutex.h>
+#include <linux/serial.h>
 #include <linux/sysrq.h>
 #include <linux/kfifo.h>
@@ -61,12 +62,12 @@
 * @bulk_out_buffers: pointers to the bulk out buffers for this port
 * @write_urbs: pointers to the bulk out urbs for this port
 * @write_urbs_free: status bitmap the for bulk out urbs
+ * @icount: interrupt counters
 * @tx_bytes: number of bytes currently in host stack queues
 * @bulk_out_endpointAddress: endpoint address for the bulk out pipe for this
 *      port.
 * @flags: usb serial port flags
 * @write_wait: a wait_queue_head_t used by the port.
- * @delta_msr_wait: modem-status-change wait queue
 * @work: work queue entry for the line discipline waking up.
 * @throttled: nonzero if the read urb is inactive to throttle the device
 * @throttle_req: nonzero if the tty wants to throttle us
@@ -109,11 +110,11 @@ struct usb_serial_port {
        unsigned long           write_urbs_free;
        __u8                    bulk_out_endpointAddress;
+        struct async_icount     icount;
        int                     tx_bytes;
        unsigned long           flags;
        wait_queue_head_t       write_wait;
-        wait_queue_head_t       delta_msr_wait;
        struct work_struct      work;
        char                    throttled;
        char                    throttle_req;
@@ -272,6 +273,7 @@ struct usb_serial_driver {
        int  (*tiocmget)(struct tty_struct *tty);
        int  (*tiocmset)(struct tty_struct *tty,
                         unsigned int set, unsigned int clear);
+        int  (*tiocmiwait)(struct tty_struct *tty, unsigned long arg);
        int  (*get_icount)(struct tty_struct *tty,
                        struct serial_icounter_struct *icount);
        /* Called by the tty layer for port level work. There may or may not
@@ -329,8 +331,10 @@ extern void usb_serial_generic_read_bulk_callback(struct urb *urb);
 extern void usb_serial_generic_write_bulk_callback(struct urb *urb);
 extern void usb_serial_generic_throttle(struct tty_struct *tty);
 extern void usb_serial_generic_unthrottle(struct tty_struct *tty);
-extern void usb_serial_generic_disconnect(struct usb_serial *serial);
+extern int usb_serial_generic_tiocmiwait(struct tty_struct *tty,
-extern void usb_serial_generic_release(struct usb_serial *serial);
+                                                        unsigned long arg);
+extern int usb_serial_generic_get_icount(struct tty_struct *tty,
+                                        struct serial_icounter_struct *icount);
 extern int usb_serial_generic_register(void);
 extern void usb_serial_generic_deregister(void);
 extern int usb_serial_generic_submit_read_urbs(struct usb_serial_port *port,
diff --git a/include/linux/usb/tegra_usb_phy.h b/include/linux/usb/tegra_usb_phy.h
index 9ebebe906925..1b7519a8c0bf 100644
--- a/include/linux/usb/tegra_usb_phy.h
+++ b/include/linux/usb/tegra_usb_phy.h
@@ -61,10 +61,14 @@ struct tegra_usb_phy {
        struct device *dev;
        bool is_legacy_phy;
        bool is_ulpi_phy;
+        void (*set_pts)(struct usb_phy *x, u8 pts_val);
+        void (*set_phcd)(struct usb_phy *x, bool enable);
 };
 struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance,
-        void __iomem *regs, void *config, enum tegra_usb_phy_mode phy_mode);
+        void __iomem *regs, void *config, enum tegra_usb_phy_mode phy_mode,
+        void (*set_pts)(struct usb_phy *x, u8 pts_val),
+        void (*set_phcd)(struct usb_phy *x, bool enable));
 void tegra_usb_phy_preresume(struct usb_phy *phy);
@@ -75,8 +79,4 @@ void tegra_ehci_phy_restore_start(struct usb_phy *phy,
 void tegra_ehci_phy_restore_end(struct usb_phy *phy);
-void tegra_ehci_set_pts(struct usb_phy *x, u8 pts_val);
-void tegra_ehci_set_phcd(struct usb_phy *x, bool enable);
 #endif /* __TEGRA_USB_PHY_H */
diff --git a/include/linux/vexpress.h b/include/linux/vexpress.h
index 75818744ab59..ea7168a68081 100644
--- a/include/linux/vexpress.h
+++ b/include/linux/vexpress.h
@@ -115,9 +115,6 @@ unsigned __vexpress_get_site(struct device *dev, struct device_node *node);
 void vexpress_sysreg_early_init(void __iomem *base);
 void vexpress_sysreg_of_early_init(void);
-void vexpress_power_off(void);
-void vexpress_restart(char str, const char *cmd);
 /* Clocks */
 struct clk *vexpress_osc_setup(struct device *dev);
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 6071e911c7f4..7d5773a99f20 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -3,7 +3,9 @@
 #include <linux/spinlock.h>
 #include <linux/init.h>
+#include <linux/list.h>
 #include <asm/page.h>           /* pgprot_t */
+#include <linux/rbtree.h>
 struct vm_area_struct;          /* vma defining user mapping in mm_types.h */
@@ -35,6 +37,17 @@ struct vm_struct {
        const void              *caller;
 };
+struct vmap_area {
+        unsigned long va_start;
+        unsigned long va_end;
+        unsigned long flags;
+        struct rb_node rb_node;         /* address sorted rbtree */
+        struct list_head list;          /* address sorted list */
+        struct list_head purge_list;    /* "lazy purge" list */
+        struct vm_struct *vm;
+        struct rcu_head rcu_head;
+};
 /*
 *      Highlevel APIs for driver use
 */
@@ -130,8 +143,7 @@ extern long vwrite(char *buf, char *addr, unsigned long count);
 /*
 *      Internals.  Dont't use..
 */
-extern rwlock_t vmlist_lock;
+extern struct list_head vmap_area_list;
-extern struct vm_struct *vmlist;
 extern __init void vm_area_add_early(struct vm_struct *vm);
 extern __init void vm_area_register_early(struct vm_struct *vm, size_t align);
@@ -158,4 +170,22 @@ pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms)
 # endif
 #endif
+struct vmalloc_info {
+        unsigned long   used;
+        unsigned long   largest_chunk;
+};
+#ifdef CONFIG_MMU
+#define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START)
+extern void get_vmalloc_info(struct vmalloc_info *vmi);
+#else
+#define VMALLOC_TOTAL 0UL
+#define get_vmalloc_info(vmi)                   \
+do {                                            \
+        (vmi)->used = 0;                        \
+        (vmi)->largest_chunk = 0;               \
+} while (0)
+#endif
 #endif /* _LINUX_VMALLOC_H */
diff --git a/include/linux/vmpressure.h b/include/linux/vmpressure.h
new file mode 100644
index 000000000000..76be077340ea
--- /dev/null
+++ b/include/linux/vmpressure.h
@@ -0,0 +1,47 @@
+#ifndef __LINUX_VMPRESSURE_H
+#define __LINUX_VMPRESSURE_H
+#include <linux/mutex.h>
+#include <linux/list.h>
+#include <linux/workqueue.h>
+#include <linux/gfp.h>
+#include <linux/types.h>
+#include <linux/cgroup.h>
+struct vmpressure {
+        unsigned long scanned;
+        unsigned long reclaimed;
+        /* The lock is used to keep the scanned/reclaimed above in sync. */
+        struct mutex sr_lock;
+        /* The list of vmpressure_event structs. */
+        struct list_head events;
+        /* Have to grab the lock on events traversal or modifications. */
+        struct mutex events_lock;
+        struct work_struct work;
+};
+struct mem_cgroup;
+#ifdef CONFIG_MEMCG
+extern void vmpressure(gfp_t gfp, struct mem_cgroup *memcg,
+                       unsigned long scanned, unsigned long reclaimed);
+extern void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio);
+extern void vmpressure_init(struct vmpressure *vmpr);
+extern struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg);
+extern struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr);
+extern struct vmpressure *css_to_vmpressure(struct cgroup_subsys_state *css);
+extern int vmpressure_register_event(struct cgroup *cg, struct cftype *cft,
+                                     struct eventfd_ctx *eventfd,
+                                     const char *args);
+extern void vmpressure_unregister_event(struct cgroup *cg, struct cftype *cft,
+                                        struct eventfd_ctx *eventfd);
+#else
+static inline void vmpressure(gfp_t gfp, struct mem_cgroup *memcg,
+                              unsigned long scanned, unsigned long reclaimed) {}
+static inline void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg,
+                                   int prio) {}
+#endif /* CONFIG_MEMCG */
+#endif /* __LINUX_VMPRESSURE_H */
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index 5fd71a7d0dfd..c586679b6fef 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -48,13 +48,8 @@ static inline void count_vm_events(enum vm_event_item item, long delta)
 }
 extern void all_vm_events(unsigned long *);
-#ifdef CONFIG_HOTPLUG
 extern void vm_events_fold_cpu(int cpu);
-#else
-static inline void vm_events_fold_cpu(int cpu)
-{
-}
-#endif
 #else
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 8afab27cdbc2..623488fdc1f5 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -11,6 +11,7 @@
 #include <linux/lockdep.h>
 #include <linux/threads.h>
 #include <linux/atomic.h>
+#include <linux/cpumask.h>
 struct workqueue_struct;
@@ -68,7 +69,7 @@ enum {
                                  WORK_STRUCT_COLOR_BITS,
        /* data contains off-queue information when !WORK_STRUCT_PWQ */
-        WORK_OFFQ_FLAG_BASE     = WORK_STRUCT_FLAG_BITS,
+        WORK_OFFQ_FLAG_BASE     = WORK_STRUCT_COLOR_SHIFT,
        WORK_OFFQ_CANCELING     = (1 << WORK_OFFQ_FLAG_BASE),
@@ -91,6 +92,9 @@ enum {
        /* bit mask for work_busy() return values */
        WORK_BUSY_PENDING       = 1 << 0,
        WORK_BUSY_RUNNING       = 1 << 1,
+        /* maximum string length for set_worker_desc() */
+        WORKER_DESC_LEN         = 24,
 };
 struct work_struct {
@@ -115,6 +119,20 @@ struct delayed_work {
        int cpu;
 };
+/*
+ * A struct for workqueue attributes.  This can be used to change
+ * attributes of an unbound workqueue.
+ *
+ * Unlike other fields, ->no_numa isn't a property of a worker_pool.  It
+ * only modifies how apply_workqueue_attrs() select pools and thus doesn't
+ * participate in pool hash calculations or equality comparisons.
+ */
+struct workqueue_attrs {
+        int                     nice;           /* nice level */
+        cpumask_var_t           cpumask;        /* allowed CPUs */
+        bool                    no_numa;        /* disable NUMA affinity */
+};
 static inline struct delayed_work *to_delayed_work(struct work_struct *work)
 {
        return container_of(work, struct delayed_work, work);
@@ -283,9 +301,10 @@ enum {
        WQ_MEM_RECLAIM          = 1 << 3, /* may be used for memory reclaim */
        WQ_HIGHPRI              = 1 << 4, /* high priority */
        WQ_CPU_INTENSIVE        = 1 << 5, /* cpu instensive workqueue */
+        WQ_SYSFS                = 1 << 6, /* visible in sysfs, see wq_sysfs_register() */
-        WQ_DRAINING             = 1 << 6, /* internal: workqueue is draining */
+        __WQ_DRAINING           = 1 << 16, /* internal: workqueue is draining */
-        WQ_RESCUER              = 1 << 7, /* internal: workqueue has rescuer */
+        __WQ_ORDERED            = 1 << 17, /* internal: workqueue is ordered */
        WQ_MAX_ACTIVE           = 512,    /* I like 512, better ideas? */
        WQ_MAX_UNBOUND_PER_CPU  = 4,      /* 4 * #cpus for unbound wq */
@@ -388,7 +407,7 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active,
 * Pointer to the allocated workqueue on success, %NULL on failure.
 */
 #define alloc_ordered_workqueue(fmt, flags, args...)                    \
-        alloc_workqueue(fmt, WQ_UNBOUND | (flags), 1, ##args)
+        alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | (flags), 1, ##args)
 #define create_workqueue(name)                                          \
        alloc_workqueue((name), WQ_MEM_RECLAIM, 1)
@@ -399,30 +418,23 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active,
 extern void destroy_workqueue(struct workqueue_struct *wq);
+struct workqueue_attrs *alloc_workqueue_attrs(gfp_t gfp_mask);
+void free_workqueue_attrs(struct workqueue_attrs *attrs);
+int apply_workqueue_attrs(struct workqueue_struct *wq,
+                          const struct workqueue_attrs *attrs);
 extern bool queue_work_on(int cpu, struct workqueue_struct *wq,
                        struct work_struct *work);
-extern bool queue_work(struct workqueue_struct *wq, struct work_struct *work);
 extern bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
                        struct delayed_work *work, unsigned long delay);
-extern bool queue_delayed_work(struct workqueue_struct *wq,
-                        struct delayed_work *work, unsigned long delay);
 extern bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq,
                        struct delayed_work *dwork, unsigned long delay);
-extern bool mod_delayed_work(struct workqueue_struct *wq,
-                        struct delayed_work *dwork, unsigned long delay);
 extern void flush_workqueue(struct workqueue_struct *wq);
 extern void drain_workqueue(struct workqueue_struct *wq);
 extern void flush_scheduled_work(void);
-extern bool schedule_work_on(int cpu, struct work_struct *work);
-extern bool schedule_work(struct work_struct *work);
-extern bool schedule_delayed_work_on(int cpu, struct delayed_work *work,
-                                     unsigned long delay);
-extern bool schedule_delayed_work(struct delayed_work *work,
-                                  unsigned long delay);
 extern int schedule_on_each_cpu(work_func_t func);
-extern int keventd_up(void);
 int execute_in_process_context(work_func_t fn, struct execute_work *);
@@ -435,8 +447,122 @@ extern bool cancel_delayed_work_sync(struct delayed_work *dwork);
 extern void workqueue_set_max_active(struct workqueue_struct *wq,
                                     int max_active);
-extern bool workqueue_congested(unsigned int cpu, struct workqueue_struct *wq);
+extern bool current_is_workqueue_rescuer(void);
+extern bool workqueue_congested(int cpu, struct workqueue_struct *wq);
 extern unsigned int work_busy(struct work_struct *work);
+extern __printf(1, 2) void set_worker_desc(const char *fmt, ...);
+extern void print_worker_info(const char *log_lvl, struct task_struct *task);
+/**
+ * queue_work - queue work on a workqueue
+ * @wq: workqueue to use
+ * @work: work to queue
+ *
+ * Returns %false if @work was already on a queue, %true otherwise.
+ *
+ * We queue the work to the CPU on which it was submitted, but if the CPU dies
+ * it can be processed by another CPU.
+ */
+static inline bool queue_work(struct workqueue_struct *wq,
+                              struct work_struct *work)
+{
+        return queue_work_on(WORK_CPU_UNBOUND, wq, work);
+}
+/**
+ * queue_delayed_work - queue work on a workqueue after delay
+ * @wq: workqueue to use
+ * @dwork: delayable work to queue
+ * @delay: number of jiffies to wait before queueing
+ *
+ * Equivalent to queue_delayed_work_on() but tries to use the local CPU.
+ */
+static inline bool queue_delayed_work(struct workqueue_struct *wq,
+                                      struct delayed_work *dwork,
+                                      unsigned long delay)
+{
+        return queue_delayed_work_on(WORK_CPU_UNBOUND, wq, dwork, delay);
+}
+/**
+ * mod_delayed_work - modify delay of or queue a delayed work
+ * @wq: workqueue to use
+ * @dwork: work to queue
+ * @delay: number of jiffies to wait before queueing
+ *
+ * mod_delayed_work_on() on local CPU.
+ */
+static inline bool mod_delayed_work(struct workqueue_struct *wq,
+                                    struct delayed_work *dwork,
+                                    unsigned long delay)
+{
+        return mod_delayed_work_on(WORK_CPU_UNBOUND, wq, dwork, delay);
+}
+/**
+ * schedule_work_on - put work task on a specific cpu
+ * @cpu: cpu to put the work task on
+ * @work: job to be done
+ *
+ * This puts a job on a specific cpu
+ */
+static inline bool schedule_work_on(int cpu, struct work_struct *work)
+{
+        return queue_work_on(cpu, system_wq, work);
+}
+/**
+ * schedule_work - put work task in global workqueue
+ * @work: job to be done
+ *
+ * Returns %false if @work was already on the kernel-global workqueue and
+ * %true otherwise.
+ *
+ * This puts a job in the kernel-global workqueue if it was not already
+ * queued and leaves it in the same position on the kernel-global
+ * workqueue otherwise.
+ */
+static inline bool schedule_work(struct work_struct *work)
+{
+        return queue_work(system_wq, work);
+}
+/**
+ * schedule_delayed_work_on - queue work in global workqueue on CPU after delay
+ * @cpu: cpu to use
+ * @dwork: job to be done
+ * @delay: number of jiffies to wait
+ *
+ * After waiting for a given time this puts a job in the kernel-global
+ * workqueue on the specified CPU.
+ */
+static inline bool schedule_delayed_work_on(int cpu, struct delayed_work *dwork,
+                                            unsigned long delay)
+{
+        return queue_delayed_work_on(cpu, system_wq, dwork, delay);
+}
+/**
+ * schedule_delayed_work - put work task in global workqueue after delay
+ * @dwork: job to be done
+ * @delay: number of jiffies to wait or 0 for immediate execution
+ *
+ * After waiting for a given time this puts a job in the kernel-global
+ * workqueue.
+ */
+static inline bool schedule_delayed_work(struct delayed_work *dwork,
+                                         unsigned long delay)
+{
+        return queue_delayed_work(system_wq, dwork, delay);
+}
+/**
+ * keventd_up - is workqueue initialized yet?
+ */
+static inline bool keventd_up(void)
+{
+        return system_wq != NULL;
+}
 /*
 * Like above, but uses del_timer() instead of del_timer_sync(). This means,
@@ -466,12 +592,12 @@ static inline bool __deprecated flush_delayed_work_sync(struct delayed_work *dwo
 }
 #ifndef CONFIG_SMP
-static inline long work_on_cpu(unsigned int cpu, long (*fn)(void *), void *arg)
+static inline long work_on_cpu(int cpu, long (*fn)(void *), void *arg)
 {
        return fn(arg);
 }
 #else
-long work_on_cpu(unsigned int cpu, long (*fn)(void *), void *arg);
+long work_on_cpu(int cpu, long (*fn)(void *), void *arg);
 #endif /* CONFIG_SMP */
 #ifdef CONFIG_FREEZER
@@ -480,4 +606,11 @@ extern bool freeze_workqueues_busy(void);
 extern void thaw_workqueues(void);
 #endif /* CONFIG_FREEZER */
+#ifdef CONFIG_SYSFS
+int workqueue_sysfs_register(struct workqueue_struct *wq);
+#else   /* CONFIG_SYSFS */
+static inline int workqueue_sysfs_register(struct workqueue_struct *wq)
+{ return 0; }
+#endif  /* CONFIG_SYSFS */
 #endif
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index f74ee6f89711..5d5d3a30f04a 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -172,6 +172,7 @@ void rc_map_init(void);
 #define RC_MAP_RC5_TV                    "rc-rc5-tv"
 #define RC_MAP_RC6_MCE                   "rc-rc6-mce"
 #define RC_MAP_REAL_AUDIO_220_32_KEYS    "rc-real-audio-220-32-keys"
+#define RC_MAP_REDDO                     "rc-reddo"
 #define RC_MAP_SNAPSTREAM_FIREFLY        "rc-snapstream-firefly"
 #define RC_MAP_STREAMZAP                 "rc-streamzap"
 #define RC_MAP_TBS_NEC                   "rc-tbs-nec"
diff --git a/include/media/si476x.h b/include/media/si476x.h
index beb6433d6958..e02e241e2d22 100644
--- a/include/media/si476x.h
+++ b/include/media/si476x.h
@@ -23,244 +23,7 @@
 #include <linux/types.h>
 #include <linux/videodev2.h>
-struct si476x_device;
+#include <linux/mfd/si476x-reports.h>
-/* It is possible to select one of the four adresses using pins A0
- * and A1 on SI476x */
-#define SI476X_I2C_ADDR_1       0x60
-#define SI476X_I2C_ADDR_2       0x61
-#define SI476X_I2C_ADDR_3       0x62
-#define SI476X_I2C_ADDR_4       0x63
-enum si476x_iqclk_config {
-        SI476X_IQCLK_NOOP = 0,
-        SI476X_IQCLK_TRISTATE = 1,
-        SI476X_IQCLK_IQ = 21,
-};
-enum si476x_iqfs_config {
-        SI476X_IQFS_NOOP = 0,
-        SI476X_IQFS_TRISTATE = 1,
-        SI476X_IQFS_IQ = 21,
-};
-enum si476x_iout_config {
-        SI476X_IOUT_NOOP = 0,
-        SI476X_IOUT_TRISTATE = 1,
-        SI476X_IOUT_OUTPUT = 22,
-};
-enum si476x_qout_config {
-        SI476X_QOUT_NOOP = 0,
-        SI476X_QOUT_TRISTATE = 1,
-        SI476X_QOUT_OUTPUT = 22,
-};
-enum si476x_dclk_config {
-        SI476X_DCLK_NOOP      = 0,
-        SI476X_DCLK_TRISTATE  = 1,
-        SI476X_DCLK_DAUDIO    = 10,
-};
-enum si476x_dfs_config {
-        SI476X_DFS_NOOP      = 0,
-        SI476X_DFS_TRISTATE  = 1,
-        SI476X_DFS_DAUDIO    = 10,
-};
-enum si476x_dout_config {
-        SI476X_DOUT_NOOP       = 0,
-        SI476X_DOUT_TRISTATE   = 1,
-        SI476X_DOUT_I2S_OUTPUT = 12,
-        SI476X_DOUT_I2S_INPUT  = 13,
-};
-enum si476x_xout_config {
-        SI476X_XOUT_NOOP        = 0,
-        SI476X_XOUT_TRISTATE    = 1,
-        SI476X_XOUT_I2S_INPUT   = 13,
-        SI476X_XOUT_MODE_SELECT = 23,
-};
-enum si476x_icin_config {
-        SI476X_ICIN_NOOP        = 0,
-        SI476X_ICIN_TRISTATE    = 1,
-        SI476X_ICIN_GPO1_HIGH   = 2,
-        SI476X_ICIN_GPO1_LOW    = 3,
-        SI476X_ICIN_IC_LINK     = 30,
-};
-enum si476x_icip_config {
-        SI476X_ICIP_NOOP        = 0,
-        SI476X_ICIP_TRISTATE    = 1,
-        SI476X_ICIP_GPO2_HIGH   = 2,
-        SI476X_ICIP_GPO2_LOW    = 3,
-        SI476X_ICIP_IC_LINK     = 30,
-};
-enum si476x_icon_config {
-        SI476X_ICON_NOOP        = 0,
-        SI476X_ICON_TRISTATE    = 1,
-        SI476X_ICON_I2S         = 10,
-        SI476X_ICON_IC_LINK     = 30,
-};
-enum si476x_icop_config {
-        SI476X_ICOP_NOOP        = 0,
-        SI476X_ICOP_TRISTATE    = 1,
-        SI476X_ICOP_I2S         = 10,
-        SI476X_ICOP_IC_LINK     = 30,
-};
-enum si476x_lrout_config {
-        SI476X_LROUT_NOOP       = 0,
-        SI476X_LROUT_TRISTATE   = 1,
-        SI476X_LROUT_AUDIO      = 2,
-        SI476X_LROUT_MPX        = 3,
-};
-enum si476x_intb_config {
-        SI476X_INTB_NOOP     = 0,
-        SI476X_INTB_TRISTATE = 1,
-        SI476X_INTB_DAUDIO   = 10,
-        SI476X_INTB_IRQ      = 40,
-};
-enum si476x_a1_config {
-        SI476X_A1_NOOP     = 0,
-        SI476X_A1_TRISTATE = 1,
-        SI476X_A1_IRQ      = 40,
-};
-enum si476x_part_revisions {
-        SI476X_REVISION_A10 = 0,
-        SI476X_REVISION_A20 = 1,
-        SI476X_REVISION_A30 = 2,
-};
-struct si476x_pinmux {
-        enum si476x_dclk_config  dclk;
-        enum si476x_dfs_config   dfs;
-        enum si476x_dout_config  dout;
-        enum si476x_xout_config  xout;
-        enum si476x_iqclk_config iqclk;
-        enum si476x_iqfs_config  iqfs;
-        enum si476x_iout_config  iout;
-        enum si476x_qout_config  qout;
-        enum si476x_icin_config  icin;
-        enum si476x_icip_config  icip;
-        enum si476x_icon_config  icon;
-        enum si476x_icop_config  icop;
-        enum si476x_lrout_config lrout;
-        enum si476x_intb_config  intb;
-        enum si476x_a1_config    a1;
-};
-/**
- * enum si476x_phase_diversity_mode - possbile phase diversity modes
- * for SI4764/5/6/7 chips.
- *
- * @SI476X_PHDIV_DISABLED:              Phase diversity feature is
- *                                      disabled.
- * @SI476X_PHDIV_PRIMARY_COMBINING:     Tuner works as a primary tuner
- *                                      in combination with a
- *                                      secondary one.
- * @SI476X_PHDIV_PRIMARY_ANTENNA:       Tuner works as a primary tuner
- *                                      using only its own antenna.
- * @SI476X_PHDIV_SECONDARY_ANTENNA:     Tuner works as a primary tuner
- *                                      usning seconary tuner's antenna.
- * @SI476X_PHDIV_SECONDARY_COMBINING:   Tuner works as a secondary
- *                                      tuner in combination with the
- *                                      primary one.
- */
-enum si476x_phase_diversity_mode {
-        SI476X_PHDIV_DISABLED                   = 0,
-        SI476X_PHDIV_PRIMARY_COMBINING          = 1,
-        SI476X_PHDIV_PRIMARY_ANTENNA            = 2,
-        SI476X_PHDIV_SECONDARY_ANTENNA          = 3,
-        SI476X_PHDIV_SECONDARY_COMBINING        = 5,
-};
-enum si476x_ibias6x {
-        SI476X_IBIAS6X_OTHER                    = 0,
-        SI476X_IBIAS6X_RCVR1_NON_4MHZ_CLK       = 1,
-};
-enum si476x_xstart {
-        SI476X_XSTART_MULTIPLE_TUNER    = 0x11,
-        SI476X_XSTART_NORMAL            = 0x77,
-};
-enum si476x_freq {
-        SI476X_FREQ_4_MHZ               = 0,
-        SI476X_FREQ_37P209375_MHZ       = 1,
-        SI476X_FREQ_36P4_MHZ            = 2,
-        SI476X_FREQ_37P8_MHZ            =  3,
-};
-enum si476x_xmode {
-        SI476X_XMODE_CRYSTAL_RCVR1      = 1,
-        SI476X_XMODE_EXT_CLOCK          = 2,
-        SI476X_XMODE_CRYSTAL_RCVR2_3    = 3,
-};
-enum si476x_xbiashc {
-        SI476X_XBIASHC_SINGLE_RECEIVER = 0,
-        SI476X_XBIASHC_MULTIPLE_RECEIVER = 1,
-};
-enum si476x_xbias {
-        SI476X_XBIAS_RCVR2_3    = 0,
-        SI476X_XBIAS_4MHZ_RCVR1 = 3,
-        SI476X_XBIAS_RCVR1      = 7,
-};
-enum si476x_func {
-        SI476X_FUNC_BOOTLOADER  = 0,
-        SI476X_FUNC_FM_RECEIVER = 1,
-        SI476X_FUNC_AM_RECEIVER = 2,
-        SI476X_FUNC_WB_RECEIVER = 3,
-};
-/**
- * @xcload: Selects the amount of additional on-chip capacitance to
- *          be connected between XTAL1 and gnd and between XTAL2 and
- *          GND. One half of the capacitance value shown here is the
- *          additional load capacitance presented to the xtal. The
- *          minimum step size is 0.277 pF. Recommended value is 0x28
- *          but it will be layout dependent. Range is 0–0x3F i.e.
- *          (0–16.33 pF)
- * @ctsien: enable CTSINT(interrupt request when CTS condition
- *          arises) when set
- * @intsel: when set A1 pin becomes the interrupt pin; otherwise,
- *          INTB is the interrupt pin
- * @func:   selects the boot function of the device. I.e.
- *          SI476X_BOOTLOADER  - Boot loader
- *          SI476X_FM_RECEIVER - FM receiver
- *          SI476X_AM_RECEIVER - AM receiver
- *          SI476X_WB_RECEIVER - Weatherband receiver
- * @freq:   oscillator's crystal frequency:
- *          SI476X_XTAL_37P209375_MHZ - 37.209375 Mhz
- *          SI476X_XTAL_36P4_MHZ      - 36.4 Mhz
- *          SI476X_XTAL_37P8_MHZ      - 37.8 Mhz
- */
-struct si476x_power_up_args {
-        enum si476x_ibias6x ibias6x;
-        enum si476x_xstart  xstart;
-        u8   xcload;
-        bool fastboot;
-        enum si476x_xbiashc xbiashc;
-        enum si476x_xbias   xbias;
-        enum si476x_func    func;
-        enum si476x_freq    freq;
-        enum si476x_xmode   xmode;
-};
 enum si476x_ctrl_id {
        V4L2_CID_SI476X_RSSI_THRESHOLD  = (V4L2_CID_USER_SI476X_BASE + 1),
@@ -271,156 +34,4 @@ enum si476x_ctrl_id {
        V4L2_CID_SI476X_INTERCHIP_LINK  = (V4L2_CID_USER_SI476X_BASE + 6),
 };
-/*
- * Platform dependent definition
- */
-struct si476x_platform_data {
-        int gpio_reset; /* < 0 if not used */
-        struct si476x_power_up_args power_up_parameters;
-        enum si476x_phase_diversity_mode diversity_mode;
-        struct si476x_pinmux pinmux;
-};
-/**
- * struct si476x_rsq_status - structure containing received signal
- * quality
- * @multhint:   Multipath Detect High.
- *              true  - Indicatedes that the value is below
- *                      FM_RSQ_MULTIPATH_HIGH_THRESHOLD
- *              false - Indicatedes that the value is above
- *                      FM_RSQ_MULTIPATH_HIGH_THRESHOLD
- * @multlint:   Multipath Detect Low.
- *              true  - Indicatedes that the value is below
- *                      FM_RSQ_MULTIPATH_LOW_THRESHOLD
- *              false - Indicatedes that the value is above
- *                      FM_RSQ_MULTIPATH_LOW_THRESHOLD
- * @snrhint:    SNR Detect High.
- *              true  - Indicatedes that the value is below
- *                      FM_RSQ_SNR_HIGH_THRESHOLD
- *              false - Indicatedes that the value is above
- *                      FM_RSQ_SNR_HIGH_THRESHOLD
- * @snrlint:    SNR Detect Low.
- *              true  - Indicatedes that the value is below
- *                      FM_RSQ_SNR_LOW_THRESHOLD
- *              false - Indicatedes that the value is above
- *                      FM_RSQ_SNR_LOW_THRESHOLD
- * @rssihint:   RSSI Detect High.
- *              true  - Indicatedes that the value is below
- *                      FM_RSQ_RSSI_HIGH_THRESHOLD
- *              false - Indicatedes that the value is above
- *                      FM_RSQ_RSSI_HIGH_THRESHOLD
- * @rssilint:   RSSI Detect Low.
- *              true  - Indicatedes that the value is below
- *                      FM_RSQ_RSSI_LOW_THRESHOLD
- *              false - Indicatedes that the value is above
- *                      FM_RSQ_RSSI_LOW_THRESHOLD
- * @bltf:       Band Limit.
- *              Set if seek command hits the band limit or wrapped to
- *              the original frequency.
- * @snr_ready:  SNR measurement in progress.
- * @rssiready:  RSSI measurement in progress.
- * @afcrl:      Set if FREQOFF >= MAX_TUNE_ERROR
- * @valid:      Set if the channel is valid
- *               rssi < FM_VALID_RSSI_THRESHOLD
- *               snr  < FM_VALID_SNR_THRESHOLD
- *               tune_error < FM_VALID_MAX_TUNE_ERROR
- * @readfreq:   Current tuned frequency.
- * @freqoff:    Signed frequency offset.
- * @rssi:       Received Signal Strength Indicator(dBuV).
- * @snr:        RF SNR Indicator(dB).
- * @lassi:
- * @hassi:      Low/High side Adjacent(100 kHz) Channel Strength Indicator
- * @mult:       Multipath indicator
- * @dev:        Who knows? But values may vary.
- * @readantcap: Antenna tuning capacity value.
- * @assi:       Adjacent Channel(+/- 200kHz) Strength Indicator
- * @usn:        Ultrasonic Noise Inticator in -DBFS
- */
-struct si476x_rsq_status_report {
-        __u8 multhint, multlint;
-        __u8 snrhint,  snrlint;
-        __u8 rssihint, rssilint;
-        __u8 bltf;
-        __u8 snr_ready;
-        __u8 rssiready;
-        __u8 injside;
-        __u8 afcrl;
-        __u8 valid;
-        __u16 readfreq;
-        __s8  freqoff;
-        __s8  rssi;
-        __s8  snr;
-        __s8  issi;
-        __s8  lassi, hassi;
-        __s8  mult;
-        __u8  dev;
-        __u16 readantcap;
-        __s8  assi;
-        __s8  usn;
-        __u8 pilotdev;
-        __u8 rdsdev;
-        __u8 assidev;
-        __u8 strongdev;
-        __u16 rdspi;
-} __packed;
-/**
- * si476x_acf_status_report - ACF report results
- *
- * @blend_int: If set, indicates that stereo separation has crossed
- * below the blend threshold as set by FM_ACF_BLEND_THRESHOLD
- * @hblend_int: If set, indicates that HiBlend cutoff frequency is
- * lower than threshold as set by FM_ACF_HBLEND_THRESHOLD
- * @hicut_int:  If set, indicates that HiCut cutoff frequency is lower
- * than the threshold set by ACF_
- */
-struct si476x_acf_status_report {
-        __u8 blend_int;
-        __u8 hblend_int;
-        __u8 hicut_int;
-        __u8 chbw_int;
-        __u8 softmute_int;
-        __u8 smute;
-        __u8 smattn;
-        __u8 chbw;
-        __u8 hicut;
-        __u8 hiblend;
-        __u8 pilot;
-        __u8 stblend;
-} __packed;
-enum si476x_fmagc {
-        SI476X_FMAGC_10K_OHM    = 0,
-        SI476X_FMAGC_800_OHM    = 1,
-        SI476X_FMAGC_400_OHM    = 2,
-        SI476X_FMAGC_200_OHM    = 4,
-        SI476X_FMAGC_100_OHM    = 8,
-        SI476X_FMAGC_50_OHM     = 16,
-        SI476X_FMAGC_25_OHM     = 32,
-        SI476X_FMAGC_12P5_OHM   = 64,
-        SI476X_FMAGC_6P25_OHM   = 128,
-};
-struct si476x_agc_status_report {
-        __u8 mxhi;
-        __u8 mxlo;
-        __u8 lnahi;
-        __u8 lnalo;
-        __u8 fmagc1;
-        __u8 fmagc2;
-        __u8 pgagain;
-        __u8 fmwblang;
-} __packed;
-struct si476x_rds_blockcount_report {
-        __u16 expected;
-        __u16 received;
-        __u16 uncorrectable;
-} __packed;
 #endif /* SI476X_H*/
diff --git a/include/media/videobuf-dma-contig.h b/include/media/videobuf-dma-contig.h
index f473aeb86d3f..f0ed82543d9f 100644
--- a/include/media/videobuf-dma-contig.h
+++ b/include/media/videobuf-dma-contig.h
@@ -26,16 +26,6 @@ void videobuf_queue_dma_contig_init(struct videobuf_queue *q,
                                    void *priv,
                                    struct mutex *ext_lock);
-void videobuf_queue_dma_contig_init_cached(struct videobuf_queue *q,
-                                           const struct videobuf_queue_ops *ops,
-                                           struct device *dev,
-                                           spinlock_t *irqlock,
-                                           enum v4l2_buf_type type,
-                                           enum v4l2_field field,
-                                           unsigned int msize,
-                                           void *priv,
-                                           struct mutex *ext_lock);
 dma_addr_t videobuf_to_dma_contig(struct videobuf_buffer *buf);
 void videobuf_dma_contig_free(struct videobuf_queue *q,
                              struct videobuf_buffer *buf);
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 40be2a0d8ae1..84a6440f1f19 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -199,6 +199,7 @@ extern bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
 /* Device notifier */
 extern int register_inet6addr_notifier(struct notifier_block *nb);
 extern int unregister_inet6addr_notifier(struct notifier_block *nb);
+extern int inet6addr_notifier_call_chain(unsigned long val, void *v);
 extern void inet6_netconf_notify_devconf(struct net *net, int type, int ifindex,
                                         struct ipv6_devconf *devconf);
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h
index f74109144d3f..f132924cc9da 100644
--- a/include/net/irda/irlmp.h
+++ b/include/net/irda/irlmp.h
@@ -256,7 +256,8 @@ static inline __u32 irlmp_get_daddr(const struct lsap_cb *self)
        return (self && self->lap) ? self->lap->daddr : 0;
 }
-extern const char *irlmp_reasons[];
+const char *irlmp_reason_str(LM_REASON reason);
 extern int sysctl_discovery_timeout;
 extern int sysctl_discovery_slots;
 extern int sysctl_discovery;
diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
index cc7c19732389..714cc9a54a4c 100644
--- a/include/net/iucv/af_iucv.h
+++ b/include/net/iucv/af_iucv.h
@@ -130,6 +130,14 @@ struct iucv_sock {
                                               enum iucv_tx_notify n);
 };
+struct iucv_skb_cb {
+        u32     class;          /* target class of message */
+        u32     tag;            /* tag associated with message */
+        u32     offset;         /* offset for skb receival */
+};
+#define IUCV_SKB_CB(__skb)      ((struct iucv_skb_cb *)&((__skb)->cb[0]))
 /* iucv socket options (SOL_IUCV) */
 #define SO_IPRMDATA_MSG 0x0080          /* send/recv IPRM_DATA msgs */
 #define SO_MSGLIMIT     0x1000          /* get/set IUCV MSGLIMIT */
diff --git a/include/net/scm.h b/include/net/scm.h
index 975cca01048b..b11708105681 100644
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -56,8 +56,8 @@ static __inline__ void scm_set_cred(struct scm_cookie *scm,
        scm->pid  = get_pid(pid);
        scm->cred = cred ? get_cred(cred) : NULL;
        scm->creds.pid = pid_vnr(pid);
-        scm->creds.uid = cred ? cred->euid : INVALID_UID;
+        scm->creds.uid = cred ? cred->uid : INVALID_UID;
-        scm->creds.gid = cred ? cred->egid : INVALID_GID;
+        scm->creds.gid = cred ? cred->gid : INVALID_GID;
 }
 static __inline__ void scm_destroy_cred(struct scm_cookie *scm)
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index df85a0c0f2d5..cd89510eab2a 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -576,7 +576,7 @@ for (pos = chunk->subh.fwdtsn_hdr->skip;\
 #define WORD_ROUND(s) (((s)+3)&~3)
 /* Make a new instance of type.  */
-#define t_new(type, flags)      (type *)kzalloc(sizeof(type), flags)
+#define t_new(type, flags)      kzalloc(sizeof(type), flags)
 /* Compare two timevals.  */
 #define tv_lt(s, t) \
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 3bbbd78e1439..2d56e428506c 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -65,6 +65,18 @@ struct pcmcia_driver {
 int pcmcia_register_driver(struct pcmcia_driver *driver);
 void pcmcia_unregister_driver(struct pcmcia_driver *driver);
+/**
+ * module_pcmcia_driver() - Helper macro for registering a pcmcia driver
+ * @__pcmcia_driver: pcmcia_driver struct
+ *
+ * Helper macro for pcmcia drivers which do not do anything special in module
+ * init/exit. This eliminates a lot of boilerplate. Each module may only use
+ * this macro once, and calling it replaces module_init() and module_exit().
+ */
+#define module_pcmcia_driver(__pcmcia_driver) \
+        module_driver(__pcmcia_driver, pcmcia_register_driver, \
+                        pcmcia_unregister_driver)
 /* for struct resource * array embedded in struct pcmcia_device */
 enum {
        PCMCIA_IOPORT_0,
diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild
deleted file mode 100644
index 562ff9d591b8..000000000000
--- a/include/scsi/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-header-y += fc/
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 917741bb8e11..fe7f06c86f68 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -63,6 +63,12 @@ enum iscsi_uevent_e {
        ISCSI_UEVENT_PING               = UEVENT_BASE + 22,
        ISCSI_UEVENT_GET_CHAP           = UEVENT_BASE + 23,
        ISCSI_UEVENT_DELETE_CHAP        = UEVENT_BASE + 24,
+        ISCSI_UEVENT_SET_FLASHNODE_PARAMS       = UEVENT_BASE + 25,
+        ISCSI_UEVENT_NEW_FLASHNODE      = UEVENT_BASE + 26,
+        ISCSI_UEVENT_DEL_FLASHNODE      = UEVENT_BASE + 27,
+        ISCSI_UEVENT_LOGIN_FLASHNODE    = UEVENT_BASE + 28,
+        ISCSI_UEVENT_LOGOUT_FLASHNODE   = UEVENT_BASE + 29,
+        ISCSI_UEVENT_LOGOUT_FLASHNODE_SID       = UEVENT_BASE + 30,
        /* up events */
        ISCSI_KEVENT_RECV_PDU           = KEVENT_BASE + 1,
@@ -210,6 +216,31 @@ struct iscsi_uevent {
                       uint32_t        host_no;
                       uint16_t        chap_tbl_idx;
                } delete_chap;
+                struct msg_set_flashnode_param {
+                        uint32_t        host_no;
+                        uint32_t        flashnode_idx;
+                        uint32_t        count;
+                } set_flashnode;
+                struct msg_new_flashnode {
+                        uint32_t        host_no;
+                        uint32_t        len;
+                } new_flashnode;
+                struct msg_del_flashnode {
+                        uint32_t        host_no;
+                        uint32_t        flashnode_idx;
+                } del_flashnode;
+                struct msg_login_flashnode {
+                        uint32_t        host_no;
+                        uint32_t        flashnode_idx;
+                } login_flashnode;
+                struct msg_logout_flashnode {
+                        uint32_t        host_no;
+                        uint32_t        flashnode_idx;
+                } logout_flashnode;
+                struct msg_logout_flashnode_sid {
+                        uint32_t        host_no;
+                        uint32_t        sid;
+                } logout_flashnode_sid;
        } u;
        union {
                /* messages k -> u */
@@ -267,6 +298,9 @@ struct iscsi_uevent {
                                                   with each ping request */
                        uint32_t        data_size;
                } ping_comp;
+                struct msg_new_flashnode_ret {
+                        uint32_t        flashnode_idx;
+                } new_flashnode_ret;
        } r;
 } __attribute__ ((aligned (sizeof(uint64_t))));
@@ -274,6 +308,7 @@ enum iscsi_param_type {
        ISCSI_PARAM,            /* iscsi_param (session, conn, target, LU) */
        ISCSI_HOST_PARAM,       /* iscsi_host_param */
        ISCSI_NET_PARAM,        /* iscsi_net_param */
+        ISCSI_FLASHNODE_PARAM,  /* iscsi_flashnode_param */
 };
 struct iscsi_iface_param_info {
@@ -469,6 +504,88 @@ enum iscsi_host_param {
        ISCSI_HOST_PARAM_MAX,
 };
+/* portal type */
+#define PORTAL_TYPE_IPV4        "ipv4"
+#define PORTAL_TYPE_IPV6        "ipv6"
+/* iSCSI Flash Target params */
+enum iscsi_flashnode_param {
+        ISCSI_FLASHNODE_IS_FW_ASSIGNED_IPV6,
+        ISCSI_FLASHNODE_PORTAL_TYPE,
+        ISCSI_FLASHNODE_AUTO_SND_TGT_DISABLE,
+        ISCSI_FLASHNODE_DISCOVERY_SESS,
+        ISCSI_FLASHNODE_ENTRY_EN,
+        ISCSI_FLASHNODE_HDR_DGST_EN,
+        ISCSI_FLASHNODE_DATA_DGST_EN,
+        ISCSI_FLASHNODE_IMM_DATA_EN,
+        ISCSI_FLASHNODE_INITIAL_R2T_EN,
+        ISCSI_FLASHNODE_DATASEQ_INORDER,
+        ISCSI_FLASHNODE_PDU_INORDER,
+        ISCSI_FLASHNODE_CHAP_AUTH_EN,
+        ISCSI_FLASHNODE_SNACK_REQ_EN,
+        ISCSI_FLASHNODE_DISCOVERY_LOGOUT_EN,
+        ISCSI_FLASHNODE_BIDI_CHAP_EN,
+        /* make authentication for discovery sessions optional */
+        ISCSI_FLASHNODE_DISCOVERY_AUTH_OPTIONAL,
+        ISCSI_FLASHNODE_ERL,
+        ISCSI_FLASHNODE_TCP_TIMESTAMP_STAT,
+        ISCSI_FLASHNODE_TCP_NAGLE_DISABLE,
+        ISCSI_FLASHNODE_TCP_WSF_DISABLE,
+        ISCSI_FLASHNODE_TCP_TIMER_SCALE,
+        ISCSI_FLASHNODE_TCP_TIMESTAMP_EN,
+        ISCSI_FLASHNODE_IP_FRAG_DISABLE,
+        ISCSI_FLASHNODE_MAX_RECV_DLENGTH,
+        ISCSI_FLASHNODE_MAX_XMIT_DLENGTH,
+        ISCSI_FLASHNODE_FIRST_BURST,
+        ISCSI_FLASHNODE_DEF_TIME2WAIT,
+        ISCSI_FLASHNODE_DEF_TIME2RETAIN,
+        ISCSI_FLASHNODE_MAX_R2T,
+        ISCSI_FLASHNODE_KEEPALIVE_TMO,
+        ISCSI_FLASHNODE_ISID,
+        ISCSI_FLASHNODE_TSID,
+        ISCSI_FLASHNODE_PORT,
+        ISCSI_FLASHNODE_MAX_BURST,
+        ISCSI_FLASHNODE_DEF_TASKMGMT_TMO,
+        ISCSI_FLASHNODE_IPADDR,
+        ISCSI_FLASHNODE_ALIAS,
+        ISCSI_FLASHNODE_REDIRECT_IPADDR,
+        ISCSI_FLASHNODE_MAX_SEGMENT_SIZE,
+        ISCSI_FLASHNODE_LOCAL_PORT,
+        ISCSI_FLASHNODE_IPV4_TOS,
+        ISCSI_FLASHNODE_IPV6_TC,
+        ISCSI_FLASHNODE_IPV6_FLOW_LABEL,
+        ISCSI_FLASHNODE_NAME,
+        ISCSI_FLASHNODE_TPGT,
+        ISCSI_FLASHNODE_LINK_LOCAL_IPV6,
+        ISCSI_FLASHNODE_DISCOVERY_PARENT_IDX,
+        ISCSI_FLASHNODE_DISCOVERY_PARENT_TYPE,
+        ISCSI_FLASHNODE_TCP_XMIT_WSF,
+        ISCSI_FLASHNODE_TCP_RECV_WSF,
+        ISCSI_FLASHNODE_CHAP_IN_IDX,
+        ISCSI_FLASHNODE_CHAP_OUT_IDX,
+        ISCSI_FLASHNODE_USERNAME,
+        ISCSI_FLASHNODE_USERNAME_IN,
+        ISCSI_FLASHNODE_PASSWORD,
+        ISCSI_FLASHNODE_PASSWORD_IN,
+        ISCSI_FLASHNODE_STATSN,
+        ISCSI_FLASHNODE_EXP_STATSN,
+        ISCSI_FLASHNODE_IS_BOOT_TGT,
+        ISCSI_FLASHNODE_MAX,
+};
+struct iscsi_flashnode_param_info {
+        uint32_t len;           /* Actual length of the param */
+        uint16_t param;         /* iscsi param value */
+        uint8_t value[0];       /* length sized value follows */
+} __packed;
+enum iscsi_discovery_parent_type {
+        ISCSI_DISC_PARENT_UNKNOWN       = 0x1,
+        ISCSI_DISC_PARENT_SENDTGT       = 0x2,
+        ISCSI_DISC_PARENT_ISNS          = 0x3,
+};
 /* iSCSI port Speed */
 enum iscsi_port_speed {
        ISCSI_PORT_SPEED_UNKNOWN        = 0x1,
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 399162b50a8d..e1379b4e8faf 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -1074,7 +1074,8 @@ void fc_rport_terminate_io(struct fc_rport *);
 /*
 * DISCOVERY LAYER
 *****************************/
-int fc_disc_init(struct fc_lport *);
+void fc_disc_init(struct fc_lport *);
+void fc_disc_config(struct fc_lport *, void *);
 static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc)
 {
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 6e33386a3898..09c041e6c35f 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -427,6 +427,7 @@ extern void iscsi_complete_scsi_task(struct iscsi_task *task,
 */
 extern void iscsi_pool_free(struct iscsi_pool *);
 extern int iscsi_pool_init(struct iscsi_pool *, int, void ***, int);
+extern int iscsi_switch_str_param(char **, char *);
 /*
 * inline functions to deal with padding.
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 53f0b361d668..4a58cca2ecc1 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -39,6 +39,8 @@ struct iscsi_task;
 struct sockaddr;
 struct iscsi_iface;
 struct bsg_job;
+struct iscsi_bus_flash_session;
+struct iscsi_bus_flash_conn;
 /**
 * struct iscsi_transport - iSCSI Transport template
@@ -150,6 +152,19 @@ struct iscsi_transport {
        int (*get_chap) (struct Scsi_Host *shost, uint16_t chap_tbl_idx,
                         uint32_t *num_entries, char *buf);
        int (*delete_chap) (struct Scsi_Host *shost, uint16_t chap_tbl_idx);
+        int (*get_flashnode_param) (struct iscsi_bus_flash_session *fnode_sess,
+                                    int param, char *buf);
+        int (*set_flashnode_param) (struct iscsi_bus_flash_session *fnode_sess,
+                                    struct iscsi_bus_flash_conn *fnode_conn,
+                                    void *data, int len);
+        int (*new_flashnode) (struct Scsi_Host *shost, const char *buf,
+                              int len);
+        int (*del_flashnode) (struct iscsi_bus_flash_session *fnode_sess);
+        int (*login_flashnode) (struct iscsi_bus_flash_session *fnode_sess,
+                                struct iscsi_bus_flash_conn *fnode_conn);
+        int (*logout_flashnode) (struct iscsi_bus_flash_session *fnode_sess,
+                                 struct iscsi_bus_flash_conn *fnode_conn);
+        int (*logout_flashnode_sid) (struct iscsi_cls_session *cls_sess);
 };
 /*
@@ -286,6 +301,112 @@ struct iscsi_iface {
 #define iscsi_iface_to_shost(_iface) \
        dev_to_shost(_iface->dev.parent)
+struct iscsi_bus_flash_conn {
+        struct list_head conn_list;     /* item in connlist */
+        void *dd_data;                  /* LLD private data */
+        struct iscsi_transport *transport;
+        struct device dev;              /* sysfs transport/container device */
+        /* iscsi connection parameters */
+        uint32_t                exp_statsn;
+        uint32_t                statsn;
+        unsigned                max_recv_dlength; /* initiator_max_recv_dsl*/
+        unsigned                max_xmit_dlength; /* target_max_recv_dsl */
+        unsigned                max_segment_size;
+        unsigned                tcp_xmit_wsf;
+        unsigned                tcp_recv_wsf;
+        int                     hdrdgst_en;
+        int                     datadgst_en;
+        int                     port;
+        char                    *ipaddress;
+        char                    *link_local_ipv6_addr;
+        char                    *redirect_ipaddr;
+        uint16_t                keepalive_timeout;
+        uint16_t                local_port;
+        uint8_t                 snack_req_en;
+        /* tcp timestamp negotiation status */
+        uint8_t                 tcp_timestamp_stat;
+        uint8_t                 tcp_nagle_disable;
+        /* tcp window scale factor */
+        uint8_t                 tcp_wsf_disable;
+        uint8_t                 tcp_timer_scale;
+        uint8_t                 tcp_timestamp_en;
+        uint8_t                 ipv4_tos;
+        uint8_t                 ipv6_traffic_class;
+        uint8_t                 ipv6_flow_label;
+        uint8_t                 fragment_disable;
+        /* Link local IPv6 address is assigned by firmware or driver */
+        uint8_t                 is_fw_assigned_ipv6;
+};
+#define iscsi_dev_to_flash_conn(_dev) \
+        container_of(_dev, struct iscsi_bus_flash_conn, dev)
+#define iscsi_flash_conn_to_flash_session(_conn) \
+        iscsi_dev_to_flash_session(_conn->dev.parent)
+#define ISID_SIZE 6
+struct iscsi_bus_flash_session {
+        struct list_head sess_list;             /* item in session_list */
+        struct iscsi_transport *transport;
+        unsigned int target_id;
+        int flash_state;        /* persistent or non-persistent */
+        void *dd_data;                          /* LLD private data */
+        struct device dev;      /* sysfs transport/container device */
+        /* iscsi session parameters */
+        unsigned                first_burst;
+        unsigned                max_burst;
+        unsigned short          max_r2t;
+        int                     default_taskmgmt_timeout;
+        int                     initial_r2t_en;
+        int                     imm_data_en;
+        int                     time2wait;
+        int                     time2retain;
+        int                     pdu_inorder_en;
+        int                     dataseq_inorder_en;
+        int                     erl;
+        int                     tpgt;
+        char                    *username;
+        char                    *username_in;
+        char                    *password;
+        char                    *password_in;
+        char                    *targetname;
+        char                    *targetalias;
+        char                    *portal_type;
+        uint16_t                tsid;
+        uint16_t                chap_in_idx;
+        uint16_t                chap_out_idx;
+        /* index of iSCSI discovery session if the entry is
+         * discovered by iSCSI discovery session
+         */
+        uint16_t                discovery_parent_idx;
+        /* indicates if discovery was done through iSNS discovery service
+         * or through sendTarget */
+        uint16_t                discovery_parent_type;
+        /* Firmware auto sendtarget discovery disable */
+        uint8_t                 auto_snd_tgt_disable;
+        uint8_t                 discovery_sess;
+        /* indicates if this flashnode entry is enabled or disabled */
+        uint8_t                 entry_state;
+        uint8_t                 chap_auth_en;
+        /* enables firmware to auto logout the discovery session on discovery
+         * completion
+         */
+        uint8_t                 discovery_logout_en;
+        uint8_t                 bidi_chap_en;
+        /* makes authentication for discovery session optional */
+        uint8_t                 discovery_auth_optional;
+        uint8_t                 isid[ISID_SIZE];
+        uint8_t                 is_boot_target;
+};
+#define iscsi_dev_to_flash_session(_dev) \
+        container_of(_dev, struct iscsi_bus_flash_session, dev)
+#define iscsi_flash_session_to_shost(_session) \
+        dev_to_shost(_session->dev.parent)
 /*
 * session and connection functions that can be used by HW iSCSI LLDs
 */
@@ -330,4 +451,34 @@ extern char *iscsi_get_port_speed_name(struct Scsi_Host *shost);
 extern char *iscsi_get_port_state_name(struct Scsi_Host *shost);
 extern int iscsi_is_session_dev(const struct device *dev);
+extern char *iscsi_get_discovery_parent_name(int parent_type);
+extern struct device *
+iscsi_find_flashnode(struct Scsi_Host *shost, void *data,
+                     int (*fn)(struct device *dev, void *data));
+extern struct iscsi_bus_flash_session *
+iscsi_create_flashnode_sess(struct Scsi_Host *shost, int index,
+                            struct iscsi_transport *transport, int dd_size);
+extern struct iscsi_bus_flash_conn *
+iscsi_create_flashnode_conn(struct Scsi_Host *shost,
+                            struct iscsi_bus_flash_session *fnode_sess,
+                            struct iscsi_transport *transport, int dd_size);
+extern void
+iscsi_destroy_flashnode_sess(struct iscsi_bus_flash_session *fnode_sess);
+extern void iscsi_destroy_all_flashnode(struct Scsi_Host *shost);
+extern int iscsi_flashnode_bus_match(struct device *dev,
+                                     struct device_driver *drv);
+extern int iscsi_is_flashnode_conn_dev(struct device *dev, void *data);
+extern struct device *
+iscsi_find_flashnode_sess(struct Scsi_Host *shost, void *data,
+                          int (*fn)(struct device *dev, void *data));
+extern struct device *
+iscsi_find_flashnode_conn(struct iscsi_bus_flash_session *fnode_sess,
+                          void *data,
+                          int (*fn)(struct device *dev, void *data));
 #endif
diff --git a/include/sound/max98090.h b/include/sound/max98090.h
index 95efb13f8478..95efb13f8478 100755..100644
--- a/include/sound/max98090.h
+++ b/include/sound/max98090.h
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 45c1981c9ca2..5ec42dbd2308 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -867,7 +867,7 @@ int snd_pcm_format_physical_width(snd_pcm_format_t format);		/* in bits */
 ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
 const unsigned char *snd_pcm_format_silence_64(snd_pcm_format_t format);
 int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int frames);
-snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsignd, int big_endian);
+snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsigned, int big_endian);
 void snd_pcm_set_ops(struct snd_pcm * pcm, int direction, struct snd_pcm_ops *ops);
 void snd_pcm_set_sync(struct snd_pcm_substream *substream);
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index e1ef63d4a5c4..44a30b108683 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -488,6 +488,7 @@ struct snd_soc_dapm_path {
        /* status */
        u32 connect:1;  /* source and sink widgets are connected */
        u32 walked:1;   /* path has been walked */
+        u32 walking:1;  /* path is in the process of being walked */
        u32 weak:1;     /* path ignored for power management */
        int (*connected)(struct snd_soc_dapm_widget *source,
diff --git a/include/target/iscsi/iscsi_transport.h b/include/target/iscsi/iscsi_transport.h
new file mode 100644
index 000000000000..23a87d0cd72c
--- /dev/null
+++ b/include/target/iscsi/iscsi_transport.h
@@ -0,0 +1,83 @@
+#include <linux/module.h>
+#include <linux/list.h>
+#include "../../../drivers/target/iscsi/iscsi_target_core.h"
+struct iscsit_transport {
+#define ISCSIT_TRANSPORT_NAME   16
+        char name[ISCSIT_TRANSPORT_NAME];
+        int transport_type;
+        struct module *owner;
+        struct list_head t_node;
+        int (*iscsit_setup_np)(struct iscsi_np *, struct __kernel_sockaddr_storage *);
+        int (*iscsit_accept_np)(struct iscsi_np *, struct iscsi_conn *);
+        void (*iscsit_free_np)(struct iscsi_np *);
+        void (*iscsit_free_conn)(struct iscsi_conn *);
+        struct iscsi_cmd *(*iscsit_alloc_cmd)(struct iscsi_conn *, gfp_t);
+        int (*iscsit_get_login_rx)(struct iscsi_conn *, struct iscsi_login *);
+        int (*iscsit_put_login_tx)(struct iscsi_conn *, struct iscsi_login *, u32);
+        int (*iscsit_immediate_queue)(struct iscsi_conn *, struct iscsi_cmd *, int);
+        int (*iscsit_response_queue)(struct iscsi_conn *, struct iscsi_cmd *, int);
+        int (*iscsit_get_dataout)(struct iscsi_conn *, struct iscsi_cmd *, bool);
+        int (*iscsit_queue_data_in)(struct iscsi_conn *, struct iscsi_cmd *);
+        int (*iscsit_queue_status)(struct iscsi_conn *, struct iscsi_cmd *);
+};
+/*
+ * From iscsi_target_transport.c
+ */
+extern int iscsit_register_transport(struct iscsit_transport *);
+extern void iscsit_unregister_transport(struct iscsit_transport *);
+extern struct iscsit_transport *iscsit_get_transport(int);
+extern void iscsit_put_transport(struct iscsit_transport *);
+/*
+ * From iscsi_target.c
+ */
+extern int iscsit_add_reject_from_cmd(u8, int, int, unsigned char *,
+                                struct iscsi_cmd *);
+extern int iscsit_setup_scsi_cmd(struct iscsi_conn *, struct iscsi_cmd *,
+                                unsigned char *);
+extern void iscsit_set_unsoliticed_dataout(struct iscsi_cmd *);
+extern int iscsit_process_scsi_cmd(struct iscsi_conn *, struct iscsi_cmd *,
+                                struct iscsi_scsi_req *);
+extern int iscsit_check_dataout_hdr(struct iscsi_conn *, unsigned char *,
+                                struct iscsi_cmd **);
+extern int iscsit_check_dataout_payload(struct iscsi_cmd *, struct iscsi_data *,
+                                bool);
+extern int iscsit_handle_nop_out(struct iscsi_conn *, struct iscsi_cmd *,
+                                unsigned char *);
+extern int iscsit_handle_logout_cmd(struct iscsi_conn *, struct iscsi_cmd *,
+                                unsigned char *);
+extern int iscsit_handle_task_mgt_cmd(struct iscsi_conn *, struct iscsi_cmd *,
+                                unsigned char *);
+extern void iscsit_build_rsp_pdu(struct iscsi_cmd *, struct iscsi_conn *,
+                                bool, struct iscsi_scsi_rsp *);
+extern void iscsit_build_nopin_rsp(struct iscsi_cmd *, struct iscsi_conn *,
+                                struct iscsi_nopin *, bool);
+extern void iscsit_build_task_mgt_rsp(struct iscsi_cmd *, struct iscsi_conn *,
+                                struct iscsi_tm_rsp *);
+extern void iscsit_build_reject(struct iscsi_cmd *, struct iscsi_conn *,
+                                struct iscsi_reject *);
+extern int iscsit_build_logout_rsp(struct iscsi_cmd *, struct iscsi_conn *,
+                                struct iscsi_logout_rsp *);
+extern int iscsit_logout_post_handler(struct iscsi_cmd *, struct iscsi_conn *);
+/*
+ * From iscsi_target_device.c
+ */
+extern void iscsit_increment_maxcmdsn(struct iscsi_cmd *, struct iscsi_session *);
+/*
+ * From iscsi_target_erl1.c
+ */
+extern void iscsit_stop_dataout_timer(struct iscsi_cmd *);
+/*
+ * From iscsi_target_tmr.c
+ */
+extern int iscsit_tmr_post_handler(struct iscsi_cmd *, struct iscsi_conn *);
+/*
+ * From iscsi_target_util.c
+ */
+extern struct iscsi_cmd *iscsit_allocate_cmd(struct iscsi_conn *, gfp_t);
+extern int iscsit_sequence_cmd(struct iscsi_conn *, struct iscsi_cmd *, __be32);
diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index b128c20770bc..ffa2696d64dc 100644
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
@@ -60,6 +60,10 @@ sense_reason_t	sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops);
 u32     sbc_get_device_rev(struct se_device *dev);
 u32     sbc_get_device_type(struct se_device *dev);
 sector_t        sbc_get_write_same_sectors(struct se_cmd *cmd);
+sense_reason_t sbc_execute_unmap(struct se_cmd *cmd,
+        sense_reason_t (*do_unmap_fn)(struct se_cmd *cmd, void *priv,
+                                      sector_t lba, sector_t nolb),
+        void *priv);
 void    transport_set_vpd_proto_id(struct t10_vpd *, unsigned char *);
 int     transport_set_vpd_assoc(struct t10_vpd *, unsigned char *);
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index aaa1ee6ab391..ba3471b73c07 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -120,7 +120,7 @@ bool	transport_wait_for_tasks(struct se_cmd *);
 int     transport_check_aborted_status(struct se_cmd *, int);
 int     transport_send_check_condition_and_sense(struct se_cmd *,
                sense_reason_t, int);
+int     target_get_sess_cmd(struct se_session *, struct se_cmd *, bool);
 int     target_put_sess_cmd(struct se_session *, struct se_cmd *);
 void    target_sess_cmd_list_set_waiting(struct se_session *);
 void    target_wait_for_sess_cmds(struct se_session *, int);
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index 9961726523d0..9c1467357b03 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -257,6 +257,7 @@ TRACE_EVENT(block_bio_bounce,
 /**
 * block_bio_complete - completed all work on the block operation
+ * @q: queue holding the block operation
 * @bio: block operation completed
 * @error: io error value
 *
@@ -265,9 +266,9 @@ TRACE_EVENT(block_bio_bounce,
 */
 TRACE_EVENT(block_bio_complete,
-        TP_PROTO(struct bio *bio, int error),
+        TP_PROTO(struct request_queue *q, struct bio *bio, int error),
-        TP_ARGS(bio, error),
+        TP_ARGS(q, bio, error),
        TP_STRUCT__entry(
                __field( dev_t,         dev             )
@@ -278,8 +279,7 @@ TRACE_EVENT(block_bio_complete,
        ),
        TP_fast_assign(
-                __entry->dev            = bio->bi_bdev ?
+                __entry->dev            = bio->bi_bdev->bd_dev;
-                                          bio->bi_bdev->bd_dev : 0;
                __entry->sector         = bio->bi_sector;
                __entry->nr_sector      = bio->bi_size >> 9;
                __entry->error          = error;
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 4ee471003859..d0e686402df8 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -257,15 +257,7 @@ DECLARE_EVENT_CLASS(ext4__write_end,
                  __entry->pos, __entry->len, __entry->copied)
 );
-DEFINE_EVENT(ext4__write_end, ext4_ordered_write_end,
+DEFINE_EVENT(ext4__write_end, ext4_write_end,
-        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
-                 unsigned int copied),
-        TP_ARGS(inode, pos, len, copied)
-);
-DEFINE_EVENT(ext4__write_end, ext4_writeback_write_end,
        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                 unsigned int copied),
@@ -1956,7 +1948,7 @@ TRACE_EVENT(ext4_remove_blocks,
                __entry->to             = to;
                __entry->partial        = partial_cluster;
                __entry->ee_pblk        = ext4_ext_pblock(ex);
-                __entry->ee_lblk        = cpu_to_le32(ex->ee_block);
+                __entry->ee_lblk        = le32_to_cpu(ex->ee_block);
                __entry->ee_len         = ext4_ext_get_actual_len(ex);
        ),
@@ -2060,7 +2052,7 @@ TRACE_EVENT(ext4_ext_remove_space,
 TRACE_EVENT(ext4_ext_remove_space_done,
        TP_PROTO(struct inode *inode, ext4_lblk_t start, int depth,
-                ext4_lblk_t partial, unsigned short eh_entries),
+                ext4_lblk_t partial, __le16 eh_entries),
        TP_ARGS(inode, start, depth, partial, eh_entries),
@@ -2079,7 +2071,7 @@ TRACE_EVENT(ext4_ext_remove_space_done,
                __entry->start          = start;
                __entry->depth          = depth;
                __entry->partial        = partial;
-                __entry->eh_entries     = eh_entries;
+                __entry->eh_entries     = le16_to_cpu(eh_entries);
        ),
        TP_printk("dev %d,%d ino %lu since %u depth %d partial %u "
diff --git a/include/trace/events/filemap.h b/include/trace/events/filemap.h
new file mode 100644
index 000000000000..0421f49a20f7
--- /dev/null
+++ b/include/trace/events/filemap.h
@@ -0,0 +1,58 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM filemap
+#if !defined(_TRACE_FILEMAP_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_FILEMAP_H
+#include <linux/types.h>
+#include <linux/tracepoint.h>
+#include <linux/mm.h>
+#include <linux/memcontrol.h>
+#include <linux/device.h>
+#include <linux/kdev_t.h>
+DECLARE_EVENT_CLASS(mm_filemap_op_page_cache,
+        TP_PROTO(struct page *page),
+        TP_ARGS(page),
+        TP_STRUCT__entry(
+                __field(struct page *, page)
+                __field(unsigned long, i_ino)
+                __field(unsigned long, index)
+                __field(dev_t, s_dev)
+        ),
+        TP_fast_assign(
+                __entry->page = page;
+                __entry->i_ino = page->mapping->host->i_ino;
+                __entry->index = page->index;
+                if (page->mapping->host->i_sb)
+                        __entry->s_dev = page->mapping->host->i_sb->s_dev;
+                else
+                        __entry->s_dev = page->mapping->host->i_rdev;
+        ),
+        TP_printk("dev %d:%d ino %lx page=%p pfn=%lu ofs=%lu",
+                MAJOR(__entry->s_dev), MINOR(__entry->s_dev),
+                __entry->i_ino,
+                __entry->page,
+                page_to_pfn(__entry->page),
+                __entry->index << PAGE_SHIFT)
+);
+DEFINE_EVENT(mm_filemap_op_page_cache, mm_filemap_delete_from_page_cache,
+        TP_PROTO(struct page *page),
+        TP_ARGS(page)
+        );
+DEFINE_EVENT(mm_filemap_op_page_cache, mm_filemap_add_to_page_cache,
+        TP_PROTO(struct page *page),
+        TP_ARGS(page)
+        );
+#endif /* _TRACE_FILEMAP_H */
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/jbd2.h b/include/trace/events/jbd2.h
index 070df49e4a1d..c1d1f3eb242d 100644
--- a/include/trace/events/jbd2.h
+++ b/include/trace/events/jbd2.h
@@ -358,6 +358,27 @@ TRACE_EVENT(jbd2_write_superblock,
                  MINOR(__entry->dev), __entry->write_op)
 );
+TRACE_EVENT(jbd2_lock_buffer_stall,
+        TP_PROTO(dev_t dev, unsigned long stall_ms),
+        TP_ARGS(dev, stall_ms),
+        TP_STRUCT__entry(
+                __field(        dev_t, dev      )
+                __field(unsigned long, stall_ms )
+        ),
+        TP_fast_assign(
+                __entry->dev            = dev;
+                __entry->stall_ms       = stall_ms;
+        ),
+        TP_printk("dev %d,%d stall_ms %lu",
+                MAJOR(__entry->dev), MINOR(__entry->dev),
+                __entry->stall_ms)
+);
 #endif /* _TRACE_JBD2_H */
 /* This part must be outside protection */
diff --git a/include/trace/events/printk.h b/include/trace/events/printk.h
index 94ec79cc011a..c008bc99f9fa 100644
--- a/include/trace/events/printk.h
+++ b/include/trace/events/printk.h
@@ -6,31 +6,18 @@
 #include <linux/tracepoint.h>
-TRACE_EVENT_CONDITION(console,
+TRACE_EVENT(console,
-        TP_PROTO(const char *log_buf, unsigned start, unsigned end,
+        TP_PROTO(const char *text, size_t len),
-                 unsigned log_buf_len),
-        TP_ARGS(log_buf, start, end, log_buf_len),
+        TP_ARGS(text, len),
-        TP_CONDITION(start != end),
        TP_STRUCT__entry(
-                __dynamic_array(char, msg, end - start + 1)
+                __dynamic_array(char, msg, len + 1)
        ),
        TP_fast_assign(
-                if ((start & (log_buf_len - 1)) > (end & (log_buf_len - 1))) {
+                memcpy(__get_dynamic_array(msg), text, len);
-                        memcpy(__get_dynamic_array(msg),
+                ((char *)__get_dynamic_array(msg))[len] = 0;
-                               log_buf + (start & (log_buf_len - 1)),
-                               log_buf_len - (start & (log_buf_len - 1)));
-                        memcpy((char *)__get_dynamic_array(msg) +
-                               log_buf_len - (start & (log_buf_len - 1)),
-                               log_buf, end & (log_buf_len - 1));
-                } else
-                        memcpy(__get_dynamic_array(msg),
-                               log_buf + (start & (log_buf_len - 1)),
-                               end - start);
-                ((char *)__get_dynamic_array(msg))[end - start] = 0;
        ),
        TP_printk("%s", __get_str(msg))
diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h
index 1918e832da4f..59ebcc89f148 100644
--- a/include/trace/events/rcu.h
+++ b/include/trace/events/rcu.h
@@ -72,6 +72,58 @@ TRACE_EVENT(rcu_grace_period,
 );
 /*
+ * Tracepoint for future grace-period events, including those for no-callbacks
+ * CPUs.  The caller should pull the data from the rcu_node structure,
+ * other than rcuname, which comes from the rcu_state structure, and event,
+ * which is one of the following:
+ *
+ * "Startleaf": Request a nocb grace period based on leaf-node data.
+ * "Startedleaf": Leaf-node start proved sufficient.
+ * "Startedleafroot": Leaf-node start proved sufficient after checking root.
+ * "Startedroot": Requested a nocb grace period based on root-node data.
+ * "StartWait": Start waiting for the requested grace period.
+ * "ResumeWait": Resume waiting after signal.
+ * "EndWait": Complete wait.
+ * "Cleanup": Clean up rcu_node structure after previous GP.
+ * "CleanupMore": Clean up, and another no-CB GP is needed.
+ */
+TRACE_EVENT(rcu_future_grace_period,
+        TP_PROTO(char *rcuname, unsigned long gpnum, unsigned long completed,
+                 unsigned long c, u8 level, int grplo, int grphi,
+                 char *gpevent),
+        TP_ARGS(rcuname, gpnum, completed, c, level, grplo, grphi, gpevent),
+        TP_STRUCT__entry(
+                __field(char *, rcuname)
+                __field(unsigned long, gpnum)
+                __field(unsigned long, completed)
+                __field(unsigned long, c)
+                __field(u8, level)
+                __field(int, grplo)
+                __field(int, grphi)
+                __field(char *, gpevent)
+        ),
+        TP_fast_assign(
+                __entry->rcuname = rcuname;
+                __entry->gpnum = gpnum;
+                __entry->completed = completed;
+                __entry->c = c;
+                __entry->level = level;
+                __entry->grplo = grplo;
+                __entry->grphi = grphi;
+                __entry->gpevent = gpevent;
+        ),
+        TP_printk("%s %lu %lu %lu %u %d %d %s",
+                  __entry->rcuname, __entry->gpnum, __entry->completed,
+                  __entry->c, __entry->level, __entry->grplo, __entry->grphi,
+                  __entry->gpevent)
+);
+/*
 * Tracepoint for grace-period-initialization events.  These are
 * distinguished by the type of RCU, the new grace-period number, the
 * rcu_node structure level, the starting and ending CPU covered by the
@@ -601,6 +653,9 @@ TRACE_EVENT(rcu_barrier,
 #define trace_rcu_grace_period(rcuname, gpnum, gpevent) do { } while (0)
 #define trace_rcu_grace_period_init(rcuname, gpnum, level, grplo, grphi, \
                                    qsmask) do { } while (0)
+#define trace_rcu_future_grace_period(rcuname, gpnum, completed, c, \
+                                      level, grplo, grphi, event) \
+                                      do { } while (0)
 #define trace_rcu_preempt_task(rcuname, pid, gpnum) do { } while (0)
 #define trace_rcu_unlock_preempted_task(rcuname, gpnum, pid) do { } while (0)
 #define trace_rcu_quiescent_state_report(rcuname, gpnum, mask, qsmask, level, \
diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h
index 41a7dbd570e2..a43a2f67bd8e 100644
--- a/include/trace/events/regmap.h
+++ b/include/trace/events/regmap.h
@@ -175,6 +175,54 @@ DEFINE_EVENT(regmap_bool, regmap_cache_bypass,
 );
+DECLARE_EVENT_CLASS(regmap_async,
+        TP_PROTO(struct device *dev),
+        TP_ARGS(dev),
+        TP_STRUCT__entry(
+                __string(       name,           dev_name(dev)   )
+        ),
+        TP_fast_assign(
+                __assign_str(name, dev_name(dev));
+        ),
+        TP_printk("%s", __get_str(name))
+);
+DEFINE_EVENT(regmap_block, regmap_async_write_start,
+        TP_PROTO(struct device *dev, unsigned int reg, int count),
+        TP_ARGS(dev, reg, count)
+);
+DEFINE_EVENT(regmap_async, regmap_async_io_complete,
+        TP_PROTO(struct device *dev),
+        TP_ARGS(dev)
+);
+DEFINE_EVENT(regmap_async, regmap_async_complete_start,
+        TP_PROTO(struct device *dev),
+        TP_ARGS(dev)
+);
+DEFINE_EVENT(regmap_async, regmap_async_complete_done,
+        TP_PROTO(struct device *dev),
+        TP_ARGS(dev)
+);
 #endif /* _TRACE_REGMAP_H */
 /* This part must be outside protection */
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index 5a8671e8a67f..e5586caff67a 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -147,7 +147,7 @@ TRACE_EVENT(sched_switch,
                  __print_flags(__entry->prev_state & (TASK_STATE_MAX-1), "|",
                                { 1, "S"} , { 2, "D" }, { 4, "T" }, { 8, "t" },
                                { 16, "Z" }, { 32, "X" }, { 64, "x" },
-                                { 128, "W" }) : "R",
+                                { 128, "K" }, { 256, "W" }, { 512, "P" }) : "R",
                __entry->prev_state & TASK_STATE_MAX ? "+" : "",
                __entry->next_comm, __entry->next_pid, __entry->next_prio)
 );
diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h
index 425bcfe56c62..8d219470624f 100644
--- a/include/trace/events/timer.h
+++ b/include/trace/events/timer.h
@@ -123,7 +123,7 @@ DEFINE_EVENT(timer_class, timer_cancel,
 /**
 * hrtimer_init - called when the hrtimer is initialized
- * @timer:      pointer to struct hrtimer
+ * @hrtimer:    pointer to struct hrtimer
 * @clockid:    the hrtimers clock
 * @mode:       the hrtimers mode
 */
@@ -155,7 +155,7 @@ TRACE_EVENT(hrtimer_init,
 /**
 * hrtimer_start - called when the hrtimer is started
- * @timer: pointer to struct hrtimer
+ * @hrtimer: pointer to struct hrtimer
 */
 TRACE_EVENT(hrtimer_start,
@@ -186,8 +186,8 @@ TRACE_EVENT(hrtimer_start,
 );
 /**
- * htimmer_expire_entry - called immediately before the hrtimer callback
+ * hrtimer_expire_entry - called immediately before the hrtimer callback
- * @timer:      pointer to struct hrtimer
+ * @hrtimer:    pointer to struct hrtimer
 * @now:        pointer to variable which contains current time of the
 *              timers base.
 *
@@ -234,7 +234,7 @@ DECLARE_EVENT_CLASS(hrtimer_class,
 /**
 * hrtimer_expire_exit - called immediately after the hrtimer callback returns
- * @timer:      pointer to struct hrtimer
+ * @hrtimer:    pointer to struct hrtimer
 *
 * When used in combination with the hrtimer_expire_entry tracepoint we can
 * determine the runtime of the callback function.
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 40dc5e8fe340..19edd7facaa1 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -227,29 +227,18 @@ static notrace enum print_line_t					\
 ftrace_raw_output_##call(struct trace_iterator *iter, int flags,        \
                         struct trace_event *trace_event)               \
 {                                                                       \
-        struct ftrace_event_call *event;                                \
        struct trace_seq *s = &iter->seq;                               \
+        struct trace_seq __maybe_unused *p = &iter->tmp_seq;            \
        struct ftrace_raw_##call *field;                                \
-        struct trace_entry *entry;                                      \
-        struct trace_seq *p = &iter->tmp_seq;                           \
        int ret;                                                        \
                                                                        \
-        event = container_of(trace_event, struct ftrace_event_call,     \
+        field = (typeof(field))iter->ent;                               \
-                             event);                                    \
-                                                                        \
-        entry = iter->ent;                                              \
-                                                                        \
-        if (entry->type != event->event.type) {                         \
-                WARN_ON_ONCE(1);                                        \
-                return TRACE_TYPE_UNHANDLED;                            \
-        }                                                               \
-                                                                        \
-        field = (typeof(field))entry;                                   \
                                                                        \
-        trace_seq_init(p);                                              \
+        ret = ftrace_raw_output_prep(iter, trace_event);                \
-        ret = trace_seq_printf(s, "%s: ", event->name);                 \
        if (ret)                                                        \
-                ret = trace_seq_printf(s, print);                       \
+                return ret;                                             \
+                                                                        \
+        ret = trace_seq_printf(s, print);                               \
        if (!ret)                                                       \
                return TRACE_TYPE_PARTIAL_LINE;                         \
                                                                        \
@@ -335,7 +324,7 @@ static struct trace_event_functions ftrace_event_type_funcs_##call = {	\
 #undef DECLARE_EVENT_CLASS
 #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, func, print)    \
-static int notrace                                                      \
+static int notrace __init                                               \
 ftrace_define_fields_##call(struct ftrace_event_call *event_call)       \
 {                                                                       \
        struct ftrace_raw_##call field;                                 \
@@ -414,7 +403,8 @@ static inline notrace int ftrace_get_offsets_##call(			\
 *
 * static void ftrace_raw_event_<call>(void *__data, proto)
 * {
- *      struct ftrace_event_call *event_call = __data;
+ *      struct ftrace_event_file *ftrace_file = __data;
+ *      struct ftrace_event_call *event_call = ftrace_file->event_call;
 *      struct ftrace_data_offsets_<call> __maybe_unused __data_offsets;
 *      struct ring_buffer_event *event;
 *      struct ftrace_raw_<call> *entry; <-- defined in stage 1
@@ -423,12 +413,16 @@ static inline notrace int ftrace_get_offsets_##call(			\
 *      int __data_size;
 *      int pc;
 *
+ *      if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT,
+ *                   &ftrace_file->flags))
+ *              return;
+ *
 *      local_save_flags(irq_flags);
 *      pc = preempt_count();
 *
 *      __data_size = ftrace_get_offsets_<call>(&__data_offsets, args);
 *
- *      event = trace_current_buffer_lock_reserve(&buffer,
+ *      event = trace_event_buffer_lock_reserve(&buffer, ftrace_file,
 *                                event_<call>->event.type,
 *                                sizeof(*entry) + __data_size,
 *                                irq_flags, pc);
@@ -440,7 +434,7 @@ static inline notrace int ftrace_get_offsets_##call(			\
 *                         __array macros.
 *
 *      if (!filter_current_check_discard(buffer, event_call, entry, event))
- *              trace_current_buffer_unlock_commit(buffer,
+ *              trace_nowake_buffer_unlock_commit(buffer,
 *                                                 event, irq_flags, pc);
 * }
 *
@@ -518,7 +512,8 @@ static inline notrace int ftrace_get_offsets_##call(			\
 static notrace void                                                     \
 ftrace_raw_event_##call(void *__data, proto)                            \
 {                                                                       \
-        struct ftrace_event_call *event_call = __data;                  \
+        struct ftrace_event_file *ftrace_file = __data;                 \
+        struct ftrace_event_call *event_call = ftrace_file->event_call; \
        struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
        struct ring_buffer_event *event;                                \
        struct ftrace_raw_##call *entry;                                \
@@ -527,12 +522,16 @@ ftrace_raw_event_##call(void *__data, proto)				\
        int __data_size;                                                \
        int pc;                                                         \
                                                                        \
+        if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT,                 \
+                     &ftrace_file->flags))                              \
+                return;                                                 \
+                                                                        \
        local_save_flags(irq_flags);                                    \
        pc = preempt_count();                                           \
                                                                        \
        __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
                                                                        \
-        event = trace_current_buffer_lock_reserve(&buffer,              \
+        event = trace_event_buffer_lock_reserve(&buffer, ftrace_file,   \
                                 event_call->event.type,                \
                                 sizeof(*entry) + __data_size,          \
                                 irq_flags, pc);                        \
@@ -581,7 +580,7 @@ static inline void ftrace_test_probe_##call(void)			\
 #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)  \
 _TRACE_PERF_PROTO(call, PARAMS(proto));                                 \
 static const char print_fmt_##call[] = print;                           \
-static struct ftrace_event_class __used event_class_##call = {          \
+static struct ftrace_event_class __used __refdata event_class_##call = { \
        .system                 = __stringify(TRACE_SYSTEM),            \
        .define_fields          = ftrace_define_fields_##call,          \
        .fields                 = LIST_HEAD_INIT(event_class_##call.fields),\
@@ -705,5 +704,3 @@ static inline void perf_test_probe_##call(void)				\
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 #endif /* CONFIG_PERF_EVENTS */
-#undef _TRACE_PROFILE_INIT
diff --git a/include/uapi/linux/connector.h b/include/uapi/linux/connector.h
index 8761a0349c74..4cb283505e45 100644
--- a/include/uapi/linux/connector.h
+++ b/include/uapi/linux/connector.h
@@ -44,8 +44,11 @@
 #define CN_VAL_DRBD                     0x1
 #define CN_KVP_IDX                      0x9     /* HyperV KVP */
 #define CN_KVP_VAL                      0x1     /* queries from the kernel */
+#define CN_VSS_IDX                      0xA     /* HyperV VSS */
+#define CN_VSS_VAL                      0x1     /* queries from the kernel */
-#define CN_NETLINK_USERS                10      /* Highest index + 1 */
+#define CN_NETLINK_USERS                11      /* Highest index + 1 */
 /*
 * Maximum connector's message size.
diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
index 8072d352b98f..ef6103bf1f9b 100644
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@ -397,6 +397,7 @@ typedef struct elf64_shdr {
 #define NT_ARM_HW_WATCH 0x403           /* ARM hardware watchpoint registers */
 #define NT_METAG_CBUF   0x500           /* Metag catch buffer registers */
 #define NT_METAG_RPIPE  0x501           /* Metag read pipeline state */
+#define NT_METAG_TLS    0x502           /* Metag TLS pointer */
 /* Note header in a PT_NOTE section */
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
index c7fc1e6517c3..a4ed56cf0eac 100644
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
@@ -88,7 +88,6 @@ struct inodes_stat_t {
 #define MS_STRICTATIME  (1<<24) /* Always perform atime updates */
 /* These sb flags are internal to the kernel */
-#define MS_SNAP_STABLE  (1<<27) /* Snapshot pages during writeback, if needed */
 #define MS_NOSEC        (1<<28)
 #define MS_BORN         (1<<29)
 #define MS_ACTIVE       (1<<30)
diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
index 4c43b4448792..706d035fa748 100644
--- a/include/uapi/linux/fuse.h
+++ b/include/uapi/linux/fuse.h
@@ -95,15 +95,10 @@
 #ifndef _LINUX_FUSE_H
 #define _LINUX_FUSE_H
-#ifdef __linux__
+#ifdef __KERNEL__
 #include <linux/types.h>
 #else
 #include <stdint.h>
-#define __u64 uint64_t
-#define __s64 int64_t
-#define __u32 uint32_t
-#define __s32 int32_t
-#define __u16 uint16_t
 #endif
 /*
@@ -139,42 +134,42 @@
   userspace works under 64bit kernels */
 struct fuse_attr {
-        __u64   ino;
+        uint64_t        ino;
-        __u64   size;
+        uint64_t        size;
-        __u64   blocks;
+        uint64_t        blocks;
-        __u64   atime;
+        uint64_t        atime;
-        __u64   mtime;
+        uint64_t        mtime;
-        __u64   ctime;
+        uint64_t        ctime;
-        __u32   atimensec;
+        uint32_t        atimensec;
-        __u32   mtimensec;
+        uint32_t        mtimensec;
-        __u32   ctimensec;
+        uint32_t        ctimensec;
-        __u32   mode;
+        uint32_t        mode;
-        __u32   nlink;
+        uint32_t        nlink;
-        __u32   uid;
+        uint32_t        uid;
-        __u32   gid;
+        uint32_t        gid;
-        __u32   rdev;
+        uint32_t        rdev;
-        __u32   blksize;
+        uint32_t        blksize;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_kstatfs {
-        __u64   blocks;
+        uint64_t        blocks;
-        __u64   bfree;
+        uint64_t        bfree;
-        __u64   bavail;
+        uint64_t        bavail;
-        __u64   files;
+        uint64_t        files;
-        __u64   ffree;
+        uint64_t        ffree;
-        __u32   bsize;
+        uint32_t        bsize;
-        __u32   namelen;
+        uint32_t        namelen;
-        __u32   frsize;
+        uint32_t        frsize;
-        __u32   padding;
+        uint32_t        padding;
-        __u32   spare[6];
+        uint32_t        spare[6];
 };
 struct fuse_file_lock {
-        __u64   start;
+        uint64_t        start;
-        __u64   end;
+        uint64_t        end;
-        __u32   type;
+        uint32_t        type;
-        __u32   pid; /* tgid */
+        uint32_t        pid; /* tgid */
 };
 /**
@@ -364,143 +359,143 @@ enum fuse_notify_code {
 #define FUSE_COMPAT_ENTRY_OUT_SIZE 120
 struct fuse_entry_out {
-        __u64   nodeid;         /* Inode ID */
+        uint64_t        nodeid;         /* Inode ID */
-        __u64   generation;     /* Inode generation: nodeid:gen must
+        uint64_t        generation;     /* Inode generation: nodeid:gen must
-                                   be unique for the fs's lifetime */
+                                           be unique for the fs's lifetime */
-        __u64   entry_valid;    /* Cache timeout for the name */
+        uint64_t        entry_valid;    /* Cache timeout for the name */
-        __u64   attr_valid;     /* Cache timeout for the attributes */
+        uint64_t        attr_valid;     /* Cache timeout for the attributes */
-        __u32   entry_valid_nsec;
+        uint32_t        entry_valid_nsec;
-        __u32   attr_valid_nsec;
+        uint32_t        attr_valid_nsec;
        struct fuse_attr attr;
 };
 struct fuse_forget_in {
-        __u64   nlookup;
+        uint64_t        nlookup;
 };
 struct fuse_forget_one {
-        __u64   nodeid;
+        uint64_t        nodeid;
-        __u64   nlookup;
+        uint64_t        nlookup;
 };
 struct fuse_batch_forget_in {
-        __u32   count;
+        uint32_t        count;
-        __u32   dummy;
+        uint32_t        dummy;
 };
 struct fuse_getattr_in {
-        __u32   getattr_flags;
+        uint32_t        getattr_flags;
-        __u32   dummy;
+        uint32_t        dummy;
-        __u64   fh;
+        uint64_t        fh;
 };
 #define FUSE_COMPAT_ATTR_OUT_SIZE 96
 struct fuse_attr_out {
-        __u64   attr_valid;     /* Cache timeout for the attributes */
+        uint64_t        attr_valid;     /* Cache timeout for the attributes */
-        __u32   attr_valid_nsec;
+        uint32_t        attr_valid_nsec;
-        __u32   dummy;
+        uint32_t        dummy;
        struct fuse_attr attr;
 };
 #define FUSE_COMPAT_MKNOD_IN_SIZE 8
 struct fuse_mknod_in {
-        __u32   mode;
+        uint32_t        mode;
-        __u32   rdev;
+        uint32_t        rdev;
-        __u32   umask;
+        uint32_t        umask;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_mkdir_in {
-        __u32   mode;
+        uint32_t        mode;
-        __u32   umask;
+        uint32_t        umask;
 };
 struct fuse_rename_in {
-        __u64   newdir;
+        uint64_t        newdir;
 };
 struct fuse_link_in {
-        __u64   oldnodeid;
+        uint64_t        oldnodeid;
 };
 struct fuse_setattr_in {
-        __u32   valid;
+        uint32_t        valid;
-        __u32   padding;
+        uint32_t        padding;
-        __u64   fh;
+        uint64_t        fh;
-        __u64   size;
+        uint64_t        size;
-        __u64   lock_owner;
+        uint64_t        lock_owner;
-        __u64   atime;
+        uint64_t        atime;
-        __u64   mtime;
+        uint64_t        mtime;
-        __u64   unused2;
+        uint64_t        unused2;
-        __u32   atimensec;
+        uint32_t        atimensec;
-        __u32   mtimensec;
+        uint32_t        mtimensec;
-        __u32   unused3;
+        uint32_t        unused3;
-        __u32   mode;
+        uint32_t        mode;
-        __u32   unused4;
+        uint32_t        unused4;
-        __u32   uid;
+        uint32_t        uid;
-        __u32   gid;
+        uint32_t        gid;
-        __u32   unused5;
+        uint32_t        unused5;
 };
 struct fuse_open_in {
-        __u32   flags;
+        uint32_t        flags;
-        __u32   unused;
+        uint32_t        unused;
 };
 struct fuse_create_in {
-        __u32   flags;
+        uint32_t        flags;
-        __u32   mode;
+        uint32_t        mode;
-        __u32   umask;
+        uint32_t        umask;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_open_out {
-        __u64   fh;
+        uint64_t        fh;
-        __u32   open_flags;
+        uint32_t        open_flags;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_release_in {
-        __u64   fh;
+        uint64_t        fh;
-        __u32   flags;
+        uint32_t        flags;
-        __u32   release_flags;
+        uint32_t        release_flags;
-        __u64   lock_owner;
+        uint64_t        lock_owner;
 };
 struct fuse_flush_in {
-        __u64   fh;
+        uint64_t        fh;
-        __u32   unused;
+        uint32_t        unused;
-        __u32   padding;
+        uint32_t        padding;
-        __u64   lock_owner;
+        uint64_t        lock_owner;
 };
 struct fuse_read_in {
-        __u64   fh;
+        uint64_t        fh;
-        __u64   offset;
+        uint64_t        offset;
-        __u32   size;
+        uint32_t        size;
-        __u32   read_flags;
+        uint32_t        read_flags;
-        __u64   lock_owner;
+        uint64_t        lock_owner;
-        __u32   flags;
+        uint32_t        flags;
-        __u32   padding;
+        uint32_t        padding;
 };
 #define FUSE_COMPAT_WRITE_IN_SIZE 24
 struct fuse_write_in {
-        __u64   fh;
+        uint64_t        fh;
-        __u64   offset;
+        uint64_t        offset;
-        __u32   size;
+        uint32_t        size;
-        __u32   write_flags;
+        uint32_t        write_flags;
-        __u64   lock_owner;
+        uint64_t        lock_owner;
-        __u32   flags;
+        uint32_t        flags;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_write_out {
-        __u32   size;
+        uint32_t        size;
-        __u32   padding;
+        uint32_t        padding;
 };
 #define FUSE_COMPAT_STATFS_SIZE 48
@@ -510,32 +505,32 @@ struct fuse_statfs_out {
 };
 struct fuse_fsync_in {
-        __u64   fh;
+        uint64_t        fh;
-        __u32   fsync_flags;
+        uint32_t        fsync_flags;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_setxattr_in {
-        __u32   size;
+        uint32_t        size;
-        __u32   flags;
+        uint32_t        flags;
 };
 struct fuse_getxattr_in {
-        __u32   size;
+        uint32_t        size;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_getxattr_out {
-        __u32   size;
+        uint32_t        size;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_lk_in {
-        __u64   fh;
+        uint64_t        fh;
-        __u64   owner;
+        uint64_t        owner;
        struct fuse_file_lock lk;
-        __u32   lk_flags;
+        uint32_t        lk_flags;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_lk_out {
@@ -543,134 +538,135 @@ struct fuse_lk_out {
 };
 struct fuse_access_in {
-        __u32   mask;
+        uint32_t        mask;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_init_in {
-        __u32   major;
+        uint32_t        major;
-        __u32   minor;
+        uint32_t        minor;
-        __u32   max_readahead;
+        uint32_t        max_readahead;
-        __u32   flags;
+        uint32_t        flags;
 };
 struct fuse_init_out {
-        __u32   major;
+        uint32_t        major;
-        __u32   minor;
+        uint32_t        minor;
-        __u32   max_readahead;
+        uint32_t        max_readahead;
-        __u32   flags;
+        uint32_t        flags;
-        __u16   max_background;
+        uint16_t        max_background;
-        __u16   congestion_threshold;
+        uint16_t        congestion_threshold;
-        __u32   max_write;
+        uint32_t        max_write;
 };
 #define CUSE_INIT_INFO_MAX 4096
 struct cuse_init_in {
-        __u32   major;
+        uint32_t        major;
-        __u32   minor;
+        uint32_t        minor;
-        __u32   unused;
+        uint32_t        unused;
-        __u32   flags;
+        uint32_t        flags;
 };
 struct cuse_init_out {
-        __u32   major;
+        uint32_t        major;
-        __u32   minor;
+        uint32_t        minor;
-        __u32   unused;
+        uint32_t        unused;
-        __u32   flags;
+        uint32_t        flags;
-        __u32   max_read;
+        uint32_t        max_read;
-        __u32   max_write;
+        uint32_t        max_write;
-        __u32   dev_major;              /* chardev major */
+        uint32_t        dev_major;              /* chardev major */
-        __u32   dev_minor;              /* chardev minor */
+        uint32_t        dev_minor;              /* chardev minor */
-        __u32   spare[10];
+        uint32_t        spare[10];
 };
 struct fuse_interrupt_in {
-        __u64   unique;
+        uint64_t        unique;
 };
 struct fuse_bmap_in {
-        __u64   block;
+        uint64_t        block;
-        __u32   blocksize;
+        uint32_t        blocksize;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_bmap_out {
-        __u64   block;
+        uint64_t        block;
 };
 struct fuse_ioctl_in {
-        __u64   fh;
+        uint64_t        fh;
-        __u32   flags;
+        uint32_t        flags;
-        __u32   cmd;
+        uint32_t        cmd;
-        __u64   arg;
+        uint64_t        arg;
-        __u32   in_size;
+        uint32_t        in_size;
-        __u32   out_size;
+        uint32_t        out_size;
 };
 struct fuse_ioctl_iovec {
-        __u64   base;
+        uint64_t        base;
-        __u64   len;
+        uint64_t        len;
 };
 struct fuse_ioctl_out {
-        __s32   result;
+        int32_t         result;
-        __u32   flags;
+        uint32_t        flags;
-        __u32   in_iovs;
+        uint32_t        in_iovs;
-        __u32   out_iovs;
+        uint32_t        out_iovs;
 };
 struct fuse_poll_in {
-        __u64   fh;
+        uint64_t        fh;
-        __u64   kh;
+        uint64_t        kh;
-        __u32   flags;
+        uint32_t        flags;
-        __u32   events;
+        uint32_t        events;
 };
 struct fuse_poll_out {
-        __u32   revents;
+        uint32_t        revents;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_notify_poll_wakeup_out {
-        __u64   kh;
+        uint64_t        kh;
 };
 struct fuse_fallocate_in {
-        __u64   fh;
+        uint64_t        fh;
-        __u64   offset;
+        uint64_t        offset;
-        __u64   length;
+        uint64_t        length;
-        __u32   mode;
+        uint32_t        mode;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_in_header {
-        __u32   len;
+        uint32_t        len;
-        __u32   opcode;
+        uint32_t        opcode;
-        __u64   unique;
+        uint64_t        unique;
-        __u64   nodeid;
+        uint64_t        nodeid;
-        __u32   uid;
+        uint32_t        uid;
-        __u32   gid;
+        uint32_t        gid;
-        __u32   pid;
+        uint32_t        pid;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_out_header {
-        __u32   len;
+        uint32_t        len;
-        __s32   error;
+        int32_t         error;
-        __u64   unique;
+        uint64_t        unique;
 };
 struct fuse_dirent {
-        __u64   ino;
+        uint64_t        ino;
-        __u64   off;
+        uint64_t        off;
-        __u32   namelen;
+        uint32_t        namelen;
-        __u32   type;
+        uint32_t        type;
        char name[];
 };
 #define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name)
-#define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1))
+#define FUSE_DIRENT_ALIGN(x) \
+        (((x) + sizeof(uint64_t) - 1) & ~(sizeof(uint64_t) - 1))
 #define FUSE_DIRENT_SIZE(d) \
        FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen)
@@ -685,47 +681,47 @@ struct fuse_direntplus {
        FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET_DIRENTPLUS + (d)->dirent.namelen)
 struct fuse_notify_inval_inode_out {
-        __u64   ino;
+        uint64_t        ino;
-        __s64   off;
+        int64_t         off;
-        __s64   len;
+        int64_t         len;
 };
 struct fuse_notify_inval_entry_out {
-        __u64   parent;
+        uint64_t        parent;
-        __u32   namelen;
+        uint32_t        namelen;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_notify_delete_out {
-        __u64   parent;
+        uint64_t        parent;
-        __u64   child;
+        uint64_t        child;
-        __u32   namelen;
+        uint32_t        namelen;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_notify_store_out {
-        __u64   nodeid;
+        uint64_t        nodeid;
-        __u64   offset;
+        uint64_t        offset;
-        __u32   size;
+        uint32_t        size;
-        __u32   padding;
+        uint32_t        padding;
 };
 struct fuse_notify_retrieve_out {
-        __u64   notify_unique;
+        uint64_t        notify_unique;
-        __u64   nodeid;
+        uint64_t        nodeid;
-        __u64   offset;
+        uint64_t        offset;
-        __u32   size;
+        uint32_t        size;
-        __u32   padding;
+        uint32_t        padding;
 };
 /* Matches the size of fuse_write_in */
 struct fuse_notify_retrieve_in {
-        __u64   dummy1;
+        uint64_t        dummy1;
-        __u64   offset;
+        uint64_t        offset;
-        __u32   size;
+        uint32_t        size;
-        __u32   dummy2;
+        uint32_t        dummy2;
-        __u64   dummy3;
+        uint64_t        dummy3;
-        __u64   dummy4;
+        uint64_t        dummy4;
 };
 #endif /* _LINUX_FUSE_H */
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 873e086ce3a1..249df3720be2 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -11,6 +11,7 @@
 #define DEBUGFS_MAGIC          0x64626720
 #define SECURITYFS_MAGIC        0x73636673
 #define SELINUX_MAGIC           0xf97cff8c
+#define SMACK_MAGIC             0x43415d53      /* "SMAC" */
 #define RAMFS_MAGIC             0x858458f6      /* some random number */
 #define TMPFS_MAGIC             0x01021994
 #define HUGETLBFS_MAGIC         0x958458f6      /* some random number */
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
index ebfadc56d1b4..864e324da80d 100644
--- a/include/uapi/linux/pci_regs.h
+++ b/include/uapi/linux/pci_regs.h
@@ -292,12 +292,12 @@
 /* Message Signalled Interrupts registers */
-#define PCI_MSI_FLAGS           2       /* Various flags */
+#define PCI_MSI_FLAGS           2       /* Message Control */
-#define  PCI_MSI_FLAGS_64BIT    0x80    /* 64-bit addresses allowed */
+#define  PCI_MSI_FLAGS_ENABLE   0x0001  /* MSI feature enabled */
-#define  PCI_MSI_FLAGS_QSIZE    0x70    /* Message queue size configured */
+#define  PCI_MSI_FLAGS_QMASK    0x000e  /* Maximum queue size available */
-#define  PCI_MSI_FLAGS_QMASK    0x0e    /* Maximum queue size available */
+#define  PCI_MSI_FLAGS_QSIZE    0x0070  /* Message queue size configured */
-#define  PCI_MSI_FLAGS_ENABLE   0x01    /* MSI feature enabled */
+#define  PCI_MSI_FLAGS_64BIT    0x0080  /* 64-bit addresses allowed */
-#define  PCI_MSI_FLAGS_MASKBIT  0x100   /* 64-bit mask bits allowed */
+#define  PCI_MSI_FLAGS_MASKBIT  0x0100  /* Per-vector masking capable */
 #define PCI_MSI_RFU             3       /* Rest of capability flags */
 #define PCI_MSI_ADDRESS_LO      4       /* Lower 32 bits */
 #define PCI_MSI_ADDRESS_HI      8       /* Upper 32 bits (if PCI_MSI_FLAGS_64BIT set) */
@@ -309,13 +309,17 @@
 #define PCI_MSI_PENDING_64      20      /* Pending intrs for 64-bit devices */
 /* MSI-X registers */
-#define PCI_MSIX_FLAGS          2
+#define PCI_MSIX_FLAGS          2       /* Message Control */
-#define  PCI_MSIX_FLAGS_QSIZE   0x7FF
+#define  PCI_MSIX_FLAGS_QSIZE   0x07FF  /* Table size */
-#define  PCI_MSIX_FLAGS_ENABLE  (1 << 15)
+#define  PCI_MSIX_FLAGS_MASKALL 0x4000  /* Mask all vectors for this function */
-#define  PCI_MSIX_FLAGS_MASKALL (1 << 14)
+#define  PCI_MSIX_FLAGS_ENABLE  0x8000  /* MSI-X enable */
-#define PCI_MSIX_TABLE          4
+#define PCI_MSIX_TABLE          4       /* Table offset */
-#define PCI_MSIX_PBA            8
+#define  PCI_MSIX_TABLE_BIR     0x00000007 /* BAR index */
-#define  PCI_MSIX_FLAGS_BIRMASK (7 << 0)
+#define  PCI_MSIX_TABLE_OFFSET  0xfffffff8 /* Offset into specified BAR */
+#define PCI_MSIX_PBA            8       /* Pending Bit Array offset */
+#define  PCI_MSIX_PBA_BIR       0x00000007 /* BAR index */
+#define  PCI_MSIX_PBA_OFFSET    0xfffffff8 /* Offset into specified BAR */
+#define  PCI_MSIX_FLAGS_BIRMASK (7 << 0)   /* deprecated */
 #define PCI_CAP_MSIX_SIZEOF     12      /* size of MSIX registers */
 /* MSI-X entry's format */
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 9fa9c622a7f4..fb104e51496e 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -132,8 +132,10 @@ enum perf_event_sample_format {
        PERF_SAMPLE_BRANCH_STACK                = 1U << 11,
        PERF_SAMPLE_REGS_USER                   = 1U << 12,
        PERF_SAMPLE_STACK_USER                  = 1U << 13,
+        PERF_SAMPLE_WEIGHT                      = 1U << 14,
+        PERF_SAMPLE_DATA_SRC                    = 1U << 15,
-        PERF_SAMPLE_MAX = 1U << 14,             /* non-ABI */
+        PERF_SAMPLE_MAX = 1U << 16,             /* non-ABI */
 };
 /*
@@ -443,6 +445,7 @@ struct perf_event_mmap_page {
 #define PERF_RECORD_MISC_GUEST_KERNEL           (4 << 0)
 #define PERF_RECORD_MISC_GUEST_USER             (5 << 0)
+#define PERF_RECORD_MISC_MMAP_DATA              (1 << 13)
 /*
 * Indicates that the content of PERF_SAMPLE_IP points to
 * the actual instruction that triggered the event. See also
@@ -588,6 +591,9 @@ enum perf_event_type {
         *      { u64                   size;
         *        char                  data[size];
         *        u64                   dyn_size; } && PERF_SAMPLE_STACK_USER
+         *
+         *      { u64                   weight;   } && PERF_SAMPLE_WEIGHT
+         *      { u64                   data_src;     } && PERF_SAMPLE_DATA_SRC
         * };
         */
        PERF_RECORD_SAMPLE                      = 9,
@@ -613,4 +619,67 @@ enum perf_callchain_context {
 #define PERF_FLAG_FD_OUTPUT             (1U << 1)
 #define PERF_FLAG_PID_CGROUP            (1U << 2) /* pid=cgroup id, per-cpu mode only */
+union perf_mem_data_src {
+        __u64 val;
+        struct {
+                __u64   mem_op:5,       /* type of opcode */
+                        mem_lvl:14,     /* memory hierarchy level */
+                        mem_snoop:5,    /* snoop mode */
+                        mem_lock:2,     /* lock instr */
+                        mem_dtlb:7,     /* tlb access */
+                        mem_rsvd:31;
+        };
+};
+/* type of opcode (load/store/prefetch,code) */
+#define PERF_MEM_OP_NA          0x01 /* not available */
+#define PERF_MEM_OP_LOAD        0x02 /* load instruction */
+#define PERF_MEM_OP_STORE       0x04 /* store instruction */
+#define PERF_MEM_OP_PFETCH      0x08 /* prefetch */
+#define PERF_MEM_OP_EXEC        0x10 /* code (execution) */
+#define PERF_MEM_OP_SHIFT       0
+/* memory hierarchy (memory level, hit or miss) */
+#define PERF_MEM_LVL_NA         0x01  /* not available */
+#define PERF_MEM_LVL_HIT        0x02  /* hit level */
+#define PERF_MEM_LVL_MISS       0x04  /* miss level  */
+#define PERF_MEM_LVL_L1         0x08  /* L1 */
+#define PERF_MEM_LVL_LFB        0x10  /* Line Fill Buffer */
+#define PERF_MEM_LVL_L2         0x20  /* L2 */
+#define PERF_MEM_LVL_L3         0x40  /* L3 */
+#define PERF_MEM_LVL_LOC_RAM    0x80  /* Local DRAM */
+#define PERF_MEM_LVL_REM_RAM1   0x100 /* Remote DRAM (1 hop) */
+#define PERF_MEM_LVL_REM_RAM2   0x200 /* Remote DRAM (2 hops) */
+#define PERF_MEM_LVL_REM_CCE1   0x400 /* Remote Cache (1 hop) */
+#define PERF_MEM_LVL_REM_CCE2   0x800 /* Remote Cache (2 hops) */
+#define PERF_MEM_LVL_IO         0x1000 /* I/O memory */
+#define PERF_MEM_LVL_UNC        0x2000 /* Uncached memory */
+#define PERF_MEM_LVL_SHIFT      5
+/* snoop mode */
+#define PERF_MEM_SNOOP_NA       0x01 /* not available */
+#define PERF_MEM_SNOOP_NONE     0x02 /* no snoop */
+#define PERF_MEM_SNOOP_HIT      0x04 /* snoop hit */
+#define PERF_MEM_SNOOP_MISS     0x08 /* snoop miss */
+#define PERF_MEM_SNOOP_HITM     0x10 /* snoop hit modified */
+#define PERF_MEM_SNOOP_SHIFT    19
+/* locked instruction */
+#define PERF_MEM_LOCK_NA        0x01 /* not available */
+#define PERF_MEM_LOCK_LOCKED    0x02 /* locked transaction */
+#define PERF_MEM_LOCK_SHIFT     24
+/* TLB access */
+#define PERF_MEM_TLB_NA         0x01 /* not available */
+#define PERF_MEM_TLB_HIT        0x02 /* hit level */
+#define PERF_MEM_TLB_MISS       0x04 /* miss level */
+#define PERF_MEM_TLB_L1         0x08 /* L1 */
+#define PERF_MEM_TLB_L2         0x10 /* L2 */
+#define PERF_MEM_TLB_WK         0x20 /* Hardware Walker*/
+#define PERF_MEM_TLB_OS         0x40 /* OS fault handler */
+#define PERF_MEM_TLB_SHIFT      26
+#define PERF_MEM_S(a, s) \
+        (((u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)
 #endif /* _UAPI_LINUX_PERF_EVENT_H */
diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h
index 022ab186a812..52ebcc89f306 100644
--- a/include/uapi/linux/ptrace.h
+++ b/include/uapi/linux/ptrace.h
@@ -5,6 +5,7 @@
 /* has the defines to get at the registers. */
+#include <linux/types.h>
 #define PTRACE_TRACEME             0
 #define PTRACE_PEEKTEXT            1
@@ -52,6 +53,17 @@
 #define PTRACE_INTERRUPT        0x4207
 #define PTRACE_LISTEN           0x4208
+#define PTRACE_PEEKSIGINFO      0x4209
+struct ptrace_peeksiginfo_args {
+        __u64 off;      /* from which siginfo to start */
+        __u32 flags;
+        __s32 nr;       /* how may siginfos to take */
+};
+/* Read signals from a shared (process wide) queue */
+#define PTRACE_PEEKSIGINFO_SHARED       (1 << 0)
 /* Wait extended result codes for the above trace options.  */
 #define PTRACE_EVENT_FORK       1
 #define PTRACE_EVENT_VFORK      2
diff --git a/include/uapi/linux/time.h b/include/uapi/linux/time.h
index 0d3c0edc3eda..e75e1b6ff27f 100644
--- a/include/uapi/linux/time.h
+++ b/include/uapi/linux/time.h
@@ -54,11 +54,9 @@ struct itimerval {
 #define CLOCK_BOOTTIME                  7
 #define CLOCK_REALTIME_ALARM            8
 #define CLOCK_BOOTTIME_ALARM            9
+#define CLOCK_SGI_CYCLE                 10      /* Hardware specific */
+#define CLOCK_TAI                       11
-/*
- * The IDs of various hardware clocks:
- */
-#define CLOCK_SGI_CYCLE                 10
 #define MAX_CLOCKS                      16
 #define CLOCKS_MASK                     (CLOCK_REALTIME | CLOCK_MONOTONIC)
 #define CLOCKS_MONO                     CLOCK_MONOTONIC
diff --git a/include/uapi/linux/usb/cdc-wdm.h b/include/uapi/linux/usb/cdc-wdm.h
new file mode 100644
index 000000000000..f03134feebd6
--- /dev/null
+++ b/include/uapi/linux/usb/cdc-wdm.h
@@ -0,0 +1,21 @@
+/*
+ * USB CDC Device Management userspace API definitions
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ */
+#ifndef _UAPI__LINUX_USB_CDC_WDM_H
+#define _UAPI__LINUX_USB_CDC_WDM_H
+/*
+ * This IOCTL is used to retrieve the wMaxCommand for the device,
+ * defining the message limit for both reading and writing.
+ *
+ * For CDC WDM functions this will be the wMaxCommand field of the
+ * Device Management Functional Descriptor.
+ */
+#define IOCTL_WDM_MAX_COMMAND _IOR('H', 0xA0, __u16)
+#endif /* _UAPI__LINUX_USB_CDC_WDM_H */
diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
index f738e25377ff..aa33fd1b2d4f 100644
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
@@ -138,7 +138,7 @@
 /*
 * New Feature Selectors as added by USB 3.0
- * See USB 3.0 spec Table 9-6
+ * See USB 3.0 spec Table 9-7
 */
 #define USB_DEVICE_U1_ENABLE    48      /* dev may initiate U1 transition */
 #define USB_DEVICE_U2_ENABLE    49      /* dev may initiate U2 transition */
@@ -147,7 +147,7 @@
 #define USB_INTR_FUNC_SUSPEND_OPT_MASK  0xFF00
 /*
- * Suspend Options, Table 9-7 USB 3.0 spec
+ * Suspend Options, Table 9-8 USB 3.0 spec
 */
 #define USB_INTRF_FUNC_SUSPEND_LP       (1 << (8 + 0))
 #define USB_INTRF_FUNC_SUSPEND_RW       (1 << (8 + 1))
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 97fb392bb2d9..f40b41c7e108 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -72,27 +72,6 @@
 #define VIDEO_MAX_FRAME               32
 #define VIDEO_MAX_PLANES               8
-#ifndef __KERNEL__
-/* These defines are V4L1 specific and should not be used with the V4L2 API!
-   They will be removed from this header in the future. */
-#define VID_TYPE_CAPTURE        1       /* Can capture */
-#define VID_TYPE_TUNER          2       /* Can tune */
-#define VID_TYPE_TELETEXT       4       /* Does teletext */
-#define VID_TYPE_OVERLAY        8       /* Overlay onto frame buffer */
-#define VID_TYPE_CHROMAKEY      16      /* Overlay by chromakey */
-#define VID_TYPE_CLIPPING       32      /* Can clip */
-#define VID_TYPE_FRAMERAM       64      /* Uses the frame buffer memory */
-#define VID_TYPE_SCALES         128     /* Scalable */
-#define VID_TYPE_MONOCHROME     256     /* Monochrome only */
-#define VID_TYPE_SUBCAPTURE     512     /* Can capture subareas of the image */
-#define VID_TYPE_MPEG_DECODER   1024    /* Can decode MPEG streams */
-#define VID_TYPE_MPEG_ENCODER   2048    /* Can encode MPEG streams */
-#define VID_TYPE_MJPEG_DECODER  4096    /* Can decode MJPEG streams */
-#define VID_TYPE_MJPEG_ENCODER  8192    /* Can encode MJPEG streams */
-#endif
 /*
 *      M I S C E L L A N E O U S
 */
diff --git a/include/video/auo_k190xfb.h b/include/video/auo_k190xfb.h
index 609efe8c686e..ac329ee1d753 100644
--- a/include/video/auo_k190xfb.h
+++ b/include/video/auo_k190xfb.h
@@ -22,6 +22,8 @@
 */
 #define AUOK190X_RESOLUTION_800_600             0
 #define AUOK190X_RESOLUTION_1024_768            1
+#define AUOK190X_RESOLUTION_600_800             4
+#define AUOK190X_RESOLUTION_768_1024            5
 /*
 * struct used by auok190x. board specific stuff comes from *board
@@ -98,7 +100,6 @@ struct auok190x_board {
        int gpio_nbusy;
        int resolution;
-        int rotation;
        int quirks;
        int fps;
 };
diff --git a/include/video/display_timing.h b/include/video/display_timing.h
index 71e9a383a981..5d0259b08e01 100644
--- a/include/video/display_timing.h
+++ b/include/video/display_timing.h
@@ -12,19 +12,22 @@
 #include <linux/bitops.h>
 #include <linux/types.h>
-/* VESA display monitor timing parameters */
+enum display_flags {
-#define VESA_DMT_HSYNC_LOW              BIT(0)
+        DISPLAY_FLAGS_HSYNC_LOW         = BIT(0),
-#define VESA_DMT_HSYNC_HIGH             BIT(1)
+        DISPLAY_FLAGS_HSYNC_HIGH        = BIT(1),
-#define VESA_DMT_VSYNC_LOW              BIT(2)
+        DISPLAY_FLAGS_VSYNC_LOW         = BIT(2),
-#define VESA_DMT_VSYNC_HIGH             BIT(3)
+        DISPLAY_FLAGS_VSYNC_HIGH        = BIT(3),
-/* display specific flags */
+        /* data enable flag */
-#define DISPLAY_FLAGS_DE_LOW            BIT(0)  /* data enable flag */
+        DISPLAY_FLAGS_DE_LOW            = BIT(4),
-#define DISPLAY_FLAGS_DE_HIGH           BIT(1)
+        DISPLAY_FLAGS_DE_HIGH           = BIT(5),
-#define DISPLAY_FLAGS_PIXDATA_POSEDGE   BIT(2)  /* drive data on pos. edge */
+        /* drive data on pos. edge */
-#define DISPLAY_FLAGS_PIXDATA_NEGEDGE   BIT(3)  /* drive data on neg. edge */
+        DISPLAY_FLAGS_PIXDATA_POSEDGE   = BIT(6),
-#define DISPLAY_FLAGS_INTERLACED        BIT(4)
+        /* drive data on neg. edge */
-#define DISPLAY_FLAGS_DOUBLESCAN        BIT(5)
+        DISPLAY_FLAGS_PIXDATA_NEGEDGE   = BIT(7),
+        DISPLAY_FLAGS_INTERLACED        = BIT(8),
+        DISPLAY_FLAGS_DOUBLESCAN        = BIT(9),
+};
 /*
 * A single signal can be specified via a range of minimal and maximal values
@@ -36,12 +39,6 @@ struct timing_entry {
        u32 max;
 };
-enum timing_entry_index {
-        TE_MIN = 0,
-        TE_TYP = 1,
-        TE_MAX = 2,
-};
 /*
 * Single "mode" entry. This describes one set of signal timings a display can
 * have in one setting. This struct can later be converted to struct videomode
@@ -72,8 +69,7 @@ struct display_timing {
        struct timing_entry vback_porch;        /* ver. back porch */
        struct timing_entry vsync_len;          /* ver. sync len */
-        unsigned int dmt_flags;                 /* VESA DMT flags */
+        enum display_flags flags;               /* display flags */
-        unsigned int data_flags;                /* video data flags */
 };
 /*
@@ -89,25 +85,6 @@ struct display_timings {
        struct display_timing **timings;
 };
-/* get value specified by index from struct timing_entry */
-static inline u32 display_timing_get_value(const struct timing_entry *te,
-                                           enum timing_entry_index index)
-{
-        switch (index) {
-        case TE_MIN:
-                return te->min;
-                break;
-        case TE_TYP:
-                return te->typ;
-                break;
-        case TE_MAX:
-                return te->max;
-                break;
-        default:
-                return te->typ;
-        }
-}
 /* get one entry from struct display_timings */
 static inline struct display_timing *display_timings_get(const struct
                                                         display_timings *disp,
diff --git a/include/video/platform_lcd.h b/include/video/platform_lcd.h
index ad3bdfe743b2..23864b284147 100644
--- a/include/video/platform_lcd.h
+++ b/include/video/platform_lcd.h
@@ -15,6 +15,7 @@ struct plat_lcd_data;
 struct fb_info;
 struct plat_lcd_data {
+        int     (*probe)(struct plat_lcd_data *);
        void    (*set_power)(struct plat_lcd_data *, unsigned int power);
        int     (*match_fb)(struct plat_lcd_data *, struct fb_info *);
 };
diff --git a/include/video/videomode.h b/include/video/videomode.h
index a42156234dd4..3f1049d870d5 100644
--- a/include/video/videomode.h
+++ b/include/video/videomode.h
@@ -29,20 +29,30 @@ struct videomode {
        u32 vback_porch;
        u32 vsync_len;
-        unsigned int dmt_flags; /* VESA DMT flags */
+        enum display_flags flags; /* display flags */
-        unsigned int data_flags; /* video data flags */
 };
 /**
 * videomode_from_timing - convert display timing to videomode
+ * @dt: display_timing structure
+ * @vm: return value
+ *
+ * DESCRIPTION:
+ * This function converts a struct display_timing to a struct videomode.
+ */
+void videomode_from_timing(const struct display_timing *dt,
+                          struct videomode *vm);
+/**
+ * videomode_from_timings - convert one display timings entry to videomode
 * @disp: structure with all possible timing entries
 * @vm: return value
 * @index: index into the list of display timings in devicetree
 *
 * DESCRIPTION:
- * This function converts a struct display_timing to a struct videomode.
+ * This function converts one struct display_timing entry to a struct videomode.
 */
-int videomode_from_timing(const struct display_timings *disp,
+int videomode_from_timings(const struct display_timings *disp,
                          struct videomode *vm, unsigned int index);
 #endif
diff --git a/include/xen/events.h b/include/xen/events.h
index c6bfe01acf6b..b2b27c6a0f7b 100644
--- a/include/xen/events.h
+++ b/include/xen/events.h
@@ -90,8 +90,7 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi,
 int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc);
 /* Bind an PSI pirq to an irq. */
 int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
-                             int pirq, int vector, const char *name,
+                             int pirq, const char *name, domid_t domid);
-                             domid_t domid);
 #endif
 /* De-allocates the above mentioned physical interrupt. */
diff --git a/include/xen/tmem.h b/include/xen/tmem.h
index 591550a22ac7..3930a90045ff 100644
--- a/include/xen/tmem.h
+++ b/include/xen/tmem.h
@@ -3,7 +3,15 @@
 #include <linux/types.h>
+#ifdef CONFIG_XEN_TMEM_MODULE
+#define tmem_enabled true
+#else
 /* defined in drivers/xen/tmem.c */
 extern bool tmem_enabled;
+#endif
+#ifdef CONFIG_XEN_SELFBALLOONING
+extern int xen_selfballoon_init(bool, bool);
+#endif
 #endif /* _XEN_TMEM_H */