diff options
| author | Baptiste Jonglez | 2016-03-22 13:38:26 +0100 |
|---|---|---|
| committer | Baptiste Jonglez | 2016-03-22 14:08:26 +0100 |
| commit | b6bb0b1060769002fd40368f56e1c4d7b8333b5d (patch) | |
| tree | d911533dc1378529a9e93ad5f8841de204cac834 | |
| parent | c1992d2014ca452db86be51767dea915223f8080 (diff) | |
| download | aur-b6bb0b1060769002fd40368f56e1c4d7b8333b5d.tar.gz | |
linux-mptcp: Add several config upstream changes
r255727 (fixing #46488), r255728 (fixing #47066), r255731 (fixing #46316).
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | config | 7 | ||||
| -rw-r--r-- | config.x86_64 | 7 |
4 files changed, 15 insertions, 13 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Tue Mar 22 13:05:30 UTC 2016 +# Tue Mar 22 13:08:26 UTC 2016 pkgbase = linux-mptcp pkgver = 0.91.525000.c6ba013 - pkgrel = 8 + pkgrel = 9 url = http://www.multipath-tcp.org/ arch = i686 arch = x86_64 @@ -20,8 +20,8 @@ pkgbase = linux-mptcp source = linux.preset source = change-default-console-loglevel.patch md5sums = SKIP - md5sums = b31e6d07eca08da47be987cd144acdb9 - md5sums = d3e918da8afd2b084f838925e284116f + md5sums = bb0f6b2febc1e0f154eacd1cf03f5d4f + md5sums = 851f5ecd973350c7313ffa9f690c8375 md5sums = eb14dcfd80c00852ef81ded6e826826a md5sums = 92562f0a5d8cc0e5972ab58523dbe0a4 @@ -8,7 +8,7 @@ pkgbase=linux-mptcp _srcname=mptcp _mptcpv=0.91 pkgver=0.91.525000.c6ba013 -pkgrel=8 +pkgrel=9 arch=('i686' 'x86_64') url="http://www.multipath-tcp.org/" license=('GPL2') @@ -21,8 +21,8 @@ source=("git://github.com/multipath-tcp/mptcp#branch=mptcp_v${_mptcpv}" 'linux.preset' 'change-default-console-loglevel.patch') md5sums=('SKIP' - 'b31e6d07eca08da47be987cd144acdb9' - 'd3e918da8afd2b084f838925e284116f' + 'bb0f6b2febc1e0f154eacd1cf03f5d4f' + '851f5ecd973350c7313ffa9f690c8375' 'eb14dcfd80c00852ef81ded6e826826a' '92562f0a5d8cc0e5972ab58523dbe0a4') @@ -1710,7 +1710,8 @@ CONFIG_MTD_SCB2_FLASH=m # CONFIG_MTD_NETtel is not set # CONFIG_MTD_L440GX is not set CONFIG_MTD_PCI=m -# CONFIG_MTD_PCMCIA is not set +CONFIG_MTD_PCMCIA=m +# CONFIG_MTD_PCMCIA_ANONYMOUS is not set # CONFIG_MTD_GPIO_ADDR is not set # CONFIG_MTD_INTEL_VR_NOR is not set CONFIG_MTD_PLATRAM=m @@ -1770,7 +1771,7 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set -# CONFIG_MTD_UBI_BLOCK is not set +CONFIG_MTD_UBI_BLOCK=y CONFIG_OF=y # @@ -3818,7 +3819,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_NCT6683=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m -# CONFIG_SENSORS_NCT7904 is not set +CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m diff --git a/config.x86_64 b/config.x86_64 index bf7e08bdea83..e426f2135015 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1744,7 +1744,8 @@ CONFIG_MTD_SCB2_FLASH=m # CONFIG_MTD_NETtel is not set # CONFIG_MTD_L440GX is not set CONFIG_MTD_PCI=m -# CONFIG_MTD_PCMCIA is not set +CONFIG_MTD_PCMCIA=m +# CONFIG_MTD_PCMCIA_ANONYMOUS is not set # CONFIG_MTD_GPIO_ADDR is not set # CONFIG_MTD_INTEL_VR_NOR is not set CONFIG_MTD_PLATRAM=m @@ -1803,7 +1804,7 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set -# CONFIG_MTD_UBI_BLOCK is not set +CONFIG_MTD_UBI_BLOCK=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m @@ -3732,7 +3733,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_NCT6683=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m -# CONFIG_SENSORS_NCT7904 is not set +CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m |