Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 804743,
    "url": "http://patchwork.ozlabs.org/api/patches/804743/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1503466686-10932-2-git-send-email-mpe@ellerman.id.au/",
    "project": {
        "id": 2,
        "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api",
        "name": "Linux PPC development",
        "link_name": "linuxppc-dev",
        "list_id": "linuxppc-dev.lists.ozlabs.org",
        "list_email": "linuxppc-dev@lists.ozlabs.org",
        "web_url": "https://github.com/linuxppc/wiki/wiki",
        "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git",
        "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/",
        "list_archive_url": "https://lore.kernel.org/linuxppc-dev/",
        "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/",
        "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"
    },
    "msgid": "<1503466686-10932-2-git-send-email-mpe@ellerman.id.au>",
    "list_archive_url": "https://lore.kernel.org/linuxppc-dev/1503466686-10932-2-git-send-email-mpe@ellerman.id.au/",
    "date": "2017-08-23T05:37:21",
    "name": "[01/46] powerpc/configs: Update for symbol movement only",
    "commit_ref": "980b4503b9efd97bcb51d5508d82fbf3ccb6aadb",
    "pull_url": null,
    "state": "accepted",
    "archived": false,
    "hash": "bac4d5d6458057061c118544d9cf576607a39834",
    "submitter": {
        "id": 46580,
        "url": "http://patchwork.ozlabs.org/api/people/46580/?format=api",
        "name": "Michael Ellerman",
        "email": "mpe@ellerman.id.au"
    },
    "delegate": null,
    "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1503466686-10932-2-git-send-email-mpe@ellerman.id.au/mbox/",
    "series": [],
    "comments": "http://patchwork.ozlabs.org/api/patches/804743/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/804743/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>",
        "X-Original-To": [
            "patchwork-incoming@ozlabs.org",
            "linuxppc-dev@lists.ozlabs.org"
        ],
        "Delivered-To": [
            "patchwork-incoming@ozlabs.org",
            "linuxppc-dev@lists.ozlabs.org",
            "linuxppc-dev@ozlabs.org"
        ],
        "Received": [
            "from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xcbsb01Cjz9s83\n\tfor <patchwork-incoming@ozlabs.org>;\n\tWed, 23 Aug 2017 15:42:10 +1000 (AEST)",
            "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xcbsZ5yg2zDrL3\n\tfor <patchwork-incoming@ozlabs.org>;\n\tWed, 23 Aug 2017 15:42:10 +1000 (AEST)",
            "from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xcbn21v1czDqY3\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tWed, 23 Aug 2017 15:38:14 +1000 (AEST)",
            "by ozlabs.org (Postfix)\n\tid 3xcbn14xc7z9sRq; Wed, 23 Aug 2017 15:38:13 +1000 (AEST)",
            "by ozlabs.org (Postfix, from userid 1034)\n\tid 3xcbn13Nmyz9s83; Wed, 23 Aug 2017 15:38:13 +1000 (AEST)"
        ],
        "From": "Michael Ellerman <mpe@ellerman.id.au>",
        "To": "linuxppc-dev@ozlabs.org",
        "Subject": "[PATCH 01/46] powerpc/configs: Update for symbol movement only",
        "Date": "Wed, 23 Aug 2017 15:37:21 +1000",
        "Message-Id": "<1503466686-10932-2-git-send-email-mpe@ellerman.id.au>",
        "X-Mailer": "git-send-email 2.7.4",
        "In-Reply-To": "<1503466686-10932-1-git-send-email-mpe@ellerman.id.au>",
        "References": "<1503466686-10932-1-git-send-email-mpe@ellerman.id.au>",
        "X-BeenThere": "linuxppc-dev@lists.ozlabs.org",
        "X-Mailman-Version": "2.1.23",
        "Precedence": "list",
        "List-Id": "Linux on PowerPC Developers Mail List\n\t<linuxppc-dev.lists.ozlabs.org>",
        "List-Unsubscribe": "<https://lists.ozlabs.org/options/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>",
        "List-Archive": "<http://lists.ozlabs.org/pipermail/linuxppc-dev/>",
        "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>",
        "List-Help": "<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>",
        "List-Subscribe": "<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>",
        "Errors-To": "linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org",
        "Sender": "\"Linuxppc-dev\"\n\t<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>"
    },
    "content": "Update defconfigs for symbols that have moved around, without their\nvalue changing.\n\nSigned-off-by: Michael Ellerman <mpe@ellerman.id.au>\n---\n arch/powerpc/configs/40x/virtex_defconfig       |  2 +-\n arch/powerpc/configs/44x/virtex5_defconfig      |  2 +-\n arch/powerpc/configs/52xx/lite5200b_defconfig   |  2 +-\n arch/powerpc/configs/52xx/motionpro_defconfig   | 14 ++++++------\n arch/powerpc/configs/83xx/mpc832x_mds_defconfig |  2 +-\n arch/powerpc/configs/83xx/mpc832x_rdb_defconfig |  4 ++--\n arch/powerpc/configs/83xx/mpc836x_mds_defconfig |  2 +-\n arch/powerpc/configs/83xx/mpc836x_rdk_defconfig |  2 +-\n arch/powerpc/configs/83xx/mpc837x_mds_defconfig |  2 +-\n arch/powerpc/configs/83xx/mpc837x_rdb_defconfig |  2 +-\n arch/powerpc/configs/83xx/sbc834x_defconfig     |  2 +-\n arch/powerpc/configs/85xx/ge_imp3a_defconfig    |  2 +-\n arch/powerpc/configs/85xx/ksi8560_defconfig     |  2 +-\n arch/powerpc/configs/85xx/mpc8540_ads_defconfig |  2 +-\n arch/powerpc/configs/85xx/mpc8560_ads_defconfig |  4 ++--\n arch/powerpc/configs/85xx/mpc85xx_cds_defconfig |  2 +-\n arch/powerpc/configs/85xx/sbc8548_defconfig     |  2 +-\n arch/powerpc/configs/85xx/tqm8540_defconfig     |  2 +-\n arch/powerpc/configs/85xx/tqm8541_defconfig     |  2 +-\n arch/powerpc/configs/85xx/tqm8555_defconfig     |  2 +-\n arch/powerpc/configs/85xx/tqm8560_defconfig     |  2 +-\n arch/powerpc/configs/85xx/xes_mpc85xx_defconfig |  2 +-\n arch/powerpc/configs/adder875_defconfig         |  2 +-\n arch/powerpc/configs/cell_defconfig             |  2 +-\n arch/powerpc/configs/chrp32_defconfig           |  2 +-\n arch/powerpc/configs/ep88xc_defconfig           |  2 +-\n arch/powerpc/configs/g5_defconfig               |  6 ++---\n arch/powerpc/configs/holly_defconfig            |  2 +-\n arch/powerpc/configs/maple_defconfig            |  4 ++--\n arch/powerpc/configs/mpc512x_defconfig          | 24 ++++++++++----------\n arch/powerpc/configs/mpc7448_hpc2_defconfig     |  2 +-\n arch/powerpc/configs/mpc83xx_defconfig          |  6 ++---\n arch/powerpc/configs/mpc866_ads_defconfig       |  2 +-\n arch/powerpc/configs/mpc86xx_basic_defconfig    | 12 +++++-----\n arch/powerpc/configs/mpc885_ads_defconfig       |  2 +-\n arch/powerpc/configs/pmac32_defconfig           |  4 ++--\n arch/powerpc/configs/powernv_defconfig          |  6 ++---\n arch/powerpc/configs/ppc40x_defconfig           |  2 +-\n arch/powerpc/configs/ppc44x_defconfig           |  2 +-\n arch/powerpc/configs/ppc64_defconfig            | 24 ++++++++++----------\n arch/powerpc/configs/ppc64e_defconfig           |  6 ++---\n arch/powerpc/configs/ppc6xx_defconfig           | 24 ++++++++++----------\n arch/powerpc/configs/pseries_defconfig          | 30 ++++++++++++-------------\n arch/powerpc/configs/tqm8xx_defconfig           |  2 +-\n 44 files changed, 114 insertions(+), 114 deletions(-)",
    "diff": "diff --git a/arch/powerpc/configs/40x/virtex_defconfig b/arch/powerpc/configs/40x/virtex_defconfig\nindex 65dc084a154c..a7f4119a0231 100644\n--- a/arch/powerpc/configs/40x/virtex_defconfig\n+++ b/arch/powerpc/configs/40x/virtex_defconfig\n@@ -41,9 +41,9 @@ CONFIG_NETDEVICES=y\n CONFIG_SERIO_XILINX_XPS_PS2=y\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n+CONFIG_SERIAL_OF_PLATFORM=y\n CONFIG_SERIAL_UARTLITE=y\n CONFIG_SERIAL_UARTLITE_CONSOLE=y\n-CONFIG_SERIAL_OF_PLATFORM=y\n CONFIG_XILINX_HWICAP=y\n CONFIG_GPIOLIB=y\n CONFIG_GPIO_SYSFS=y\ndiff --git a/arch/powerpc/configs/44x/virtex5_defconfig b/arch/powerpc/configs/44x/virtex5_defconfig\nindex ce052064bcbb..902d4b1e6732 100644\n--- a/arch/powerpc/configs/44x/virtex5_defconfig\n+++ b/arch/powerpc/configs/44x/virtex5_defconfig\n@@ -40,9 +40,9 @@ CONFIG_NETDEVICES=y\n CONFIG_SERIO_XILINX_XPS_PS2=y\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n+CONFIG_SERIAL_OF_PLATFORM=y\n CONFIG_SERIAL_UARTLITE=y\n CONFIG_SERIAL_UARTLITE_CONSOLE=y\n-CONFIG_SERIAL_OF_PLATFORM=y\n CONFIG_XILINX_HWICAP=y\n CONFIG_GPIOLIB=y\n CONFIG_GPIO_SYSFS=y\ndiff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig\nindex 9493b02ac660..94dd48d77b74 100644\n--- a/arch/powerpc/configs/52xx/lite5200b_defconfig\n+++ b/arch/powerpc/configs/52xx/lite5200b_defconfig\n@@ -14,6 +14,7 @@ CONFIG_PPC_MPC52xx=y\n CONFIG_PPC_MPC5200_SIMPLE=y\n CONFIG_PPC_LITE5200=y\n # CONFIG_PPC_PMAC is not set\n+CONFIG_GEN_RTC=y\n CONFIG_NET=y\n CONFIG_PACKET=y\n CONFIG_UNIX=y\n@@ -44,7 +45,6 @@ CONFIG_SERIAL_MPC52xx=y\n CONFIG_SERIAL_MPC52xx_CONSOLE=y\n CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200\n # CONFIG_HW_RANDOM is not set\n-CONFIG_GEN_RTC=y\n CONFIG_I2C=y\n CONFIG_I2C_CHARDEV=y\n CONFIG_I2C_MPC=y\ndiff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig\nindex fe8126bc1655..f97c3b0b8061 100644\n--- a/arch/powerpc/configs/52xx/motionpro_defconfig\n+++ b/arch/powerpc/configs/52xx/motionpro_defconfig\n@@ -41,16 +41,16 @@ CONFIG_ATA=y\n CONFIG_PATA_MPC52xx=y\n CONFIG_NETDEVICES=y\n CONFIG_FEC_MPC52xx=y\n-CONFIG_MARVELL_PHY=y\n+CONFIG_MDIO_BITBANG=y\n+CONFIG_BROADCOM_PHY=y\n+CONFIG_CICADA_PHY=y\n CONFIG_DAVICOM_PHY=y\n-CONFIG_QSEMI_PHY=y\n+CONFIG_ICPLUS_PHY=y\n CONFIG_LXT_PHY=y\n-CONFIG_CICADA_PHY=y\n-CONFIG_VITESSE_PHY=y\n+CONFIG_MARVELL_PHY=y\n+CONFIG_QSEMI_PHY=y\n CONFIG_SMSC_PHY=y\n-CONFIG_BROADCOM_PHY=y\n-CONFIG_ICPLUS_PHY=y\n-CONFIG_MDIO_BITBANG=y\n+CONFIG_VITESSE_PHY=y\n # CONFIG_INPUT is not set\n # CONFIG_SERIO is not set\n # CONFIG_VT is not set\ndiff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig\nindex e789518a2881..567c32769021 100644\n--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig\n+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig\n@@ -14,7 +14,6 @@ CONFIG_PARTITION_ADVANCED=y\n # CONFIG_PPC_PMAC is not set\n CONFIG_PPC_83xx=y\n CONFIG_MPC832x_MDS=y\n-CONFIG_QUICC_ENGINE=y\n CONFIG_MATH_EMULATION=y\n CONFIG_PCI=y\n CONFIG_NET=y\n@@ -50,6 +49,7 @@ CONFIG_I2C_MPC=y\n CONFIG_WATCHDOG=y\n CONFIG_RTC_CLASS=y\n CONFIG_RTC_DRV_DS1374=y\n+CONFIG_QUICC_ENGINE=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT4_FS=y\n CONFIG_PROC_KCORE=y\ndiff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig\nindex 917a49ca2bd1..5b8c5514a7d6 100644\n--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig\n+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig\n@@ -14,7 +14,7 @@ CONFIG_LDM_PARTITION=y\n # CONFIG_PPC_PMAC is not set\n CONFIG_PPC_83xx=y\n CONFIG_MPC832x_RDB=y\n-CONFIG_QUICC_ENGINE=y\n+CONFIG_GEN_RTC=y\n CONFIG_MATH_EMULATION=y\n CONFIG_PCI=y\n CONFIG_NET=y\n@@ -46,7 +46,6 @@ CONFIG_ICPLUS_PHY=y\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n CONFIG_HW_RANDOM=y\n-CONFIG_GEN_RTC=y\n CONFIG_I2C=y\n CONFIG_I2C_CHARDEV=y\n CONFIG_I2C_MPC=y\n@@ -62,6 +61,7 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y\n CONFIG_USB_STORAGE=y\n CONFIG_MMC=y\n CONFIG_MMC_SPI=y\n+CONFIG_QUICC_ENGINE=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT4_FS=y\n CONFIG_MSDOS_FS=y\ndiff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig\nindex ceed4c1f0ab5..8eb885d99312 100644\n--- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig\n+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig\n@@ -14,7 +14,6 @@ CONFIG_PARTITION_ADVANCED=y\n # CONFIG_PPC_PMAC is not set\n CONFIG_PPC_83xx=y\n CONFIG_MPC836x_MDS=y\n-CONFIG_QUICC_ENGINE=y\n CONFIG_PCI=y\n CONFIG_NET=y\n CONFIG_PACKET=y\n@@ -55,6 +54,7 @@ CONFIG_I2C_MPC=y\n CONFIG_WATCHDOG=y\n CONFIG_RTC_CLASS=y\n CONFIG_RTC_DRV_DS1374=y\n+CONFIG_QUICC_ENGINE=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT4_FS=y\n CONFIG_PROC_KCORE=y\ndiff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig\nindex a6819bf3ef5e..e15670bc1711 100644\n--- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig\n+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig\n@@ -12,7 +12,6 @@ CONFIG_PARTITION_ADVANCED=y\n # CONFIG_PPC_PMAC is not set\n CONFIG_PPC_83xx=y\n CONFIG_MPC836x_RDK=y\n-CONFIG_QUICC_ENGINE=y\n CONFIG_QE_GPIO=y\n CONFIG_PCI=y\n CONFIG_NET=y\n@@ -63,6 +62,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y\n CONFIG_LOGO=y\n # CONFIG_LOGO_LINUX_MONO is not set\n # CONFIG_USB_SUPPORT is not set\n+CONFIG_QUICC_ENGINE=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT4_FS=y\n CONFIG_PROC_KCORE=y\ndiff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig\nindex 4bd1992e4d98..f72e9fd9b042 100644\n--- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig\n+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig\n@@ -11,6 +11,7 @@ CONFIG_PARTITION_ADVANCED=y\n # CONFIG_PPC_PMAC is not set\n CONFIG_PPC_83xx=y\n CONFIG_MPC837x_MDS=y\n+CONFIG_GEN_RTC=y\n CONFIG_PCI=y\n CONFIG_NET=y\n CONFIG_PACKET=y\n@@ -43,7 +44,6 @@ CONFIG_MARVELL_PHY=y\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n # CONFIG_HW_RANDOM is not set\n-CONFIG_GEN_RTC=y\n CONFIG_I2C=y\n CONFIG_I2C_CHARDEV=y\n CONFIG_I2C_MPC=y\ndiff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig\nindex 2d4bb63882b8..bfff262bdc7f 100644\n--- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig\n+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig\n@@ -11,6 +11,7 @@ CONFIG_PARTITION_ADVANCED=y\n # CONFIG_PPC_PMAC is not set\n CONFIG_PPC_83xx=y\n CONFIG_MPC837x_RDB=y\n+CONFIG_GEN_RTC=y\n CONFIG_PCI=y\n CONFIG_NET=y\n CONFIG_PACKET=y\n@@ -51,7 +52,6 @@ CONFIG_INPUT_FF_MEMLESS=m\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n # CONFIG_HW_RANDOM is not set\n-CONFIG_GEN_RTC=y\n CONFIG_I2C=y\n CONFIG_I2C_CHARDEV=y\n CONFIG_I2C_MPC=y\ndiff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig\nindex b3380dbd1925..a349e140cca1 100644\n--- a/arch/powerpc/configs/83xx/sbc834x_defconfig\n+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig\n@@ -11,6 +11,7 @@ CONFIG_MODULE_UNLOAD=y\n # CONFIG_PPC_PMAC is not set\n CONFIG_PPC_83xx=y\n CONFIG_SBC834x=y\n+CONFIG_GEN_RTC=y\n CONFIG_PCI=y\n CONFIG_NET=y\n CONFIG_PACKET=y\n@@ -52,7 +53,6 @@ CONFIG_SERIAL_8250_CONSOLE=y\n CONFIG_SERIAL_8250_NR_UARTS=2\n CONFIG_SERIAL_8250_RUNTIME_UARTS=2\n # CONFIG_HW_RANDOM is not set\n-CONFIG_GEN_RTC=y\n CONFIG_I2C=y\n CONFIG_I2C_CHARDEV=y\n CONFIG_I2C_MPC=y\ndiff --git a/arch/powerpc/configs/85xx/ge_imp3a_defconfig b/arch/powerpc/configs/85xx/ge_imp3a_defconfig\nindex a917f7afb4f9..efb5b64fb179 100644\n--- a/arch/powerpc/configs/85xx/ge_imp3a_defconfig\n+++ b/arch/powerpc/configs/85xx/ge_imp3a_defconfig\n@@ -22,7 +22,6 @@ CONFIG_MODULES=y\n CONFIG_MODULE_UNLOAD=y\n # CONFIG_BLK_DEV_BSG is not set\n CONFIG_GE_IMP3A=y\n-CONFIG_QUICC_ENGINE=y\n CONFIG_QE_GPIO=y\n CONFIG_CPM2=y\n CONFIG_HIGHMEM=y\n@@ -161,6 +160,7 @@ CONFIG_RTC_CLASS=y\n CONFIG_RTC_DRV_RX8581=y\n CONFIG_DMADEVICES=y\n CONFIG_FSL_DMA=y\n+CONFIG_QUICC_ENGINE=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT2_FS_XATTR=y\n CONFIG_EXT2_FS_POSIX_ACL=y\ndiff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig\nindex bd814dfb0bbd..7c3dfbbe690c 100644\n--- a/arch/powerpc/configs/85xx/ksi8560_defconfig\n+++ b/arch/powerpc/configs/85xx/ksi8560_defconfig\n@@ -8,6 +8,7 @@ CONFIG_PARTITION_ADVANCED=y\n # CONFIG_MSDOS_PARTITION is not set\n CONFIG_KSI8560=y\n CONFIG_CPM2=y\n+CONFIG_GEN_RTC=y\n CONFIG_HIGHMEM=y\n CONFIG_BINFMT_MISC=y\n CONFIG_MATH_EMULATION=y\n@@ -46,7 +47,6 @@ CONFIG_MARVELL_PHY=y\n # CONFIG_VT is not set\n CONFIG_SERIAL_CPM=y\n CONFIG_SERIAL_CPM_CONSOLE=y\n-CONFIG_GEN_RTC=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT4_FS=y\n CONFIG_PROC_KCORE=y\ndiff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig\nindex 32af10def641..fec0e7432fe3 100644\n--- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig\n+++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig\n@@ -9,6 +9,7 @@ CONFIG_EXPERT=y\n CONFIG_PARTITION_ADVANCED=y\n # CONFIG_MSDOS_PARTITION is not set\n CONFIG_MPC8540_ADS=y\n+CONFIG_GEN_RTC=y\n CONFIG_BINFMT_MISC=y\n CONFIG_MATH_EMULATION=y\n # CONFIG_SECCOMP is not set\n@@ -38,7 +39,6 @@ CONFIG_GIANFAR=y\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n # CONFIG_HW_RANDOM is not set\n-CONFIG_GEN_RTC=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT4_FS=y\n CONFIG_PROC_KCORE=y\ndiff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig\nindex a52b2170ee33..dae1cbeee3ef 100644\n--- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig\n+++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig\n@@ -7,6 +7,7 @@ CONFIG_EXPERT=y\n CONFIG_PARTITION_ADVANCED=y\n # CONFIG_MSDOS_PARTITION is not set\n CONFIG_MPC8560_ADS=y\n+CONFIG_GEN_RTC=y\n CONFIG_BINFMT_MISC=y\n CONFIG_MATH_EMULATION=y\n # CONFIG_SECCOMP is not set\n@@ -32,16 +33,15 @@ CONFIG_FS_ENET=y\n # CONFIG_FS_ENET_HAS_SCC is not set\n CONFIG_GIANFAR=y\n CONFIG_E1000=y\n-CONFIG_MARVELL_PHY=y\n CONFIG_DAVICOM_PHY=y\n # CONFIG_INPUT_MOUSEDEV is not set\n+CONFIG_MARVELL_PHY=y\n # CONFIG_INPUT_KEYBOARD is not set\n # CONFIG_INPUT_MOUSE is not set\n # CONFIG_SERIO is not set\n # CONFIG_VT is not set\n CONFIG_SERIAL_CPM=y\n CONFIG_SERIAL_CPM_CONSOLE=y\n-CONFIG_GEN_RTC=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT4_FS=y\n CONFIG_PROC_KCORE=y\ndiff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig\nindex 002bb48abaa3..34b33d7da2aa 100644\n--- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig\n+++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig\n@@ -9,6 +9,7 @@ CONFIG_EXPERT=y\n CONFIG_PARTITION_ADVANCED=y\n # CONFIG_MSDOS_PARTITION is not set\n CONFIG_MPC85xx_CDS=y\n+CONFIG_GEN_RTC=y\n CONFIG_BINFMT_MISC=y\n CONFIG_MATH_EMULATION=y\n # CONFIG_SECCOMP is not set\n@@ -43,7 +44,6 @@ CONFIG_E1000=y\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n # CONFIG_HW_RANDOM is not set\n-CONFIG_GEN_RTC=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT4_FS=y\n CONFIG_PROC_KCORE=y\ndiff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig\nindex 97ae02377cf3..cfc254813087 100644\n--- a/arch/powerpc/configs/85xx/sbc8548_defconfig\n+++ b/arch/powerpc/configs/85xx/sbc8548_defconfig\n@@ -6,6 +6,7 @@ CONFIG_EXPERT=y\n CONFIG_SLAB=y\n # CONFIG_BLK_DEV_BSG is not set\n CONFIG_SBC8548=y\n+CONFIG_GEN_RTC=y\n CONFIG_BINFMT_MISC=y\n CONFIG_MATH_EMULATION=y\n # CONFIG_SECCOMP is not set\n@@ -44,7 +45,6 @@ CONFIG_BROADCOM_PHY=y\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n # CONFIG_HW_RANDOM is not set\n-CONFIG_GEN_RTC=y\n # CONFIG_USB_SUPPORT is not set\n CONFIG_PROC_KCORE=y\n CONFIG_TMPFS=y\ndiff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig\nindex 908f3885f4a5..a6e65612c0fc 100644\n--- a/arch/powerpc/configs/85xx/tqm8540_defconfig\n+++ b/arch/powerpc/configs/85xx/tqm8540_defconfig\n@@ -9,6 +9,7 @@ CONFIG_EXPERT=y\n CONFIG_PARTITION_ADVANCED=y\n # CONFIG_MSDOS_PARTITION is not set\n CONFIG_TQM8540=y\n+CONFIG_GEN_RTC=y\n CONFIG_MATH_EMULATION=y\n CONFIG_PCI=y\n CONFIG_NET=y\n@@ -42,7 +43,6 @@ CONFIG_E100=y\n # CONFIG_VT is not set\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n-CONFIG_GEN_RTC=y\n CONFIG_I2C=y\n CONFIG_I2C_CHARDEV=y\n CONFIG_I2C_MPC=y\ndiff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig\nindex f47e57610b7c..c22a4ebe6164 100644\n--- a/arch/powerpc/configs/85xx/tqm8541_defconfig\n+++ b/arch/powerpc/configs/85xx/tqm8541_defconfig\n@@ -9,6 +9,7 @@ CONFIG_EXPERT=y\n CONFIG_PARTITION_ADVANCED=y\n # CONFIG_MSDOS_PARTITION is not set\n CONFIG_TQM8541=y\n+CONFIG_GEN_RTC=y\n CONFIG_MATH_EMULATION=y\n CONFIG_PCI=y\n CONFIG_NET=y\n@@ -44,7 +45,6 @@ CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n CONFIG_SERIAL_CPM=y\n CONFIG_SERIAL_CPM_CONSOLE=y\n-CONFIG_GEN_RTC=y\n CONFIG_I2C=y\n CONFIG_I2C_CHARDEV=y\n CONFIG_I2C_MPC=y\ndiff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig\nindex 71552b7929cd..d2ceca178b79 100644\n--- a/arch/powerpc/configs/85xx/tqm8555_defconfig\n+++ b/arch/powerpc/configs/85xx/tqm8555_defconfig\n@@ -9,6 +9,7 @@ CONFIG_EXPERT=y\n CONFIG_PARTITION_ADVANCED=y\n # CONFIG_MSDOS_PARTITION is not set\n CONFIG_TQM8555=y\n+CONFIG_GEN_RTC=y\n CONFIG_MATH_EMULATION=y\n CONFIG_PCI=y\n CONFIG_NET=y\n@@ -44,7 +45,6 @@ CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n CONFIG_SERIAL_CPM=y\n CONFIG_SERIAL_CPM_CONSOLE=y\n-CONFIG_GEN_RTC=y\n CONFIG_I2C=y\n CONFIG_I2C_CHARDEV=y\n CONFIG_I2C_MPC=y\ndiff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig\nindex 25aac973d6d7..8c0ffc1df8a9 100644\n--- a/arch/powerpc/configs/85xx/tqm8560_defconfig\n+++ b/arch/powerpc/configs/85xx/tqm8560_defconfig\n@@ -9,6 +9,7 @@ CONFIG_EXPERT=y\n CONFIG_PARTITION_ADVANCED=y\n # CONFIG_MSDOS_PARTITION is not set\n CONFIG_TQM8560=y\n+CONFIG_GEN_RTC=y\n CONFIG_MATH_EMULATION=y\n CONFIG_PCI=y\n CONFIG_NET=y\n@@ -44,7 +45,6 @@ CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n CONFIG_SERIAL_CPM=y\n CONFIG_SERIAL_CPM_CONSOLE=y\n-CONFIG_GEN_RTC=y\n CONFIG_I2C=y\n CONFIG_I2C_CHARDEV=y\n CONFIG_I2C_MPC=y\ndiff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig\nindex 72900b84d3e0..f1c4d79a7889 100644\n--- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig\n+++ b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig\n@@ -107,8 +107,8 @@ CONFIG_SENSORS_LM90=y\n CONFIG_WATCHDOG=y\n CONFIG_USB=y\n CONFIG_USB_MON=y\n-CONFIG_USB_ISP1760=y\n CONFIG_USB_STORAGE=y\n+CONFIG_USB_ISP1760=y\n CONFIG_NEW_LEDS=y\n CONFIG_LEDS_CLASS=y\n CONFIG_LEDS_PCA955X=y\ndiff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig\nindex 6a3f825452e9..935ea3ade7de 100644\n--- a/arch/powerpc/configs/adder875_defconfig\n+++ b/arch/powerpc/configs/adder875_defconfig\n@@ -12,6 +12,7 @@ CONFIG_PARTITION_ADVANCED=y\n # CONFIG_IOSCHED_CFQ is not set\n CONFIG_PPC_ADDER875=y\n CONFIG_8xx_COPYBACK=y\n+CONFIG_GEN_RTC=y\n CONFIG_HZ_1000=y\n # CONFIG_SECCOMP is not set\n CONFIG_NET=y\n@@ -41,7 +42,6 @@ CONFIG_DAVICOM_PHY=y\n # CONFIG_LEGACY_PTYS is not set\n CONFIG_SERIAL_CPM=y\n CONFIG_SERIAL_CPM_CONSOLE=y\n-CONFIG_GEN_RTC=y\n # CONFIG_HWMON is not set\n CONFIG_THERMAL=y\n # CONFIG_USB_SUPPORT is not set\ndiff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig\nindex aa564599e368..708a538484a6 100644\n--- a/arch/powerpc/configs/cell_defconfig\n+++ b/arch/powerpc/configs/cell_defconfig\n@@ -34,6 +34,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y\n CONFIG_CPU_FREQ_GOV_USERSPACE=y\n CONFIG_CPU_FREQ_GOV_ONDEMAND=y\n CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y\n+CONFIG_GEN_RTC=y\n CONFIG_BINFMT_MISC=m\n CONFIG_IRQ_ALL_CPUS=y\n CONFIG_NUMA=y\n@@ -159,7 +160,6 @@ CONFIG_IPMI_SI=m\n CONFIG_IPMI_WATCHDOG=m\n CONFIG_IPMI_POWEROFF=m\n # CONFIG_HW_RANDOM is not set\n-CONFIG_GEN_RTC=y\n CONFIG_I2C=y\n CONFIG_WATCHDOG=y\n # CONFIG_VGA_CONSOLE is not set\ndiff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig\nindex 1f6f90cd8aff..664f092e5867 100644\n--- a/arch/powerpc/configs/chrp32_defconfig\n+++ b/arch/powerpc/configs/chrp32_defconfig\n@@ -16,6 +16,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y\n CONFIG_PARTITION_ADVANCED=y\n CONFIG_MAC_PARTITION=y\n # CONFIG_PPC_PMAC is not set\n+CONFIG_GEN_RTC=y\n CONFIG_HIGHMEM=y\n CONFIG_BINFMT_MISC=y\n CONFIG_IRQ_ALL_CPUS=y\n@@ -79,7 +80,6 @@ CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n # CONFIG_HW_RANDOM is not set\n CONFIG_NVRAM=y\n-CONFIG_GEN_RTC=y\n # CONFIG_HWMON is not set\n CONFIG_FB=y\n CONFIG_FIRMWARE_EDID=y\ndiff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig\nindex 95411aeeeb8d..7cb590e8f8fd 100644\n--- a/arch/powerpc/configs/ep88xc_defconfig\n+++ b/arch/powerpc/configs/ep88xc_defconfig\n@@ -14,6 +14,7 @@ CONFIG_PARTITION_ADVANCED=y\n # CONFIG_IOSCHED_CFQ is not set\n CONFIG_PPC_EP88XC=y\n CONFIG_8xx_COPYBACK=y\n+CONFIG_GEN_RTC=y\n CONFIG_HZ_100=y\n # CONFIG_SECCOMP is not set\n CONFIG_NET=y\n@@ -45,7 +46,6 @@ CONFIG_LXT_PHY=y\n # CONFIG_LEGACY_PTYS is not set\n CONFIG_SERIAL_CPM=y\n CONFIG_SERIAL_CPM_CONSOLE=y\n-CONFIG_GEN_RTC=y\n # CONFIG_HWMON is not set\n # CONFIG_USB_SUPPORT is not set\n # CONFIG_DNOTIFY is not set\ndiff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig\nindex e18f2e06553f..b7245851f9ac 100644\n--- a/arch/powerpc/configs/g5_defconfig\n+++ b/arch/powerpc/configs/g5_defconfig\n@@ -25,6 +25,7 @@ CONFIG_CPU_FREQ=y\n CONFIG_CPU_FREQ_GOV_POWERSAVE=y\n CONFIG_CPU_FREQ_GOV_USERSPACE=y\n CONFIG_CPU_FREQ_PMAC64=y\n+CONFIG_GEN_RTC=y\n CONFIG_KEXEC=y\n CONFIG_IRQ_ALL_CPUS=y\n CONFIG_PCI_MSI=y\n@@ -123,7 +124,6 @@ CONFIG_INPUT_EVDEV=y\n # CONFIG_SERIO_I8042 is not set\n # CONFIG_SERIO_SERPORT is not set\n # CONFIG_HW_RANDOM is not set\n-CONFIG_GEN_RTC=y\n CONFIG_RAW_DRIVER=y\n CONFIG_I2C_CHARDEV=y\n CONFIG_AGP=m\n@@ -213,20 +213,20 @@ CONFIG_USB_SERIAL_CYBERJACK=m\n CONFIG_USB_SERIAL_XIRCOM=m\n CONFIG_USB_SERIAL_OMNINET=m\n CONFIG_USB_APPLEDISPLAY=m\n-CONFIG_FS_DAX=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT2_FS_XATTR=y\n CONFIG_EXT2_FS_POSIX_ACL=y\n CONFIG_EXT2_FS_SECURITY=y\n+CONFIG_EXT4_FS=y\n CONFIG_EXT4_FS_POSIX_ACL=y\n CONFIG_EXT4_FS_SECURITY=y\n-CONFIG_EXT4_FS=y\n CONFIG_REISERFS_FS=y\n CONFIG_REISERFS_FS_XATTR=y\n CONFIG_REISERFS_FS_POSIX_ACL=y\n CONFIG_REISERFS_FS_SECURITY=y\n CONFIG_XFS_FS=m\n CONFIG_XFS_POSIX_ACL=y\n+CONFIG_FS_DAX=y\n CONFIG_ISO9660_FS=y\n CONFIG_JOLIET=y\n CONFIG_ZISOFS=y\ndiff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig\nindex e56e80090529..defa4395aa71 100644\n--- a/arch/powerpc/configs/holly_defconfig\n+++ b/arch/powerpc/configs/holly_defconfig\n@@ -11,6 +11,7 @@ CONFIG_PARTITION_ADVANCED=y\n # CONFIG_PPC_PMAC is not set\n CONFIG_EMBEDDED6xx=y\n CONFIG_PPC_HOLLY=y\n+CONFIG_GEN_RTC=y\n CONFIG_BINFMT_MISC=y\n CONFIG_CMDLINE_BOOL=y\n CONFIG_CMDLINE=\"console=ttyS0,115200\"\n@@ -49,7 +50,6 @@ CONFIG_SERIAL_8250_EXTENDED=y\n CONFIG_SERIAL_8250_SHARE_IRQ=y\n CONFIG_SERIAL_OF_PLATFORM=y\n # CONFIG_HW_RANDOM is not set\n-CONFIG_GEN_RTC=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT4_FS=y\n CONFIG_PROC_KCORE=y\ndiff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig\nindex c4018179e219..afac42d01e51 100644\n--- a/arch/powerpc/configs/maple_defconfig\n+++ b/arch/powerpc/configs/maple_defconfig\n@@ -24,6 +24,7 @@ CONFIG_MAC_PARTITION=y\n # CONFIG_PPC_PMAC is not set\n CONFIG_PPC_MAPLE=y\n CONFIG_UDBG_RTAS_CONSOLE=y\n+CONFIG_GEN_RTC=y\n CONFIG_KEXEC=y\n CONFIG_IRQ_ALL_CPUS=y\n CONFIG_PCI_MSI=y\n@@ -63,7 +64,6 @@ CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n CONFIG_HVC_RTAS=y\n # CONFIG_HW_RANDOM is not set\n-CONFIG_GEN_RTC=y\n CONFIG_I2C=y\n CONFIG_I2C_CHARDEV=y\n CONFIG_I2C_AMD8111=y\n@@ -100,8 +100,8 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49W=y\n CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y\n CONFIG_USB_SERIAL_TI=m\n CONFIG_EXT2_FS=y\n-CONFIG_FS_DAX=y\n CONFIG_EXT4_FS=y\n+CONFIG_FS_DAX=y\n CONFIG_MSDOS_FS=y\n CONFIG_VFAT_FS=y\n CONFIG_PROC_KCORE=y\ndiff --git a/arch/powerpc/configs/mpc512x_defconfig b/arch/powerpc/configs/mpc512x_defconfig\nindex 0b4854cf26cb..1a87eace0b6b 100644\n--- a/arch/powerpc/configs/mpc512x_defconfig\n+++ b/arch/powerpc/configs/mpc512x_defconfig\n@@ -12,6 +12,7 @@ CONFIG_PARTITION_ADVANCED=y\n # CONFIG_IOSCHED_CFQ is not set\n # CONFIG_PPC_CHRP is not set\n CONFIG_PPC_MPC512x=y\n+CONFIG_MPC512x_LPBFIFO=y\n CONFIG_MPC5121_ADS=y\n CONFIG_MPC512x_GENERIC=y\n CONFIG_PDM360NG=y\n@@ -61,21 +62,21 @@ CONFIG_BLK_DEV_SD=y\n CONFIG_CHR_DEV_SG=y\n CONFIG_NETDEVICES=y\n CONFIG_FS_ENET=y\n-CONFIG_MARVELL_PHY=y\n-CONFIG_DAVICOM_PHY=y\n-CONFIG_QSEMI_PHY=y\n-CONFIG_LXT_PHY=y\n-CONFIG_CICADA_PHY=y\n-CONFIG_VITESSE_PHY=y\n-CONFIG_SMSC_PHY=y\n+CONFIG_MDIO_BITBANG=y\n CONFIG_BROADCOM_PHY=y\n+CONFIG_CICADA_PHY=y\n+CONFIG_DAVICOM_PHY=y\n CONFIG_ICPLUS_PHY=y\n-CONFIG_REALTEK_PHY=y\n+CONFIG_LSI_ET1011C_PHY=y\n+CONFIG_LXT_PHY=y\n+CONFIG_MARVELL_PHY=y\n CONFIG_NATIONAL_PHY=y\n+CONFIG_QSEMI_PHY=y\n+CONFIG_REALTEK_PHY=y\n+CONFIG_SMSC_PHY=y\n CONFIG_STE10XP=y\n-CONFIG_LSI_ET1011C_PHY=y\n+CONFIG_VITESSE_PHY=y\n CONFIG_FIXED_PHY=y\n-CONFIG_MDIO_BITBANG=y\n # CONFIG_WLAN is not set\n # CONFIG_INPUT_MOUSEDEV_PSAUX is not set\n CONFIG_INPUT_EVDEV=y\n@@ -111,10 +112,9 @@ CONFIG_RTC_DRV_M41T80=y\n CONFIG_RTC_DRV_MPC5121=y\n CONFIG_DMADEVICES=y\n CONFIG_MPC512X_DMA=y\n-CONFIG_MPC512x_LPBFIFO=y\n-CONFIG_FS_DAX=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT4_FS=y\n+CONFIG_FS_DAX=y\n # CONFIG_DNOTIFY is not set\n CONFIG_VFAT_FS=y\n CONFIG_TMPFS=y\ndiff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig\nindex d933326b4cf9..d157e1364c0f 100644\n--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig\n+++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig\n@@ -11,6 +11,7 @@ CONFIG_PARTITION_ADVANCED=y\n # CONFIG_PPC_PMAC is not set\n CONFIG_EMBEDDED6xx=y\n CONFIG_MPC7448HPC2=y\n+CONFIG_GEN_RTC=y\n CONFIG_BINFMT_MISC=y\n # CONFIG_SECCOMP is not set\n CONFIG_NET=y\n@@ -46,7 +47,6 @@ CONFIG_PHYLIB=y\n CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n # CONFIG_HW_RANDOM is not set\n-CONFIG_GEN_RTC=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT4_FS=y\n CONFIG_PROC_KCORE=y\ndiff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig\nindex 6574477fd726..d74b124e7b8c 100644\n--- a/arch/powerpc/configs/mpc83xx_defconfig\n+++ b/arch/powerpc/configs/mpc83xx_defconfig\n@@ -21,7 +21,6 @@ CONFIG_MPC837x_MDS=y\n CONFIG_MPC837x_RDB=y\n CONFIG_SBC834x=y\n CONFIG_ASP834x=y\n-CONFIG_QUICC_ENGINE=y\n CONFIG_QE_GPIO=y\n CONFIG_MATH_EMULATION=y\n CONFIG_PCI=y\n@@ -60,10 +59,10 @@ CONFIG_SATA_SIL=y\n CONFIG_NETDEVICES=y\n CONFIG_UCC_GETH=y\n CONFIG_GIANFAR=y\n-CONFIG_MARVELL_PHY=y\n CONFIG_DAVICOM_PHY=y\n-CONFIG_VITESSE_PHY=y\n CONFIG_ICPLUS_PHY=y\n+CONFIG_MARVELL_PHY=y\n+CONFIG_VITESSE_PHY=y\n CONFIG_FIXED_PHY=y\n CONFIG_INPUT_FF_MEMLESS=m\n # CONFIG_INPUT_MOUSEDEV is not set\n@@ -99,6 +98,7 @@ CONFIG_USB_EHCI_FSL=y\n CONFIG_RTC_CLASS=y\n CONFIG_RTC_DRV_DS1307=y\n CONFIG_RTC_DRV_DS1374=y\n+CONFIG_QUICC_ENGINE=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT4_FS=y\n CONFIG_PROC_KCORE=y\ndiff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig\nindex 998454471a48..849ec55eb483 100644\n--- a/arch/powerpc/configs/mpc866_ads_defconfig\n+++ b/arch/powerpc/configs/mpc866_ads_defconfig\n@@ -14,6 +14,7 @@ CONFIG_PARTITION_ADVANCED=y\n CONFIG_MPC86XADS=y\n CONFIG_8xx_COPYBACK=y\n CONFIG_8xx_CPU6=y\n+CONFIG_GEN_RTC=y\n CONFIG_HZ_1000=y\n CONFIG_MATH_EMULATION=y\n # CONFIG_SECCOMP is not set\n@@ -33,7 +34,6 @@ CONFIG_FIXED_PHY=y\n # CONFIG_LEGACY_PTYS is not set\n CONFIG_SERIAL_CPM=y\n CONFIG_SERIAL_CPM_CONSOLE=y\n-CONFIG_GEN_RTC=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT2_FS_XATTR=y\n CONFIG_EXT4_FS=y\ndiff --git a/arch/powerpc/configs/mpc86xx_basic_defconfig b/arch/powerpc/configs/mpc86xx_basic_defconfig\nindex 3283f0586e11..67bd1fa036ee 100644\n--- a/arch/powerpc/configs/mpc86xx_basic_defconfig\n+++ b/arch/powerpc/configs/mpc86xx_basic_defconfig\n@@ -1,11 +1,11 @@\n-CONFIG_HIGHMEM=y\n-CONFIG_KEXEC=y\n CONFIG_PPC_86xx=y\n-CONFIG_PROC_KCORE=y\n+CONFIG_MPC8641_HPCN=y\n+CONFIG_SBC8641D=y\n+CONFIG_MPC8610_HPCD=y\n CONFIG_GEF_PPC9A=y\n CONFIG_GEF_SBC310=y\n CONFIG_GEF_SBC610=y\n-CONFIG_MPC8610_HPCD=y\n-CONFIG_MPC8641_HPCN=y\n-CONFIG_SBC8641D=y\n CONFIG_MVME7100=y\n+CONFIG_HIGHMEM=y\n+CONFIG_KEXEC=y\n+CONFIG_PROC_KCORE=y\ndiff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig\nindex 91f53f1bec5d..ec3fcc2bf737 100644\n--- a/arch/powerpc/configs/mpc885_ads_defconfig\n+++ b/arch/powerpc/configs/mpc885_ads_defconfig\n@@ -13,6 +13,7 @@ CONFIG_EXPERT=y\n CONFIG_PARTITION_ADVANCED=y\n # CONFIG_IOSCHED_CFQ is not set\n CONFIG_8xx_COPYBACK=y\n+CONFIG_GEN_RTC=y\n CONFIG_HZ_100=y\n # CONFIG_SECCOMP is not set\n CONFIG_NET=y\n@@ -51,7 +52,6 @@ CONFIG_DAVICOM_PHY=y\n # CONFIG_LEGACY_PTYS is not set\n CONFIG_SERIAL_CPM=y\n CONFIG_SERIAL_CPM_CONSOLE=y\n-CONFIG_GEN_RTC=y\n # CONFIG_HWMON is not set\n # CONFIG_USB_SUPPORT is not set\n # CONFIG_DNOTIFY is not set\ndiff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig\nindex fc1e7a7388b8..5acfb4fcc72b 100644\n--- a/arch/powerpc/configs/pmac32_defconfig\n+++ b/arch/powerpc/configs/pmac32_defconfig\n@@ -21,6 +21,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y\n CONFIG_CPU_FREQ_GOV_USERSPACE=y\n CONFIG_CPU_FREQ_PMAC=y\n CONFIG_PPC601_SYNC_FIX=y\n+CONFIG_GEN_RTC=y\n CONFIG_HIGHMEM=y\n CONFIG_BINFMT_MISC=m\n CONFIG_HIBERNATION=y\n@@ -179,10 +180,10 @@ CONFIG_PPP_ASYNC=y\n CONFIG_PPP_SYNC_TTY=m\n CONFIG_USB_USBNET=m\n # CONFIG_USB_NET_CDC_SUBSET is not set\n-CONFIG_PRISM54=m\n CONFIG_B43=m\n CONFIG_B43LEGACY=m\n CONFIG_P54_COMMON=m\n+CONFIG_PRISM54=m\n CONFIG_INPUT_EVDEV=y\n # CONFIG_KEYBOARD_ATKBD is not set\n # CONFIG_MOUSE_PS2 is not set\n@@ -193,7 +194,6 @@ CONFIG_SERIAL_8250=m\n CONFIG_SERIAL_PMACZILOG=m\n CONFIG_SERIAL_PMACZILOG_TTYS=y\n CONFIG_NVRAM=y\n-CONFIG_GEN_RTC=y\n CONFIG_I2C_CHARDEV=m\n CONFIG_APM_POWER=y\n CONFIG_BATTERY_PMU=y\ndiff --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/powernv_defconfig\nindex 34fc9bbfca9e..7a798e05d1ff 100644\n--- a/arch/powerpc/configs/powernv_defconfig\n+++ b/arch/powerpc/configs/powernv_defconfig\n@@ -26,8 +26,8 @@ CONFIG_CGROUP_FREEZER=y\n CONFIG_CPUSETS=y\n CONFIG_CGROUP_DEVICE=y\n CONFIG_CGROUP_CPUACCT=y\n-CONFIG_CGROUP_BPF=y\n CONFIG_CGROUP_PERF=y\n+CONFIG_CGROUP_BPF=y\n CONFIG_USER_NS=y\n CONFIG_BLK_DEV_INITRD=y\n CONFIG_BPF_SYSCALL=y\n@@ -158,7 +158,6 @@ CONFIG_NETCONSOLE=y\n CONFIG_TUN=m\n CONFIG_VETH=m\n CONFIG_VIRTIO_NET=m\n-CONFIG_VHOST_NET=m\n CONFIG_VORTEX=m\n CONFIG_ACENIC=m\n CONFIG_ACENIC_OMIT_TIGON_I=y\n@@ -310,6 +309,7 @@ CONFIG_CRYPTO_HMAC=y\n CONFIG_CRYPTO_CRC32C_VPMSUM=m\n CONFIG_CRYPTO_MD5_PPC=m\n CONFIG_CRYPTO_MICHAEL_MIC=m\n+CONFIG_CRYPTO_SHA1_PPC=m\n CONFIG_CRYPTO_SHA256=y\n CONFIG_CRYPTO_TGR192=m\n CONFIG_CRYPTO_WP512=m\n@@ -318,7 +318,6 @@ CONFIG_CRYPTO_BLOWFISH=m\n CONFIG_CRYPTO_CAST6=m\n CONFIG_CRYPTO_KHAZAD=m\n CONFIG_CRYPTO_SALSA20=m\n-CONFIG_CRYPTO_SHA1_PPC=m\n CONFIG_CRYPTO_SERPENT=m\n CONFIG_CRYPTO_TEA=m\n CONFIG_CRYPTO_TWOFISH=m\n@@ -329,3 +328,4 @@ CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m\n CONFIG_VIRTUALIZATION=y\n CONFIG_KVM_BOOK3S_64=m\n CONFIG_KVM_BOOK3S_64_HV=m\n+CONFIG_VHOST_NET=m\ndiff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig\nindex 370c0bbcff71..4ac2de467f1a 100644\n--- a/arch/powerpc/configs/ppc40x_defconfig\n+++ b/arch/powerpc/configs/ppc40x_defconfig\n@@ -51,9 +51,9 @@ CONFIG_SERIAL_8250=y\n CONFIG_SERIAL_8250_CONSOLE=y\n CONFIG_SERIAL_8250_EXTENDED=y\n CONFIG_SERIAL_8250_SHARE_IRQ=y\n+CONFIG_SERIAL_OF_PLATFORM=y\n CONFIG_SERIAL_UARTLITE=y\n CONFIG_SERIAL_UARTLITE_CONSOLE=y\n-CONFIG_SERIAL_OF_PLATFORM=y\n # CONFIG_HW_RANDOM is not set\n CONFIG_XILINX_HWICAP=m\n CONFIG_I2C=m\ndiff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig\nindex 2766e8f590bc..b6bb0066f3ed 100644\n--- a/arch/powerpc/configs/ppc44x_defconfig\n+++ b/arch/powerpc/configs/ppc44x_defconfig\n@@ -68,9 +68,9 @@ CONFIG_SERIAL_8250_CONSOLE=y\n # CONFIG_SERIAL_8250_PCI is not set\n CONFIG_SERIAL_8250_EXTENDED=y\n CONFIG_SERIAL_8250_SHARE_IRQ=y\n+CONFIG_SERIAL_OF_PLATFORM=y\n CONFIG_SERIAL_UARTLITE=y\n CONFIG_SERIAL_UARTLITE_CONSOLE=y\n-CONFIG_SERIAL_OF_PLATFORM=y\n # CONFIG_HW_RANDOM is not set\n CONFIG_XILINX_HWICAP=m\n CONFIG_I2C=m\ndiff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig\nindex c5246d29f385..6526f508a346 100644\n--- a/arch/powerpc/configs/ppc64_defconfig\n+++ b/arch/powerpc/configs/ppc64_defconfig\n@@ -28,9 +28,10 @@ CONFIG_MODVERSIONS=y\n CONFIG_MODULE_SRCVERSION_ALL=y\n CONFIG_PARTITION_ADVANCED=y\n CONFIG_PPC_SPLPAR=y\n+CONFIG_DTL=y\n CONFIG_SCANLOG=m\n CONFIG_PPC_SMLPAR=y\n-CONFIG_DTL=y\n+CONFIG_IBMEBUS=y\n CONFIG_PPC_MAPLE=y\n CONFIG_PPC_PASEMI=y\n CONFIG_PPC_PASEMI_IOMMU=y\n@@ -41,9 +42,8 @@ CONFIG_PS3_FLASH=m\n CONFIG_PS3_LPM=m\n CONFIG_PPC_IBM_CELL_BLADE=y\n CONFIG_RTAS_FLASH=m\n-CONFIG_IBMEBUS=y\n-CONFIG_CPU_FREQ_PMAC64=y\n CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y\n+CONFIG_CPU_FREQ_PMAC64=y\n CONFIG_HZ_100=y\n CONFIG_BINFMT_MISC=m\n CONFIG_PPC_TRANSACTIONAL_MEM=y\n@@ -54,11 +54,11 @@ CONFIG_IRQ_ALL_CPUS=y\n CONFIG_MEMORY_HOTREMOVE=y\n CONFIG_KSM=y\n CONFIG_SCHED_SMT=y\n-CONFIG_PCCARD=y\n-CONFIG_ELECTRA_CF=y\n CONFIG_HOTPLUG_PCI=y\n CONFIG_HOTPLUG_PCI_RPA=m\n CONFIG_HOTPLUG_PCI_RPA_DLPAR=m\n+CONFIG_PCCARD=y\n+CONFIG_ELECTRA_CF=y\n CONFIG_NET=y\n CONFIG_PACKET=y\n CONFIG_UNIX=y\n@@ -154,7 +154,6 @@ CONFIG_DUMMY=m\n CONFIG_NETCONSOLE=y\n CONFIG_TUN=m\n CONFIG_VIRTIO_NET=m\n-CONFIG_VHOST_NET=m\n CONFIG_VORTEX=m\n CONFIG_ACENIC=m\n CONFIG_ACENIC_OMIT_TIGON_I=y\n@@ -181,8 +180,8 @@ CONFIG_SUNGEM=y\n CONFIG_GELIC_NET=m\n CONFIG_GELIC_WIRELESS=y\n CONFIG_SPIDER_NET=m\n-CONFIG_MARVELL_PHY=y\n CONFIG_BROADCOM_PHY=m\n+CONFIG_MARVELL_PHY=y\n CONFIG_PPP=m\n CONFIG_PPP_BSDCOMP=m\n CONFIG_PPP_DEFLATE=m\n@@ -250,6 +249,9 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_OHCI_HCD=y\n CONFIG_USB_STORAGE=m\n CONFIG_USB_APPLEDISPLAY=m\n+CONFIG_NEW_LEDS=y\n+CONFIG_LEDS_CLASS=m\n+CONFIG_LEDS_POWERNV=m\n CONFIG_INFINIBAND=m\n CONFIG_INFINIBAND_USER_MAD=m\n CONFIG_INFINIBAND_USER_ACCESS=m\n@@ -267,7 +269,6 @@ CONFIG_RTC_CLASS=y\n CONFIG_RTC_DRV_DS1307=y\n CONFIG_VIRTIO_PCI=m\n CONFIG_VIRTIO_BALLOON=m\n-CONFIG_FS_DAX=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT2_FS_XATTR=y\n CONFIG_EXT2_FS_POSIX_ACL=y\n@@ -287,6 +288,7 @@ CONFIG_XFS_POSIX_ACL=y\n CONFIG_BTRFS_FS=m\n CONFIG_BTRFS_FS_POSIX_ACL=y\n CONFIG_NILFS2_FS=m\n+CONFIG_FS_DAX=y\n CONFIG_AUTOFS4_FS=m\n CONFIG_FUSE_FS=m\n CONFIG_OVERLAY_FS=m\n@@ -343,6 +345,7 @@ CONFIG_CRYPTO_HMAC=y\n CONFIG_CRYPTO_CRC32C_VPMSUM=m\n CONFIG_CRYPTO_MD5_PPC=m\n CONFIG_CRYPTO_MICHAEL_MIC=m\n+CONFIG_CRYPTO_SHA1_PPC=m\n CONFIG_CRYPTO_SHA256=y\n CONFIG_CRYPTO_TGR192=m\n CONFIG_CRYPTO_WP512=m\n@@ -351,7 +354,6 @@ CONFIG_CRYPTO_BLOWFISH=m\n CONFIG_CRYPTO_CAST6=m\n CONFIG_CRYPTO_KHAZAD=m\n CONFIG_CRYPTO_SALSA20=m\n-CONFIG_CRYPTO_SHA1_PPC=m\n CONFIG_CRYPTO_SERPENT=m\n CONFIG_CRYPTO_TEA=m\n CONFIG_CRYPTO_TWOFISH=m\n@@ -364,6 +366,4 @@ CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m\n CONFIG_VIRTUALIZATION=y\n CONFIG_KVM_BOOK3S_64=m\n CONFIG_KVM_BOOK3S_64_HV=m\n-CONFIG_NEW_LEDS=y\n-CONFIG_LEDS_CLASS=m\n-CONFIG_LEDS_POWERNV=m\n+CONFIG_VHOST_NET=m\ndiff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig\nindex 6340e6c53c54..52aaccd5f57b 100644\n--- a/arch/powerpc/configs/ppc64e_defconfig\n+++ b/arch/powerpc/configs/ppc64e_defconfig\n@@ -30,8 +30,8 @@ CONFIG_BINFMT_MISC=m\n CONFIG_IRQ_ALL_CPUS=y\n CONFIG_SPARSEMEM_MANUAL=y\n CONFIG_PCI_MSI=y\n-CONFIG_PCCARD=y\n CONFIG_HOTPLUG_PCI=y\n+CONFIG_PCCARD=y\n CONFIG_NET=y\n CONFIG_PACKET=y\n CONFIG_UNIX=y\n@@ -108,8 +108,8 @@ CONFIG_E100=y\n CONFIG_E1000=y\n CONFIG_IXGB=m\n CONFIG_SUNGEM=y\n-CONFIG_MARVELL_PHY=y\n CONFIG_BROADCOM_PHY=m\n+CONFIG_MARVELL_PHY=y\n CONFIG_PPP=m\n CONFIG_PPP_BSDCOMP=m\n CONFIG_PPP_DEFLATE=m\n@@ -175,7 +175,6 @@ CONFIG_INFINIBAND_ISER=m\n CONFIG_EDAC=y\n CONFIG_RTC_CLASS=y\n CONFIG_RTC_DRV_DS1307=y\n-CONFIG_FS_DAX=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT2_FS_XATTR=y\n CONFIG_EXT2_FS_POSIX_ACL=y\n@@ -192,6 +191,7 @@ CONFIG_JFS_POSIX_ACL=y\n CONFIG_JFS_SECURITY=y\n CONFIG_XFS_FS=m\n CONFIG_XFS_POSIX_ACL=y\n+CONFIG_FS_DAX=y\n CONFIG_AUTOFS4_FS=m\n CONFIG_ISO9660_FS=y\n CONFIG_UDF_FS=m\ndiff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig\nindex 18d0d60dadbf..c5515204660a 100644\n--- a/arch/powerpc/configs/ppc6xx_defconfig\n+++ b/arch/powerpc/configs/ppc6xx_defconfig\n@@ -11,10 +11,10 @@ CONFIG_TASK_DELAY_ACCT=y\n CONFIG_TASK_XACCT=y\n CONFIG_TASK_IO_ACCOUNTING=y\n CONFIG_CGROUPS=y\n-CONFIG_CGROUP_DEVICE=y\n-CONFIG_CGROUP_CPUACCT=y\n CONFIG_CGROUP_SCHED=y\n CONFIG_RT_GROUP_SCHED=y\n+CONFIG_CGROUP_DEVICE=y\n+CONFIG_CGROUP_CPUACCT=y\n CONFIG_USER_NS=y\n CONFIG_BLK_DEV_INITRD=y\n # CONFIG_COMPAT_BRK is not set\n@@ -70,7 +70,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m\n CONFIG_CPU_FREQ_PMAC=y\n CONFIG_TAU=y\n CONFIG_TAU_AVERAGE=y\n-CONFIG_QUICC_ENGINE=y\n CONFIG_QE_GPIO=y\n CONFIG_MCU_MPC8349EMITX=y\n CONFIG_HIGHMEM=y\n@@ -548,16 +547,16 @@ CONFIG_PCMCIA_XIRC2PS=m\n CONFIG_FDDI=y\n CONFIG_SKFP=m\n CONFIG_NET_SB1000=m\n-CONFIG_MARVELL_PHY=m\n-CONFIG_DAVICOM_PHY=m\n-CONFIG_QSEMI_PHY=m\n-CONFIG_LXT_PHY=m\n-CONFIG_CICADA_PHY=m\n-CONFIG_VITESSE_PHY=m\n-CONFIG_SMSC_PHY=m\n CONFIG_BROADCOM_PHY=m\n+CONFIG_CICADA_PHY=m\n+CONFIG_DAVICOM_PHY=m\n CONFIG_ICPLUS_PHY=m\n+CONFIG_LXT_PHY=m\n+CONFIG_MARVELL_PHY=m\n+CONFIG_QSEMI_PHY=m\n CONFIG_REALTEK_PHY=m\n+CONFIG_SMSC_PHY=m\n+CONFIG_VITESSE_PHY=m\n CONFIG_PLIP=m\n CONFIG_PPP_DEFLATE=m\n CONFIG_PPP_FILTER=y\n@@ -657,13 +656,13 @@ CONFIG_SERIAL_8250_MANY_PORTS=y\n CONFIG_SERIAL_8250_SHARE_IRQ=y\n CONFIG_SERIAL_8250_DETECT_IRQ=y\n CONFIG_SERIAL_8250_RSA=y\n+CONFIG_SERIAL_OF_PLATFORM=y\n CONFIG_SERIAL_UARTLITE=m\n CONFIG_SERIAL_PMACZILOG=m\n CONFIG_SERIAL_MPC52xx=y\n CONFIG_SERIAL_MPC52xx_CONSOLE=y\n CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200\n CONFIG_SERIAL_JSM=m\n-CONFIG_SERIAL_OF_PLATFORM=y\n CONFIG_PRINTER=m\n CONFIG_LP_CONSOLE=y\n CONFIG_PPDEV=m\n@@ -1020,7 +1019,7 @@ CONFIG_UIO_CIF=m\n CONFIG_UIO_PDRV_GENIRQ=m\n CONFIG_VIRTIO_PCI=m\n CONFIG_VIRTIO_BALLOON=m\n-CONFIG_FS_DAX=y\n+CONFIG_QUICC_ENGINE=y\n CONFIG_EXT2_FS=m\n CONFIG_EXT2_FS_XATTR=y\n CONFIG_EXT2_FS_POSIX_ACL=y\n@@ -1042,6 +1041,7 @@ CONFIG_XFS_FS=m\n CONFIG_XFS_QUOTA=y\n CONFIG_XFS_POSIX_ACL=y\n CONFIG_GFS2_FS=m\n+CONFIG_FS_DAX=y\n CONFIG_QUOTA_NETLINK_INTERFACE=y\n CONFIG_AUTOFS4_FS=m\n CONFIG_FUSE_FS=m\ndiff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig\nindex fd5d98a0b95c..36593dc245bd 100644\n--- a/arch/powerpc/configs/pseries_defconfig\n+++ b/arch/powerpc/configs/pseries_defconfig\n@@ -20,15 +20,15 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=13\n CONFIG_NUMA_BALANCING=y\n CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y\n CONFIG_CGROUPS=y\n+CONFIG_MEMCG=y\n+CONFIG_MEMCG_SWAP=y\n+CONFIG_CGROUP_SCHED=y\n CONFIG_CGROUP_FREEZER=y\n-CONFIG_CGROUP_DEVICE=y\n CONFIG_CPUSETS=y\n+CONFIG_CGROUP_DEVICE=y\n CONFIG_CGROUP_CPUACCT=y\n-CONFIG_CGROUP_BPF=y\n-CONFIG_MEMCG=y\n-CONFIG_MEMCG_SWAP=y\n CONFIG_CGROUP_PERF=y\n-CONFIG_CGROUP_SCHED=y\n+CONFIG_CGROUP_BPF=y\n CONFIG_USER_NS=y\n CONFIG_BLK_DEV_INITRD=y\n CONFIG_BPF_SYSCALL=y\n@@ -43,12 +43,12 @@ CONFIG_MODVERSIONS=y\n CONFIG_MODULE_SRCVERSION_ALL=y\n CONFIG_PARTITION_ADVANCED=y\n CONFIG_PPC_SPLPAR=y\n+CONFIG_DTL=y\n CONFIG_SCANLOG=m\n CONFIG_PPC_SMLPAR=y\n-CONFIG_DTL=y\n+CONFIG_IBMEBUS=y\n # CONFIG_PPC_PMAC is not set\n CONFIG_RTAS_FLASH=m\n-CONFIG_IBMEBUS=y\n CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y\n CONFIG_HZ_100=y\n CONFIG_BINFMT_MISC=m\n@@ -155,7 +155,6 @@ CONFIG_NETCONSOLE=y\n CONFIG_TUN=m\n CONFIG_VETH=m\n CONFIG_VIRTIO_NET=m\n-CONFIG_VHOST_NET=m\n CONFIG_VORTEX=m\n CONFIG_ACENIC=m\n CONFIG_ACENIC_OMIT_TIGON_I=y\n@@ -198,8 +197,6 @@ CONFIG_HVC_RTAS=y\n CONFIG_HVCS=m\n CONFIG_VIRTIO_CONSOLE=m\n CONFIG_IBM_BSR=m\n-CONFIG_RTC_CLASS=y\n-CONFIG_RTC_DRV_GENERIC=y\n CONFIG_RAW_DRIVER=y\n CONFIG_MAX_RAW_DEVS=1024\n CONFIG_FB=y\n@@ -227,6 +224,9 @@ CONFIG_USB_EHCI_HCD=y\n # CONFIG_USB_EHCI_HCD_PPC_OF is not set\n CONFIG_USB_OHCI_HCD=y\n CONFIG_USB_STORAGE=m\n+CONFIG_NEW_LEDS=y\n+CONFIG_LEDS_CLASS=m\n+CONFIG_LEDS_POWERNV=m\n CONFIG_INFINIBAND=m\n CONFIG_INFINIBAND_USER_MAD=m\n CONFIG_INFINIBAND_USER_ACCESS=m\n@@ -238,9 +238,10 @@ CONFIG_INFINIBAND_IPOIB=m\n CONFIG_INFINIBAND_IPOIB_CM=y\n CONFIG_INFINIBAND_SRP=m\n CONFIG_INFINIBAND_ISER=m\n+CONFIG_RTC_CLASS=y\n+CONFIG_RTC_DRV_GENERIC=y\n CONFIG_VIRTIO_PCI=m\n CONFIG_VIRTIO_BALLOON=m\n-CONFIG_FS_DAX=y\n CONFIG_EXT2_FS=y\n CONFIG_EXT2_FS_XATTR=y\n CONFIG_EXT2_FS_POSIX_ACL=y\n@@ -256,6 +257,7 @@ CONFIG_XFS_POSIX_ACL=y\n CONFIG_BTRFS_FS=m\n CONFIG_BTRFS_FS_POSIX_ACL=y\n CONFIG_NILFS2_FS=m\n+CONFIG_FS_DAX=y\n CONFIG_AUTOFS4_FS=m\n CONFIG_FUSE_FS=m\n CONFIG_OVERLAY_FS=m\n@@ -307,6 +309,7 @@ CONFIG_CRYPTO_HMAC=y\n CONFIG_CRYPTO_CRC32C_VPMSUM=m\n CONFIG_CRYPTO_MD5_PPC=m\n CONFIG_CRYPTO_MICHAEL_MIC=m\n+CONFIG_CRYPTO_SHA1_PPC=m\n CONFIG_CRYPTO_SHA256=y\n CONFIG_CRYPTO_TGR192=m\n CONFIG_CRYPTO_WP512=m\n@@ -315,7 +318,6 @@ CONFIG_CRYPTO_BLOWFISH=m\n CONFIG_CRYPTO_CAST6=m\n CONFIG_CRYPTO_KHAZAD=m\n CONFIG_CRYPTO_SALSA20=m\n-CONFIG_CRYPTO_SHA1_PPC=m\n CONFIG_CRYPTO_SERPENT=m\n CONFIG_CRYPTO_TEA=m\n CONFIG_CRYPTO_TWOFISH=m\n@@ -328,6 +330,4 @@ CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m\n CONFIG_VIRTUALIZATION=y\n CONFIG_KVM_BOOK3S_64=m\n CONFIG_KVM_BOOK3S_64_HV=m\n-CONFIG_NEW_LEDS=y\n-CONFIG_LEDS_CLASS=m\n-CONFIG_LEDS_POWERNV=m\n+CONFIG_VHOST_NET=m\ndiff --git a/arch/powerpc/configs/tqm8xx_defconfig b/arch/powerpc/configs/tqm8xx_defconfig\nindex 78fddf24b5d3..0397b9f3c384 100644\n--- a/arch/powerpc/configs/tqm8xx_defconfig\n+++ b/arch/powerpc/configs/tqm8xx_defconfig\n@@ -18,6 +18,7 @@ CONFIG_PARTITION_ADVANCED=y\n CONFIG_TQM8XX=y\n CONFIG_8xx_COPYBACK=y\n # CONFIG_8xx_CPU15 is not set\n+CONFIG_GEN_RTC=y\n CONFIG_HZ_100=y\n # CONFIG_SECCOMP is not set\n CONFIG_NET=y\n@@ -53,7 +54,6 @@ CONFIG_FIXED_PHY=y\n CONFIG_SERIAL_CPM=y\n CONFIG_SERIAL_CPM_CONSOLE=y\n CONFIG_HW_RANDOM=y\n-CONFIG_GEN_RTC=y\n # CONFIG_HWMON is not set\n # CONFIG_USB_SUPPORT is not set\n # CONFIG_DNOTIFY is not set\n",
    "prefixes": [
        "01/46"
    ]
}