On Fri, Aug 16, 2013 at 04:15:45PM +0100, Peter Robinson wrote: > Hi All, > > I mentioned this at Flock but I didn't want to push it directly to > ensure it was correct (and I've never used git to email patches > before) so feedback and flames welcome, or let me know if you want me > to push it. I'll review first thing Monday morning. josh > > Peter > > On Fri, Aug 16, 2013 at 4:13 PM, Peter Robinson <pbrobinson@xxxxxxxxx> wrote: > > Merge config changes from the various arch configs into generic-config where there's overlapping identical configs across all architectures. If there's a single arch that is difference to the rest of the architectures that option remains in the arch specific config as it takes precedence over the generic config. > > --- > > config-arm-generic | 8 ++------ > > config-armv7 | 2 -- > > config-armv7-generic | 9 --------- > > config-armv7-lpae | 2 -- > > config-generic | 17 +++++++++++++++++ > > config-powerpc-generic | 14 -------------- > > config-powerpc32-generic | 6 ------ > > config-powerpc32-smp | 1 - > > config-powerpc64 | 9 --------- > > config-powerpc64p7 | 9 --------- > > config-s390x | 22 +--------------------- > > config-x86-32-generic | 2 -- > > config-x86-generic | 18 ------------------ > > kernel.spec | 3 +++ > > 14 files changed, 23 insertions(+), 99 deletions(-) > > > > diff --git a/config-arm-generic b/config-arm-generic > > index 3bda9fb..ba22d23 100644 > > --- a/config-arm-generic > > +++ b/config-arm-generic > > @@ -1,17 +1,12 @@ > > CONFIG_KUSER_HELPERS=y > > # CONFIG_ASYMMETRIC_KEY_TYPE is not set > > -# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set > > # CONFIG_COMMON_CLK_DEBUG is not set > > CONFIG_COMMON_CLK=y > > CONFIG_EARLY_PRINTK=y > > -CONFIG_ETHERNET=y > > CONFIG_FB_SSD1307=m > > -CONFIG_HIGH_RES_TIMERS=y > > CONFIG_HW_PERF_EVENTS=y > > CONFIG_MMC=y > > CONFIG_NFS_FS=y > > -CONFIG_NO_HZ=y > > -CONFIG_PERF_EVENTS=y > > # CONFIG_PID_IN_CONTEXTIDR is not set > > CONFIG_PWM=y > > CONFIG_RCU_FANOUT_LEAF=16 > > @@ -23,13 +18,14 @@ CONFIG_ARM_ARCH_TIMER=y > > # CONFIG_ARM_DT_BL_CPUFREQ is not set > > CONFIG_NR_CPUS=8 > > > > -# ARM generic HW > > +# ARM AMBA generic HW > > CONFIG_ARM_AMBA=y > > CONFIG_ARM_GIC=y > > CONFIG_MMC_ARMMMCI=y > > CONFIG_SERIAL_AMBA_PL011_CONSOLE=y > > CONFIG_SERIAL_AMBA_PL011=y > > CONFIG_SERIO_AMBAKMI=y > > +CONFIG_OC_ETM=y > > > > # ARM VExpress > > CONFIG_ARCH_VEXPRESS=y > > diff --git a/config-armv7 b/config-armv7 > > index 1140228..fed6bdb 100644 > > --- a/config-armv7 > > +++ b/config-armv7 > > @@ -638,8 +638,6 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 > > # CONFIG_PMIC_ADP5520 is not set > > # CONFIG_REGULATOR_LP3972 is not set > > # CONFIG_REGULATOR_LP872X is not set > > -# CONFIG_SGI_IOC4 is not set > > -# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set > > > > # CONFIG_DVB_USB_PCTV452E is not set > > # We need to fix these as they should be either generic includes or kconfig fixes > > diff --git a/config-armv7-generic b/config-armv7-generic > > index 72ae5b2..99c81a7 100644 > > --- a/config-armv7-generic > > +++ b/config-armv7-generic > > @@ -95,7 +95,6 @@ CONFIG_PJ4B_ERRATA_4742=y > > # CONFIG_ARM_ERRATA_798181 is not set > > > > # generic that deviates from or should be merged into config-generic > > -CONFIG_SMP=y > > CONFIG_SMP_ON_UP=y > > CONFIG_HIGHMEM=y > > CONFIG_CC_OPTIMIZE_FOR_SIZE=y > > @@ -116,16 +115,8 @@ CONFIG_RCU_FANOUT=32 > > CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 > > CONFIG_LSM_MMAP_MIN_ADDR=32768 > > > > -CONFIG_SECCOMP=y > > -CONFIG_STRICT_DEVMEM=y > > - > > CONFIG_XZ_DEC_ARM=y > > -CONFIG_OC_ETM=y > > > > -CONFIG_PM=y > > -CONFIG_PM_STD_PARTITION="" > > -# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set > > -CONFIG_SUSPEND=y > > CONFIG_ARM_CPU_SUSPEND=y > > > > CONFIG_LOCAL_TIMERS=y > > diff --git a/config-armv7-lpae b/config-armv7-lpae > > index 8fb5883..c9b2b2b 100644 > > --- a/config-armv7-lpae > > +++ b/config-armv7-lpae > > @@ -127,8 +127,6 @@ CONFIG_S3C_LOWLEVEL_UART_PORT=1 > > # CONFIG_EXYNOS4_SDHCI_CH0_8BIT is not set > > # CONFIG_EXYNOS4_SDHCI_CH2_8BIT is not set > > > > -# CONFIG_SGI_IOC4 is not set > > -# > > # CONFIG_S3C_BOOT_ERROR_RESET is not set > > # CONFIG_S3C_BOOT_UART_FORCE_FIFO is not set > > # CONFIG_I2C_S3C2410 is not set > > diff --git a/config-generic b/config-generic > > index 786cd83..aa16131 100644 > > --- a/config-generic > > +++ b/config-generic > > @@ -103,6 +103,8 @@ CONFIG_PCIEAER_INJECT=m > > CONFIG_HOTPLUG_PCI_PCIE=y > > CONFIG_HOTPLUG_PCI_FAKE=m > > > > +# CONFIG_SGI_IOC4 is not set > > + > > # CONFIG_ISA is not set > > # CONFIG_SCx200 is not set > > > > @@ -304,6 +306,7 @@ CONFIG_BLK_CPQ_DA=m > > CONFIG_BLK_CPQ_CISS_DA=m > > CONFIG_CISS_SCSI_TAPE=y > > CONFIG_BLK_DEV_DAC960=m > > +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set > > CONFIG_BLK_DEV_DRBD=m > > CONFIG_BLK_DEV_UMEM=m > > CONFIG_BLK_DEV_LOOP=m > > @@ -1225,6 +1228,8 @@ CONFIG_L2TP_ETH=m > > CONFIG_RFKILL=m > > CONFIG_RFKILL_INPUT=y > > > > +CONFIG_ETHERNET=y > > + > > # > > # Ethernet (10 or 100Mbit) > > # > > @@ -4095,6 +4100,9 @@ CONFIG_AUDITSYSCALL=y > > # http://lists.fedoraproject.org/pipermail/kernel/2013-February/004125.html > > CONFIG_AUDIT_LOGINUID_IMMUTABLE=y > > > > +CONFIG_SECCOMP=y > > +CONFIG_STRICT_DEVMEM=y > > + > > # CONFIG_SSBI is not set > > > > # > > @@ -4281,6 +4289,8 @@ CONFIG_PROC_EVENTS=y > > > > CONFIG_IBMASR=m > > > > +CONFIG_PM=y > > +CONFIG_PM_STD_PARTITION="" > > CONFIG_PM_DEBUG=y > > CONFIG_PM_TRACE=y > > CONFIG_PM_TRACE_RTC=y > > @@ -4289,6 +4299,9 @@ CONFIG_PM_RUNTIME=y > > # CONFIG_PM_OPP is not set > > # CONFIG_PM_AUTOSLEEP is not set > > # CONFIG_PM_WAKELOCKS is not set > > +CONFIG_HIBERNATION=y > > +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set > > +CONFIG_SUSPEND=y > > > > CONFIG_CPU_FREQ=y > > CONFIG_CPU_FREQ_GOV_PERFORMANCE=y > > @@ -4431,8 +4444,12 @@ CONFIG_JUMP_LABEL=y > > CONFIG_OPTPROBES=y > > > > CONFIG_HZ_1000=y > > +CONFIG_NO_HZ=y > > > > CONFIG_TIMER_STATS=y > > +CONFIG_HIGH_RES_TIMERS=y > > +CONFIG_PERF_EVENTS=y > > +CONFIG_PERF_COUNTERS=y > > > > # Auxillary displays > > CONFIG_KS0108=m > > diff --git a/config-powerpc-generic b/config-powerpc-generic > > index 04af6af..2f26fb4 100644 > > --- a/config-powerpc-generic > > +++ b/config-powerpc-generic > > @@ -1,5 +1,4 @@ > > # Most PowerPC kernels we build are SMP > > -CONFIG_SMP=y > > CONFIG_IRQ_ALL_CPUS=y > > CONFIG_PPC=y > > CONFIG_WATCHDOG_RTAS=m > > @@ -11,14 +10,6 @@ CONFIG_TAU=y > > # CONFIG_TAU_INT is not set > > CONFIG_TAU_AVERAGE=y > > > > -CONFIG_SECCOMP=y > > - > > -CONFIG_PM=y > > -# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set > > -CONFIG_PM_STD_PARTITION="" > > - > > -CONFIG_SUSPEND=y > > -CONFIG_HIBERNATION=y > > # CONFIG_RTC is not set > > # CONFIG_GEN_RTC is not set > > # CONFIG_GEN_RTC_X is not set > > @@ -100,9 +91,6 @@ CONFIG_LEDS_TRIGGER_TIMER=m > > CONFIG_LEDS_TRIGGER_HEARTBEAT=m > > CONFIG_LEDS_TRIGGER_GPIO=m > > > > -# FIXME: Should depend on IA64/x86 > > -# CONFIG_SGI_IOC4 is not set > > - > > CONFIG_PPC_EFIKA=y > > CONFIG_PPC_MEDIA5200=y > > > > @@ -363,7 +351,6 @@ CONFIG_RFKILL_GPIO=m > > # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set > > # CONFIG_INPUT_GP2A is not set > > # CONFIG_INPUT_GPIO_TILT_POLLED is not set > > -CONFIG_STRICT_DEVMEM=y > > > > CONFIG_RCU_FANOUT_LEAF=16 > > > > @@ -371,7 +358,6 @@ CONFIG_RCU_FANOUT_LEAF=16 > > # CONFIG_MPIC_MSGR is not set > > # CONFIG_FA_DUMP is not set > > # CONFIG_MDIO_BUS_MUX_GPIO is not set > > -# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set > > > > # CONFIG_FAIL_IOMMU is not set > > # CONFIG_SPAPR_TCE_IOMMU is not set > > diff --git a/config-powerpc32-generic b/config-powerpc32-generic > > index 935aab4..61e3236 100644 > > --- a/config-powerpc32-generic > > +++ b/config-powerpc32-generic > > @@ -95,8 +95,6 @@ CONFIG_SERIAL_OF_PLATFORM=y > > CONFIG_DEBUG_STACKOVERFLOW=y > > > > # CONFIG_EMBEDDED6xx is not set > > -CONFIG_NO_HZ=y > > -CONFIG_HIGH_RES_TIMERS=y > > > > # CONFIG_BLK_DEV_PLATFORM is not set > > # CONFIG_BLK_DEV_4DRIVES is not set > > @@ -175,10 +173,6 @@ CONFIG_CRYPTO_DEV_TALITOS=m > > > > CONFIG_RCU_FANOUT=32 > > > > -CONFIG_PERF_COUNTERS=y > > -CONFIG_PERF_EVENTS=y > > -CONFIG_EVENT_PROFILE=y > > - > > CONFIG_KVM_BOOK3S_32=m > > > > # CONFIG_SCSI_QLA_ISCSI is not set > > diff --git a/config-powerpc32-smp b/config-powerpc32-smp > > index e60f59c..5dbe87f 100644 > > --- a/config-powerpc32-smp > > +++ b/config-powerpc32-smp > > @@ -1,4 +1,3 @@ > > -CONFIG_SMP=y > > # CONFIG_HOTPLUG_CPU is not set > > CONFIG_NR_CPUS=4 > > # CONFIG_BATTERY_PMU is not set > > diff --git a/config-powerpc64 b/config-powerpc64 > > index 34297ec..705a7ea 100644 > > --- a/config-powerpc64 > > +++ b/config-powerpc64 > > @@ -111,11 +111,7 @@ CONFIG_XMON_DISASSEMBLY=y > > > > CONFIG_SCSI_IBMVSCSIS=m > > > > -CONFIG_SECCOMP=y > > - > > # CONFIG_TUNE_CELL is not set > > -CONFIG_NO_HZ=y > > -CONFIG_HIGH_RES_TIMERS=y > > # CONFIG_BLK_DEV_PLATFORM is not set > > > > # CONFIG_VIRQ_DEBUG is not set > > @@ -138,10 +134,6 @@ CONFIG_RELOCATABLE=y > > > > CONFIG_RCU_FANOUT=64 > > > > -CONFIG_PERF_COUNTERS=y > > -CONFIG_PERF_EVENTS=y > > -CONFIG_EVENT_PROFILE=y > > - > > CONFIG_KVM_BOOK3S_64=m > > CONFIG_KVM_BOOK3S_64_HV=y > > # CONFIG_KVM_EXIT_TIMING is not set > > @@ -178,7 +170,6 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS=m > > CONFIG_BPF_JIT=y > > # CONFIG_PPC_ICSWX_PID is not set > > # CONFIG_PPC_ICSWX_USE_SIGILL is not set > > -# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set > > # CONFIG_PCIEPORTBUS is not set > > # CONFIG_PPC_TRANSACTIONAL_MEM is not set > > # CONFIG_SND_HDA_INTEL is not set > > diff --git a/config-powerpc64p7 b/config-powerpc64p7 > > index d22fbbf..7ab1918 100644 > > --- a/config-powerpc64p7 > > +++ b/config-powerpc64p7 > > @@ -102,11 +102,7 @@ CONFIG_XMON_DISASSEMBLY=y > > > > CONFIG_SCSI_IBMVSCSIS=m > > > > -CONFIG_SECCOMP=y > > - > > # CONFIG_TUNE_CELL is not set > > -CONFIG_NO_HZ=y > > -CONFIG_HIGH_RES_TIMERS=y > > # CONFIG_BLK_DEV_PLATFORM is not set > > > > # CONFIG_VIRQ_DEBUG is not set > > @@ -129,10 +125,6 @@ CONFIG_RELOCATABLE=y > > > > CONFIG_RCU_FANOUT=64 > > > > -CONFIG_PERF_COUNTERS=y > > -CONFIG_PERF_EVENTS=y > > -CONFIG_EVENT_PROFILE=y > > - > > CONFIG_KVM_BOOK3S_64=m > > CONFIG_KVM_BOOK3S_64_HV=y > > # CONFIG_KVM_EXIT_TIMING is not set > > @@ -169,7 +161,6 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS=m > > CONFIG_BPF_JIT=y > > # CONFIG_PPC_ICSWX_PID is not set > > # CONFIG_PPC_ICSWX_USE_SIGILL is not set > > -# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set > > # CONFIG_PCIEPORTBUS is not set > > # CONFIG_SND_HDA_INTEL is not set > > CONFIG_BLK_DEV_RSXX=m > > diff --git a/config-s390x b/config-s390x > > index 4cbd971..a292f42 100644 > > --- a/config-s390x > > +++ b/config-s390x > > @@ -13,13 +13,9 @@ CONFIG_HZ_100=y > > # See bug 496605 > > # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set > > > > -CONFIG_MMU=y > > - > > CONFIG_LOG_BUF_SHIFT=16 > > CONFIG_NO_IDLE_HZ=y > > > > -CONFIG_SMP=y > > - > > # > > # I/O subsystem configuration > > # > > @@ -190,8 +186,6 @@ CONFIG_S390_VMUR=m > > > > # CONFIG_THERMAL is not set > > > > -CONFIG_NO_HZ=y > > -CONFIG_HIGH_RES_TIMERS=y > > CONFIG_CTCM=m > > CONFIG_QETH_L2=m > > CONFIG_QETH_L3=m > > @@ -214,16 +208,7 @@ CONFIG_HVC_IUCV=y > > CONFIG_RCU_FANOUT=64 > > CONFIG_RCU_FANOUT_LEAF=16 > > > > -CONFIG_SECCOMP=y > > - > > -CONFIG_PM=y > > -CONFIG_HIBERNATION=y > > -CONFIG_PM_STD_PARTITION="/dev/jokes" > > -# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set > > - > > -CONFIG_PERF_COUNTERS=y > > -CONFIG_PERF_EVENTS=y > > -CONFIG_EVENT_PROFILE=y > > +# CONFIG_SUSPEND is not set > > > > CONFIG_SMSGIUCV_EVENT=m > > > > @@ -236,12 +221,9 @@ CONFIG_ZFCP_DIF=y > > CONFIG_SCHED_MC=y > > CONFIG_SCHED_BOOK=y > > > > -CONFIG_STRICT_DEVMEM=y > > - > > # CONFIG_WARN_DYNAMIC_STACK is not set > > > > CONFIG_CRYPTO_GHASH_S390=m > > -CONFIG_ETHERNET=y > > > > CONFIG_BPF_JIT=y > > # CONFIG_TRANSPARENT_HUGEPAGE is not set > > @@ -252,8 +234,6 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y > > # CONFIG_S390_PTDUMP is not set > > # CONFIG_ASYMMETRIC_KEY_TYPE is not set > > # CONFIG_PCI is not set > > -# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set > > -# CONFIG_SGI_IOC4 is not set > > # CONFIG_GPIO_GENERIC_PLATFORM is not set > > # CONFIG_GPIO_MCP23S08 is not set > > > > diff --git a/config-x86-32-generic b/config-x86-32-generic > > index 1b397d3..ebdb0f3 100644 > > --- a/config-x86-32-generic > > +++ b/config-x86-32-generic > > @@ -122,8 +122,6 @@ CONFIG_SND_ES18XX=m > > > > CONFIG_HW_RANDOM_GEODE=m > > > > -# CONFIG_SGI_IOC4 is not set > > - > > CONFIG_TC1100_WMI=m > > > > CONFIG_IB700_WDT=m > > diff --git a/config-x86-generic b/config-x86-generic > > index 088ae5a..de38746 100644 > > --- a/config-x86-generic > > +++ b/config-x86-generic > > @@ -2,8 +2,6 @@ CONFIG_UID16=y > > > > CONFIG_X86_EXTENDED_PLATFORM=y > > > > -CONFIG_SMP=y > > - > > CONFIG_X86_GENERIC=y > > > > CONFIG_HPET=y > > @@ -52,8 +50,6 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y > > # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set > > CONFIG_SCSI_ADVANSYS=m > > > > -CONFIG_SECCOMP=y > > - > > CONFIG_CAPI_EICON=y > > > > # > > @@ -117,10 +113,6 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m > > > > CONFIG_GENERIC_ISA_DMA=y > > > > -CONFIG_SUSPEND=y > > -CONFIG_HIBERNATION=y > > -CONFIG_PM_STD_PARTITION="" > > - > > CONFIG_PCI_MMCONFIG=y > > CONFIG_PCI_BIOS=y > > CONFIG_PCI_IOAPIC=y > > @@ -131,9 +123,6 @@ CONFIG_HOTPLUG_PCI_COMPAQ=m > > CONFIG_HOTPLUG_PCI_IBM=m > > # CONFIG_HOTPLUG_PCI_CPCI is not set > > > > -CONFIG_PM=y > > -# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set > > - > > CONFIG_IPW2100=m > > CONFIG_IPW2100_MONITOR=y > > CONFIG_IPW2200=m > > @@ -292,8 +281,6 @@ CONFIG_XEN_ACPI_PROCESSOR=m > > CONFIG_MTD_ESB2ROM=m > > CONFIG_MTD_CK804XROM=m > > > > -CONFIG_NO_HZ=y > > -CONFIG_HIGH_RES_TIMERS=y > > CONFIG_CPU_IDLE=y > > # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set > > # CONFIG_CPU_IDLE_GOV_LADDER is not set > > @@ -328,8 +315,6 @@ CONFIG_HP_WATCHDOG=m > > CONFIG_NV_TCO=m > > CONFIG_SP5100_TCO=m > > > > -CONFIG_STRICT_DEVMEM=y > > - > > # CONFIG_NO_BOOTMEM is not set > > > > # CONFIG_MEMTEST is not set > > @@ -352,9 +337,6 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y > > > > # CONFIG_IOMMU_STRESS is not set > > > > -CONFIG_PERF_COUNTERS=y > > -CONFIG_PERF_EVENTS=y > > - > > CONFIG_X86_MCE=y > > CONFIG_X86_MCE_INTEL=y > > CONFIG_X86_MCE_AMD=y > > diff --git a/kernel.spec b/kernel.spec > > index 0db387a..5d60e35 100644 > > --- a/kernel.spec > > +++ b/kernel.spec > > @@ -2253,6 +2253,9 @@ fi > > # ||----w | > > # || || > > %changelog > > +* Fri Aug 16 2013 Peter Robinson <pbrobinson@xxxxxxxxxxxxxxxxx> > > +- Minor kernel configs cleanup merging duplicated config opts into generic > > + > > * Thu Aug 15 2013 Peter Robinson <pbrobinson@xxxxxxxxxxxxxxxxx> > > - Major cleanup of arm64 config > > - Add patch to enable build exynos5 as multi platform for lpae > > -- > > 1.8.3.1 > > > _______________________________________________ > kernel mailing list > kernel@xxxxxxxxxxxxxxxxxxxxxxx > https://admin.fedoraproject.org/mailman/listinfo/kernel _______________________________________________ kernel mailing list kernel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/kernel
