diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-14 07:21:09 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-14 07:21:09 +0200 |
| commit | 47d7bcf939aeab17f225ecfdc8cb47d4d00263bf (patch) | |
| tree | 8a006daa2f74d104dd56e80e17d00e4b753101c2 | |
| parent | 171b44affdc898193cef44f0cf487fa0caca3aef (diff) | |
| parent | 6b8dfd16b6b23067a5f66320709f8f3a8e79c5dc (diff) | |
| download | kernel-4.6.0-0.rc7.git3.1.vanilla.knurd.1.fc23.tar.gz kernel-4.6.0-0.rc7.git3.1.vanilla.knurd.1.fc23.tar.xz kernel-4.6.0-0.rc7.git3.1.vanilla.knurd.1.fc23.zip | |
Merge remote-tracking branch 'origin/master' into f23-user-thl-vanilla-rawhidekernel-4.6.0-0.rc7.git3.1.vanilla.knurd.1.fc23
| -rw-r--r-- | config-arm-generic | 2 | ||||
| -rw-r--r-- | config-armv7-generic | 21 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 9 | ||||
| -rw-r--r-- | sources | 2 |
5 files changed, 29 insertions, 7 deletions
diff --git a/config-arm-generic b/config-arm-generic index 98a76fabc..5b03071db 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -198,7 +198,7 @@ CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y CONFIG_OF_PCI_IRQ=m CONFIG_OF_PCI=m -# CONFIG_PCI_HOST_GENERIC is not set +CONFIG_PCI_HOST_GENERIC=y # CONFIG_PCIE_IPROC is not set CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y diff --git a/config-armv7-generic b/config-armv7-generic index 474409d9b..ed26d946e 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -52,6 +52,7 @@ CONFIG_CPU_SW_DOMAIN_PAN=y # CONFIG_DEBUG_ALIGN_RODATA is not set # Platforms enabled/disabled globally on ARMv7 +CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM2835=y CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_HIGHBANK=y @@ -60,7 +61,21 @@ CONFIG_ARCH_TEGRA=y CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y CONFIG_ARCH_VIRT=y # CONFIG_ARCH_ARTPEC is not set -# CONFIG_ARCH_BCM is not set +# CONFIG_ARCH_BCM_CYGNUS is not set +# CONFIG_ARCH_BCM_NSP is not set +# CONFIG_ARCH_BCM_5301X is not set +# CONFIG_ARCH_BCM_281XX is not set +# CONFIG_ARCH_BCM_21664 is not set +# CONFIG_ARCH_BCM_63XX is not set +# CONFIG_ARCH_BRCMSTB is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_BCM_CYGNUS is not set +# CONFIG_ARCH_BCM_NSP is not set +# CONFIG_ARCH_BCM_5301X is not set +# CONFIG_ARCH_BCM_281XX is not set +# CONFIG_ARCH_BCM_21664 is not set +# CONFIG_ARCH_BCM_63XX is not set +# CONFIG_ARCH_BRCMSTB is not set # CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_HI3xxx is not set # CONFIG_ARCH_HISI is not set @@ -151,7 +166,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768 CONFIG_XZ_DEC_ARM=y -CONFIG_PCI_HOST_GENERIC=y # CONFIG_PCI_LAYERSCAPE is not set # Do NOT enable this, it breaks stuff and makes things go slow # CONFIG_UACCESS_WITH_MEMCPY is not set @@ -239,9 +253,10 @@ CONFIG_NVMEM_SUNXI_SID=m # BCM 283x CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_8250_BCM2835AUX=y CONFIG_DMA_BCM2835=m -CONFIG_MMC_SDHCI_IPROC=m # CONFIG_MMC_SDHCI_BCM2835 is not set +CONFIG_MMC_SDHCI_IPROC=m CONFIG_BCM2835_MBOX=m CONFIG_PWM_BCM2835=m CONFIG_HW_RANDOM_BCM2835=m @@ -1 +1 @@ -c5114626f33b62fa7595e57d87f33d9d1f8298a2 +a2ccb68b1e6add42c0bf3ade73cd11c98d32b890 diff --git a/kernel.spec b/kernel.spec index dff7856dc..87238e1ad 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 7 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2164,6 +2164,13 @@ fi # # %changelog +* Fri May 13 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc7.git3.1 +- Linux v4.6-rc7-116-ga2ccb68b1e6a + +* Thu May 12 2016 Peter Robinson <pbrobinson@fedoraproject.org> +- Some minor ARMv7 platform fixes from F-24 +- Enable PCI_HOST_GENERIC for all ARM arches (Jeremy Linton) + * Wed May 11 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc7.git2.1 - Linux v4.6-rc7-55-gc5114626f33b @@ -1,4 +1,4 @@ a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz 6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz 2089df8a0f142e2a1cdcaca0f133e47d patch-4.6-rc7.xz -9c27262cc4c500a0b9b6727b257717c7 patch-4.6-rc7-git2.xz +bf56da06679952234c9a2f31d2d259c8 patch-4.6-rc7-git3.xz |