From f600ee89493dee39e5ad80fe416192e3db19814e Mon Sep 17 00:00:00 2001 From: moonman Date: Tue, 2 Feb 2016 01:48:13 -0700 Subject: [PATCH] core/linux-kirkwood-dt to 4.4.1-1 --- core/linux-kirkwood-dt/PKGBUILD | 33 ++--- core/linux-kirkwood-dt/archlinuxarm.patch | 12 -- core/linux-kirkwood-dt/config | 133 +++++++++++++----- .../kernel-CVE-2016-0728.patch | 81 ----------- .../linux-kirkwood-dt.install | 2 +- 5 files changed, 113 insertions(+), 148 deletions(-) delete mode 100644 core/linux-kirkwood-dt/kernel-CVE-2016-0728.patch diff --git a/core/linux-kirkwood-dt/PKGBUILD b/core/linux-kirkwood-dt/PKGBUILD index e51ef8142..73741eb6f 100644 --- a/core/linux-kirkwood-dt/PKGBUILD +++ b/core/linux-kirkwood-dt/PKGBUILD @@ -6,11 +6,11 @@ buildarch=2 pkgbase=linux-kirkwood-dt _kernelname=${pkgbase#linux} _desc="Marvell Kirkwood DT" -pkgver=4.3.3 +pkgver=4.4.1 srcver=${pkgver%.0} -pkgrel=2 +pkgrel=1 cryptodev_commit=bc67142c57eadc0aafd0323ec527849012786643 -bfqver=v7r8 +bfqver=v7r11 ### BFQ patch kernel version bfqkern=${pkgver:0:3} @@ -32,28 +32,26 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz" '0001-disable-mv643xx_eth-TSO.patch' "git+https://github.com/sfjro/aufs4-standalone.git#branch=${aufsbranch}" "cryptodev-${cryptodev_commit}.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz" - "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch" - "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch" - "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch" + "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.0.patch" + "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.0.patch" + "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for.patch" 'goflexhome_fdt.patch' 'pogoplugv4_fdt.patch' 'nsa325_fdt.patch' - 'kernel-CVE-2016-0728.patch' 'linux.preset') -md5sums=('f3068333fa524ff98914cf751d0b5710' - 'a105c00469a8a56ec8ef3295511ad185' - '8f6f89b315a249a4827783fd9b458e63' +md5sums=('d27b1458acde6369cf9eaf956f402901' + 'f999312cee912d4694c3350e8564fd17' + '82d385c6a21e4c448bd915038e43b7d3' '09d44b9f07abfaeaf4f688ee52034786' 'SKIP' '2c8ecae91223868decdf37b8a76489b7' - 'c075ad682894b99fcc0f8b5bdc5b8b1b' - '5d346d74dce5ea4aafc2af55bdf1e961' - '69e80fbf2e272c94fc10435ebb2dd022' + 'c1d7fcfe88edb658375089c0a9cc1811' + '953133d5e387de2ad79ac0ae5c27cb6b' + 'f0387e673975e9f2a5e05136948edece' 'ce1975f40c48ec1b08dd09447ab043ca' '7efecf23dbebc1ee2e2ccb527c8579c0' '8ac6e9bb64a482925a5192e4d1d570f8' - '6470e9783bd1c7a8feddc2d67f07afd5' '959e49540dac4c5e689ad9037150a360') prepare() { @@ -78,12 +76,11 @@ prepare() { patch -Np1 -i "${srcdir}/goflexhome_fdt.patch" patch -Np1 -i "${srcdir}/pogoplugv4_fdt.patch" patch -Np1 -i "${srcdir}/nsa325_fdt.patch" - patch -Np1 -i "${srcdir}/kernel-CVE-2016-0728.patch" msg2 "Add BFQ patches" - patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch" - patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch" - patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch" + patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.0.patch" + patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.0.patch" + patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for.patch" cat "${srcdir}/config" > ./.config diff --git a/core/linux-kirkwood-dt/archlinuxarm.patch b/core/linux-kirkwood-dt/archlinuxarm.patch index f9c45e131..bc1124390 100644 --- a/core/linux-kirkwood-dt/archlinuxarm.patch +++ b/core/linux-kirkwood-dt/archlinuxarm.patch @@ -491,15 +491,3 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-pogo_e02.dts b/arch/arm/boot/dts/kirkwood }; fault { label = "pogo_e02:orange:fault"; -diff -ruN a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi ---- a/arch/arm/boot/dts/kirkwood.dtsi 2015-08-30 18:34:09.000000000 +0000 -+++ b/arch/arm/boot/dts/kirkwood.dtsi 2015-09-07 08:13:46.968601230 +0000 -@@ -41,7 +41,7 @@ - pcie-io-aperture = <0xf2000000 0x100000>; /* 1 MiB I/O space */ - - cesa: crypto@0301 { -- compatible = "marvell,orion-crypto"; -+ compatible = "marvell,kirkwood-crypto"; - reg = , - ; - reg-names = "regs", "sram"; diff --git a/core/linux-kirkwood-dt/config b/core/linux-kirkwood-dt/config index d67d402c8..b15c76fd0 100644 --- a/core/linux-kirkwood-dt/config +++ b/core/linux-kirkwood-dt/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.3.0-1 Kernel Configuration +# Linux/arm 4.4.1-1 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -294,7 +294,7 @@ CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_IOSCHED_BFQ=y -CONFIG_CGROUP_BFQIO=y +CONFIG_BFQ_GROUP_IOSCHED=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set CONFIG_DEFAULT_BFQ=y @@ -330,7 +330,6 @@ CONFIG_ARCH_MULTIPLATFORM=y # CONFIG_ARCH_W90X900 is not set # CONFIG_ARCH_LPC32XX is not set # CONFIG_ARCH_PXA is not set -# CONFIG_ARCH_SHMOBILE_LEGACY is not set # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set # CONFIG_ARCH_S3C24XX is not set @@ -355,7 +354,6 @@ CONFIG_ARCH_MULTI_CPU_AUTO=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_MVEBU_ANY=y CONFIG_MACH_KIRKWOOD=y -CONFIG_MACH_NETXBIG=y # CONFIG_MACH_ASM9260 is not set # CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_INTEGRATOR is not set @@ -423,6 +421,7 @@ CONFIG_PCI_MVEBU=y # CONFIG_PCI_HOST_GENERIC is not set # CONFIG_PCI_LAYERSCAPE is not set # CONFIG_PCIE_IPROC is not set +# CONFIG_PCIE_ALTERA is not set # CONFIG_PCIEPORTBUS is not set # CONFIG_PCCARD is not set @@ -430,6 +429,7 @@ CONFIG_PCI_MVEBU=y # Kernel Features # CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_3G_OPT is not set # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 @@ -462,7 +462,6 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y CONFIG_NO_BOOTMEM=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=999999 CONFIG_COMPACTION=y CONFIG_MIGRATION=y @@ -720,7 +719,8 @@ CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m # CONFIG_NF_CT_NETLINK_TIMEOUT is not set -# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NF_NAT=m CONFIG_NF_NAT_NEEDED=y CONFIG_NF_NAT_PROTO_DCCP=m @@ -1077,6 +1077,7 @@ CONFIG_VSOCKETS=m # CONFIG_MPLS is not set # CONFIG_HSR is not set # CONFIG_NET_SWITCHDEV is not set +# CONFIG_NET_L3_MASTER_DEV is not set CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y @@ -1215,6 +1216,7 @@ CONFIG_NL80211_TESTMODE=y CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_DEBUGFS is not set # CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_CRDA_SUPPORT=y CONFIG_CFG80211_WEXT=y CONFIG_CFG80211_WEXT_EXPORT=y CONFIG_LIB80211=m @@ -1439,7 +1441,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set CONFIG_BLK_DEV_NBD=m -# CONFIG_BLK_DEV_NVME is not set CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 @@ -1449,6 +1450,7 @@ CONFIG_ATA_OVER_ETH=m # CONFIG_MG_DISK is not set # CONFIG_BLK_DEV_RBD is not set # CONFIG_BLK_DEV_RSXX is not set +# CONFIG_BLK_DEV_NVME is not set # # Misc devices @@ -1524,6 +1526,10 @@ CONFIG_TI_ST=m # # SCIF Driver # + +# +# Intel MIC Coprocessor State Management (COSM) Drivers +# # CONFIG_ECHO is not set # CONFIG_CXL_BASE is not set # CONFIG_CXL_KERNEL_API is not set @@ -1590,8 +1596,8 @@ CONFIG_ISCSI_BOOT_SYSFS=m # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set -# CONFIG_SCSI_MPT2SAS is not set # CONFIG_SCSI_MPT3SAS is not set +# CONFIG_SCSI_MPT2SAS is not set # CONFIG_SCSI_UFSHCD is not set # CONFIG_SCSI_HPTIOP is not set # CONFIG_SCSI_SNIC is not set @@ -1626,6 +1632,7 @@ CONFIG_SATA_PMP=y # CONFIG_SATA_AHCI_PLATFORM is not set # CONFIG_AHCI_CEVA is not set # CONFIG_AHCI_MVEBU is not set +# CONFIG_AHCI_QORIQ is not set # CONFIG_SATA_INIC162X is not set # CONFIG_SATA_ACARD_AHCI is not set # CONFIG_SATA_SIL24 is not set @@ -1779,7 +1786,6 @@ CONFIG_TUN=m # CONFIG_TUN_VNET_CROSS_LE is not set CONFIG_VETH=m # CONFIG_NLMON is not set -CONFIG_NET_VRF=m # CONFIG_ARCNET is not set # @@ -1819,6 +1825,7 @@ CONFIG_NET_VENDOR_ATHEROS=y # CONFIG_ATL1E is not set # CONFIG_ATL1C is not set # CONFIG_ALX is not set +# CONFIG_NET_VENDOR_AURORA is not set # CONFIG_NET_CADENCE is not set CONFIG_NET_VENDOR_BROADCOM=y # CONFIG_B44 is not set @@ -1828,6 +1835,7 @@ CONFIG_NET_VENDOR_BROADCOM=y # CONFIG_TIGON3 is not set # CONFIG_BNX2X is not set # CONFIG_SYSTEMPORT is not set +# CONFIG_BNXT is not set CONFIG_NET_VENDOR_BROCADE=y # CONFIG_BNA is not set CONFIG_NET_VENDOR_CAVIUM=y @@ -1860,6 +1868,9 @@ CONFIG_NET_VENDOR_FARADAY=y CONFIG_NET_VENDOR_HISILICON=y # CONFIG_HIX5HD2_GMAC is not set # CONFIG_HIP04_ETH is not set +# CONFIG_HNS is not set +# CONFIG_HNS_DSAF is not set +# CONFIG_HNS_ENET is not set CONFIG_NET_VENDOR_HP=y # CONFIG_HP100 is not set CONFIG_NET_VENDOR_INTEL=y @@ -1872,7 +1883,6 @@ CONFIG_NET_VENDOR_INTEL=y # CONFIG_IXGBE is not set # CONFIG_I40E is not set CONFIG_NET_VENDOR_I825XX=y -# CONFIG_IP1000 is not set # CONFIG_JME is not set CONFIG_NET_VENDOR_MARVELL=y CONFIG_MV643XX_ETH=y @@ -1892,6 +1902,7 @@ CONFIG_NET_VENDOR_MICREL=y # CONFIG_KSZ884X_PCI is not set CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_ENC28J60 is not set +# CONFIG_ENCX24J600 is not set CONFIG_NET_VENDOR_MYRI=y # CONFIG_MYRI10GE is not set # CONFIG_FEALNX is not set @@ -1913,6 +1924,7 @@ CONFIG_NET_VENDOR_QLOGIC=y # CONFIG_QLCNIC is not set # CONFIG_QLGE is not set # CONFIG_NETXEN_NIC is not set +# CONFIG_QED is not set CONFIG_NET_VENDOR_QUALCOMM=y # CONFIG_QCA7000 is not set CONFIG_NET_VENDOR_REALTEK=y @@ -1989,7 +2001,7 @@ CONFIG_MARVELL_PHY=y # CONFIG_MICREL_PHY is not set # CONFIG_DP83848_PHY is not set # CONFIG_DP83867_PHY is not set -# CONFIG_MICROCHIP_PHY is not set +CONFIG_MICROCHIP_PHY=m # CONFIG_FIXED_PHY is not set # CONFIG_MDIO_BITBANG is not set # CONFIG_MDIO_BUS_MUX_GPIO is not set @@ -2060,10 +2072,10 @@ CONFIG_AT76C50X_USB=m # CONFIG_PRISM54 is not set CONFIG_USB_ZD1201=m CONFIG_USB_NET_RNDIS_WLAN=m +# CONFIG_ADM8211 is not set CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_RTL8187_LEDS=y -# CONFIG_ADM8211 is not set # CONFIG_MAC80211_HWSIM is not set CONFIG_MWL8K=m CONFIG_ATH_COMMON=m @@ -2236,6 +2248,8 @@ CONFIG_RTLWIFI_DEBUG=y CONFIG_RTL8192C_COMMON=m CONFIG_RTL8723_COMMON=m CONFIG_RTLBTCOEXIST=m +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y # CONFIG_WL_TI is not set CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set @@ -2258,6 +2272,7 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set # CONFIG_VMXNET3 is not set # CONFIG_ISDN is not set +# CONFIG_NVM is not set # # Input device support @@ -2356,6 +2371,7 @@ CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m # CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_EGALAX is not set +# CONFIG_TOUCHSCREEN_FT6236 is not set CONFIG_TOUCHSCREEN_FUJITSU=m # CONFIG_TOUCHSCREEN_GOODIX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set @@ -2399,6 +2415,7 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set # CONFIG_TOUCHSCREEN_TSC_SERIO is not set +# CONFIG_TOUCHSCREEN_TSC2004 is not set # CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m # CONFIG_TOUCHSCREEN_ST1232 is not set @@ -2406,6 +2423,7 @@ CONFIG_TOUCHSCREEN_TSC2007=m # CONFIG_TOUCHSCREEN_SX8654 is not set CONFIG_TOUCHSCREEN_TPS6507X=m # CONFIG_TOUCHSCREEN_ZFORCE is not set +# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set # CONFIG_INPUT_MISC is not set # @@ -2420,6 +2438,7 @@ CONFIG_SERIO_LIBPS2=m # CONFIG_SERIO_PS2MULT is not set # CONFIG_SERIO_ARC_PS2 is not set # CONFIG_SERIO_APBPS2 is not set +# CONFIG_USERIO is not set # CONFIG_GAMEPORT is not set # @@ -2455,9 +2474,12 @@ CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=2 # CONFIG_SERIAL_8250_EXTENDED is not set +CONFIG_SERIAL_8250_FSL=y # CONFIG_SERIAL_8250_DW is not set # CONFIG_SERIAL_8250_EM is not set +# CONFIG_SERIAL_8250_RT288X is not set # CONFIG_SERIAL_8250_INGENIC is not set +# CONFIG_SERIAL_8250_MID is not set # # Non-8250 serial port support @@ -2656,9 +2678,10 @@ CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_GRGPIO is not set CONFIG_GPIO_MVEBU=y -# CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_VX855 is not set +# CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_ZEVIO is not set +# CONFIG_GPIO_ZX is not set # # I2C GPIO expanders @@ -2688,9 +2711,12 @@ CONFIG_GPIO_MVEBU=y # # CONFIG_GPIO_74X164 is not set # CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MCP23S08 is not set # CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_ZX is not set + +# +# SPI or I2C GPIO expanders +# +# CONFIG_GPIO_MCP23S08 is not set # # USB GPIO expanders @@ -2733,7 +2759,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_SBS is not set -# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_BQ27XXX is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_CHARGER_MAX8903 is not set @@ -2814,6 +2840,7 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_MAX6642 is not set # CONFIG_SENSORS_MAX6650 is not set # CONFIG_SENSORS_MAX6697 is not set +# CONFIG_SENSORS_MAX31790 is not set # CONFIG_SENSORS_HTU21 is not set # CONFIG_SENSORS_MCP3021 is not set # CONFIG_SENSORS_ADCXX is not set @@ -2917,6 +2944,7 @@ CONFIG_ORION_WATCHDOG=y # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_ALIM7101_WDT is not set # CONFIG_I6300ESB_WDT is not set +# CONFIG_BCM7038_WDT is not set # CONFIG_MEN_A21_WDT is not set # @@ -2942,6 +2970,7 @@ CONFIG_SSB_PCIHOST=y CONFIG_SSB_B43_PCI_BRIDGE=y CONFIG_SSB_SDIOHOST_POSSIBLE=y # CONFIG_SSB_SDIOHOST is not set +# CONFIG_SSB_HOST_SOC is not set # CONFIG_SSB_DEBUG is not set CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y CONFIG_SSB_DRIVER_PCICORE=y @@ -2969,6 +2998,7 @@ CONFIG_MFD_CORE=m # CONFIG_MFD_AS3722 is not set # CONFIG_PMIC_ADP5520 is not set # CONFIG_MFD_AAT2870_CORE is not set +# CONFIG_MFD_ATMEL_FLEXCOM is not set # CONFIG_MFD_ATMEL_HLCDC is not set # CONFIG_MFD_BCM590XX is not set # CONFIG_MFD_AXP20X is not set @@ -3639,6 +3669,7 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_CARMINE is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m +# CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -3687,12 +3718,12 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m -CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m # CONFIG_SND_SEQ_DUMMY is not set # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set +CONFIG_SND_PCM_TIMER=y # CONFIG_SND_SEQUENCER_OSS is not set CONFIG_SND_HRTIMER=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y @@ -3719,15 +3750,12 @@ CONFIG_SND_DRIVERS=y # CONFIG_SND_AC97_POWER_SAVE is not set CONFIG_SND_PCI=y # CONFIG_SND_AD1889 is not set -# CONFIG_SND_ALS300 is not set -# CONFIG_SND_ALI5451 is not set # CONFIG_SND_ATIIXP is not set # CONFIG_SND_ATIIXP_MODEM is not set # CONFIG_SND_AU8810 is not set # CONFIG_SND_AU8820 is not set # CONFIG_SND_AU8830 is not set # CONFIG_SND_AW2 is not set -# CONFIG_SND_AZT3328 is not set # CONFIG_SND_BT87X is not set # CONFIG_SND_CA0106 is not set # CONFIG_SND_CMIPCI is not set @@ -3749,23 +3777,17 @@ CONFIG_SND_PCI=y # CONFIG_SND_INDIGODJ is not set # CONFIG_SND_INDIGOIOX is not set # CONFIG_SND_INDIGODJX is not set -# CONFIG_SND_EMU10K1 is not set -# CONFIG_SND_EMU10K1X is not set # CONFIG_SND_ENS1370 is not set # CONFIG_SND_ENS1371 is not set -# CONFIG_SND_ES1938 is not set -# CONFIG_SND_ES1968 is not set # CONFIG_SND_FM801 is not set # CONFIG_SND_HDSP is not set # CONFIG_SND_HDSPM is not set -# CONFIG_SND_ICE1712 is not set # CONFIG_SND_ICE1724 is not set # CONFIG_SND_INTEL8X0 is not set # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_KORG1212 is not set # CONFIG_SND_LOLA is not set # CONFIG_SND_LX6464ES is not set -# CONFIG_SND_MAESTRO3 is not set # CONFIG_SND_MIXART is not set # CONFIG_SND_NM256 is not set # CONFIG_SND_PCXHR is not set @@ -3774,8 +3796,6 @@ CONFIG_SND_PCI=y # CONFIG_SND_RME96 is not set # CONFIG_SND_RME9652 is not set # CONFIG_SND_SE6X is not set -# CONFIG_SND_SONICVIBES is not set -# CONFIG_SND_TRIDENT is not set # CONFIG_SND_VIA82XX is not set # CONFIG_SND_VIA82XX_MODEM is not set # CONFIG_SND_VIRTUOSO is not set @@ -3821,6 +3841,11 @@ CONFIG_SND_SOC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set CONFIG_SND_KIRKWOOD_SOC=m CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m + +# +# Allwinner SoC Audio support +# +# CONFIG_SND_SUN4I_CODEC is not set # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SOC_I2C_AND_SPI=m @@ -3831,6 +3856,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4613 is not set # CONFIG_SND_SOC_AK4642 is not set # CONFIG_SND_SOC_AK5386 is not set CONFIG_SND_SOC_ALC5623=m @@ -3846,7 +3872,6 @@ CONFIG_SND_SOC_CS42L51=m # CONFIG_SND_SOC_CS4271_SPI is not set # CONFIG_SND_SOC_CS42XX8_I2C is not set # CONFIG_SND_SOC_CS4349 is not set -# CONFIG_SND_SOC_HDMI_CODEC is not set # CONFIG_SND_SOC_ES8328 is not set # CONFIG_SND_SOC_GTM601 is not set # CONFIG_SND_SOC_PCM1681 is not set @@ -3917,6 +3942,7 @@ CONFIG_HID_BELKIN=m # CONFIG_HID_BETOP_FF is not set CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m +CONFIG_HID_CORSAIR=m CONFIG_HID_PRODIKEYS=m CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m @@ -3927,6 +3953,7 @@ CONFIG_HID_ELECOM=m # CONFIG_HID_ELO is not set CONFIG_HID_EZKEY=m # CONFIG_HID_GEMBIRD is not set +# CONFIG_HID_GFRM is not set CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y # CONFIG_HID_GT683R is not set @@ -4017,7 +4044,6 @@ CONFIG_USB_DEFAULT_PERSIST=y # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_FSM is not set # CONFIG_USB_ULPI_BUS is not set # CONFIG_USB_MON is not set CONFIG_USB_WUSB_CBAF=m @@ -4040,7 +4066,6 @@ CONFIG_USB_EHCI_HCD_ORION=y # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_ISP1362_HCD is not set -# CONFIG_USB_FUSBH200_HCD is not set # CONFIG_USB_FOTG210_HCD is not set # CONFIG_USB_MAX3421_HCD is not set # CONFIG_USB_OHCI_HCD is not set @@ -4211,7 +4236,6 @@ CONFIG_USB_LED_TRIG=y # CONFIG_UWB is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_CLKGATE is not set # # MMC/SD/SDIO Card Drivers @@ -4349,6 +4373,7 @@ CONFIG_RTC_DRV_S35390A=m # CONFIG_RTC_DRV_RX8025 is not set # CONFIG_RTC_DRV_EM3027 is not set # CONFIG_RTC_DRV_RV3029C2 is not set +# CONFIG_RTC_DRV_RV8803 is not set # # SPI RTC drivers @@ -4408,12 +4433,11 @@ CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y # CONFIG_FSL_EDMA is not set -# CONFIG_IDMA64 is not set +# CONFIG_INTEL_IDMA64 is not set CONFIG_MV_XOR=y # CONFIG_NBPFAXI_DMA is not set # CONFIG_DW_DMAC is not set # CONFIG_DW_DMAC_PCI is not set -# CONFIG_HSU_DMA_PCI is not set # # DMA Clients @@ -4537,7 +4561,6 @@ CONFIG_8723AU_BT_COEXIST=y # CONFIG_IIO_SIMPLE_DUMMY is not set # CONFIG_FB_SM750 is not set CONFIG_FB_XGI=m -# CONFIG_FT1000 is not set # # Speakup console speech @@ -4559,6 +4582,7 @@ CONFIG_FB_XGI=m # CONFIG_GS_FPGABOOT is not set # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set # CONFIG_FB_TFT is not set +# CONFIG_WILC1000_DRIVER is not set # CONFIG_MOST is not set # CONFIG_CHROME_PLATFORMS is not set CONFIG_CLKDEV_LOOKUP=y @@ -4569,6 +4593,7 @@ CONFIG_COMMON_CLK=y # Common Clock Framework # # CONFIG_COMMON_CLK_SI5351 is not set +# CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI570 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_CLK_QORIQ is not set @@ -4585,6 +4610,7 @@ CONFIG_KIRKWOOD_CLK=y # Clock Source drivers # CONFIG_CLKSRC_OF=y +CONFIG_CLKSRC_PROBE=y CONFIG_CLKSRC_MMIO=y CONFIG_ORION_TIMER=y # CONFIG_ARM_TIMER_SP804 is not set @@ -4614,6 +4640,7 @@ CONFIG_IOMMU_SUPPORT=y # # SOC (System On Chip) specific Drivers # +# CONFIG_SOC_BRCMSTB is not set # CONFIG_SUNXI_SRAM is not set # CONFIG_SOC_TI is not set # CONFIG_PM_DEVFREQ is not set @@ -4635,6 +4662,7 @@ CONFIG_IIO=m # CONFIG_MMA8452 is not set # CONFIG_MMA9551 is not set # CONFIG_MMA9553 is not set +# CONFIG_MXC4005 is not set # CONFIG_STK8312 is not set # CONFIG_STK8BA50 is not set @@ -4651,6 +4679,7 @@ CONFIG_IIO=m # CONFIG_AD7923 is not set # CONFIG_AD799X is not set # CONFIG_CC10001_ADC is not set +# CONFIG_HI8435 is not set # CONFIG_MAX1027 is not set # CONFIG_MAX1363 is not set # CONFIG_MCP320X is not set @@ -4665,6 +4694,11 @@ CONFIG_IIO=m # # CONFIG_AD8366 is not set +# +# Chemical Sensors +# +# CONFIG_VZ89X is not set + # # Hid Sensor IIO Common # @@ -4729,6 +4763,8 @@ CONFIG_HID_SENSOR_IIO_COMMON=m # Humidity sensors # CONFIG_DHT11=m +# CONFIG_HDC100X is not set +# CONFIG_HTU21 is not set # CONFIG_SI7005 is not set # CONFIG_SI7020 is not set @@ -4746,6 +4782,7 @@ CONFIG_DHT11=m # CONFIG_ADJD_S311 is not set # CONFIG_AL3320A is not set # CONFIG_APDS9300 is not set +# CONFIG_APDS9960 is not set # CONFIG_BH1750 is not set CONFIG_CM32181=m # CONFIG_CM3232 is not set @@ -4765,6 +4802,7 @@ CONFIG_CM32181=m # CONFIG_TCS3472 is not set # CONFIG_SENSORS_TSL2563 is not set # CONFIG_TSL4531 is not set +# CONFIG_US5182D is not set # CONFIG_VCNL4000 is not set # @@ -4772,11 +4810,11 @@ CONFIG_CM32181=m # # CONFIG_AK8975 is not set # CONFIG_AK09911 is not set +# CONFIG_BMC150_MAGN is not set # CONFIG_MAG3110 is not set # CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set # CONFIG_MMC35240 is not set # CONFIG_IIO_ST_MAGN_3AXIS is not set -# CONFIG_BMC150_MAGN is not set # # Inclinometer sensors @@ -4784,6 +4822,11 @@ CONFIG_CM32181=m # CONFIG_HID_SENSOR_INCLINOMETER_3D is not set # CONFIG_HID_SENSOR_DEVICE_ROTATION is not set +# +# Digital potentiometers +# +# CONFIG_MCP4531 is not set + # # Pressure sensors # @@ -4792,6 +4835,7 @@ CONFIG_CM32181=m # CONFIG_MPL115 is not set # CONFIG_MPL3115 is not set # CONFIG_MS5611 is not set +# CONFIG_MS5637 is not set # CONFIG_IIO_ST_PRESS is not set # CONFIG_T5403 is not set @@ -4803,6 +4847,7 @@ CONFIG_CM32181=m # # Proximity sensors # +# CONFIG_LIDAR_LITE_V2 is not set # CONFIG_SX9500 is not set # @@ -4810,6 +4855,8 @@ CONFIG_CM32181=m # # CONFIG_MLX90614 is not set # CONFIG_TMP006 is not set +# CONFIG_TSYS01 is not set +# CONFIG_TSYS02D is not set # CONFIG_NTB is not set # CONFIG_VME_BUS is not set # CONFIG_PWM is not set @@ -4842,6 +4889,15 @@ CONFIG_ARM_PMU=y # # CONFIG_ANDROID is not set # CONFIG_NVMEM is not set +# CONFIG_STM is not set +# CONFIG_STM_DUMMY is not set +# CONFIG_STM_SOURCE_CONSOLE is not set +# CONFIG_INTEL_TH is not set + +# +# FPGA Configuration Support +# +# CONFIG_FPGA is not set # # Firmware Drivers @@ -4989,6 +5045,7 @@ CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_ATIME_SUPPORT is not set # CONFIG_LOGFS is not set CONFIG_CRAMFS=y CONFIG_SQUASHFS=m @@ -5164,6 +5221,7 @@ CONFIG_FRAME_WARN=1024 CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 @@ -5273,6 +5331,7 @@ CONFIG_PROBE_EVENTS=y # CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_TRACE_ENUM_MAP_FILE is not set +CONFIG_TRACING_EVENTS_GPIO=y # # Runtime Testing @@ -5289,6 +5348,7 @@ CONFIG_PROBE_EVENTS=y # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_KSTRTOX is not set +# CONFIG_TEST_PRINTF is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_TEST_LKM is not set @@ -5410,6 +5470,7 @@ CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=y +CONFIG_CRYPTO_KEYWRAP=m # # Hash modes diff --git a/core/linux-kirkwood-dt/kernel-CVE-2016-0728.patch b/core/linux-kirkwood-dt/kernel-CVE-2016-0728.patch deleted file mode 100644 index 49020d7db..000000000 --- a/core/linux-kirkwood-dt/kernel-CVE-2016-0728.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 Mon Sep 17 00:00:00 2001 -From: Yevgeny Pats -Date: Tue, 19 Jan 2016 22:09:04 +0000 -Subject: KEYS: Fix keyring ref leak in join_session_keyring() - -This fixes CVE-2016-0728. - -If a thread is asked to join as a session keyring the keyring that's already -set as its session, we leak a keyring reference. - -This can be tested with the following program: - - #include - #include - #include - #include - - int main(int argc, const char *argv[]) - { - int i = 0; - key_serial_t serial; - - serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING, - "leaked-keyring"); - if (serial < 0) { - perror("keyctl"); - return -1; - } - - if (keyctl(KEYCTL_SETPERM, serial, - KEY_POS_ALL | KEY_USR_ALL) < 0) { - perror("keyctl"); - return -1; - } - - for (i = 0; i < 100; i++) { - serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING, - "leaked-keyring"); - if (serial < 0) { - perror("keyctl"); - return -1; - } - } - - return 0; - } - -If, after the program has run, there something like the following line in -/proc/keys: - -3f3d898f I--Q--- 100 perm 3f3f0000 0 0 keyring leaked-keyring: empty - -with a usage count of 100 * the number of times the program has been run, -then the kernel is malfunctioning. If leaked-keyring has zero usages or -has been garbage collected, then the problem is fixed. - -Reported-by: Yevgeny Pats -Signed-off-by: David Howells -Acked-by: Don Zickus -Acked-by: Prarit Bhargava -Acked-by: Jarod Wilson -Signed-off-by: James Morris ---- - security/keys/process_keys.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c -index a3f85d2..e6d50172 100644 ---- a/security/keys/process_keys.c -+++ b/security/keys/process_keys.c -@@ -794,6 +794,7 @@ long join_session_keyring(const char *name) - ret = PTR_ERR(keyring); - goto error2; - } else if (keyring == new->session_keyring) { -+ key_put(keyring); - ret = 0; - goto error2; - } --- -cgit v0.12 - diff --git a/core/linux-kirkwood-dt/linux-kirkwood-dt.install b/core/linux-kirkwood-dt/linux-kirkwood-dt.install index d24f7446b..0fc46b7da 100644 --- a/core/linux-kirkwood-dt/linux-kirkwood-dt.install +++ b/core/linux-kirkwood-dt/linux-kirkwood-dt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-kirkwood-dt -KERNEL_VERSION=4.3.0-1-ARCH +KERNEL_VERSION=4.4.1-1-ARCH post_install () { # updating module dependencies