Commit 9fa5373e authored by Ben Hutchings's avatar Ben Hutchings

Merge tag 'debian/4.14.7-1' into stretch-backports

Release linux (4.14.7-1).
parents 157a4144 ab5d03cb
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -139,9 +139,9 @@ class CheckAbi(object):
ret = []
for i in re.split(r'(\*\*?)', pattern):
if i == '*':
ret.append(r'[^!]+')
ret.append(r'[^/]*')
elif i == '**':
ret.append(r'.+')
ret.append(r'.*')
elif i:
ret.append(re.escape(i))
return re.compile('^' + ''.join(ret) + '$')
......
......@@ -3,7 +3,7 @@
import sys
sys.path.append("debian/lib/python")
import codecs
import locale
import errno
import glob
import io
......@@ -11,6 +11,8 @@ import os
import os.path
import subprocess
locale.setlocale(locale.LC_CTYPE, "C.UTF-8")
from debian_linux import config
from debian_linux.debian import *
from debian_linux.gencontrol import Gencontrol as Base, merge_packages
......@@ -62,7 +64,7 @@ class Gencontrol(Base):
makeflags[dst] = data[src]
def _substitute_file(self, template, vars, target, append=False):
with codecs.open(target, 'a' if append else 'w', 'utf-8') as f:
with open(target, 'a' if append else 'w') as f:
f.write(self.substitute(self.templates[template], vars))
def do_main_setup(self, vars, makeflags, extra):
......@@ -237,9 +239,9 @@ class Gencontrol(Base):
stdout=subprocess.PIPE,
env=kw_env)
if not isinstance(kw_proc.stdout, io.IOBase):
udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), encoding='utf-8', closefd=False))
udeb_packages = read_control(io.open(kw_proc.stdout.fileno(), closefd=False))
else:
udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout, 'utf-8'))
udeb_packages = read_control(io.TextIOWrapper(kw_proc.stdout))
kw_proc.wait()
if kw_proc.returncode != 0:
raise RuntimeError('kernel-wedge exited with code %d' %
......@@ -573,7 +575,7 @@ class Gencontrol(Base):
f.close()
def write_tests_control(self):
self.write_rfc822(codecs.open("debian/tests/control", 'w', 'utf-8'),
self.write_rfc822(open("debian/tests/control", 'w'),
[self.tests_control])
if __name__ == '__main__':
......
This diff is collapsed.
......@@ -121,8 +121,6 @@ CONFIG_ATM_HE_USE_SUNI=y
## file: drivers/block/Kconfig
##
CONFIG_BLK_DEV_FD=m
CONFIG_BLK_CPQ_CISS_DA=m
CONFIG_CISS_SCSI_TAPE=y
CONFIG_BLK_DEV_DAC960=m
CONFIG_BLK_DEV_UMEM=m
CONFIG_BLK_DEV_SX8=m
......@@ -392,13 +390,17 @@ CONFIG_RADIO_ZOLTRIX=m
## file: drivers/mmc/Kconfig
##
CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
##
## file: drivers/mmc/core/Kconfig
##
CONFIG_MMC_BLOCK=m
##
## file: drivers/mmc/host/Kconfig
##
# CONFIG_MMC_DEBUG is not set
##
## file: drivers/mtd/Kconfig
##
......@@ -643,19 +645,6 @@ CONFIG_HIPPI=y
CONFIG_ROADRUNNER=m
# CONFIG_ROADRUNNER_LARGE_RINGS is not set
##
## file: drivers/net/irda/Kconfig
##
CONFIG_IRTTY_SIR=m
CONFIG_USB_IRDA=m
CONFIG_SIGMATEL_FIR=m
CONFIG_NSC_FIR=m
CONFIG_WINBOND_FIR=m
CONFIG_SMC_IRCC_FIR=m
CONFIG_ALI_FIR=m
CONFIG_VLSI_FIR=m
CONFIG_VIA_FIR=m
##
## file: drivers/net/plip/Kconfig
##
......@@ -872,7 +861,6 @@ CONFIG_LCD_CLASS_DEVICE=m
##
CONFIG_VGA_CONSOLE=y
CONFIG_MDA_CONSOLE=m
CONFIG_FRAMEBUFFER_CONSOLE=m
##
## file: drivers/video/fbdev/Kconfig
......@@ -965,30 +953,6 @@ CONFIG_DECNET=m
CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
##
## file: net/irda/Kconfig
##
CONFIG_IRDA=m
CONFIG_IRDA_ULTRA=y
CONFIG_IRDA_CACHE_LAST_LSAP=y
CONFIG_IRDA_FAST_RR=y
# CONFIG_IRDA_DEBUG is not set
##
## file: net/irda/ircomm/Kconfig
##
CONFIG_IRCOMM=m
##
## file: net/irda/irlan/Kconfig
##
CONFIG_IRLAN=m
##
## file: net/irda/irnet/Kconfig
##
CONFIG_IRNET=m
##
## file: net/lapb/Kconfig
##
......
......@@ -15,7 +15,7 @@ install-stem: vmlinuz
breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
[relations]
headers%gcc-6: linux-compiler-gcc-6-x86
headers%gcc-7: linux-compiler-gcc-7-x86
[amd64_description]
hardware: 64-bit PCs
......
......@@ -10,13 +10,16 @@ CONFIG_ARM64_VA_BITS_48=y
## end choice
CONFIG_SCHED_MC=y
CONFIG_NR_CPUS=256
CONFIG_NUMA=y
CONFIG_SECCOMP=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_XEN=y
CONFIG_ARMV8_DEPRECATED=y
CONFIG_SWP_EMULATION=y
CONFIG_CP15_BARRIER_EMULATION=y
CONFIG_SETEND_EMULATION=y
CONFIG_ARM64_PMEM=y
CONFIG_RANDOMIZE_BASE=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
......@@ -55,6 +58,7 @@ CONFIG_ARCH_ROCKCHIP=y
CONFIG_ARCH_SEATTLE=y
CONFIG_ARCH_TEGRA=y
CONFIG_ARCH_THUNDER=y
CONFIG_ARCH_THUNDER2=y
CONFIG_ARCH_VEXPRESS=y
CONFIG_ARCH_XGENE=y
......@@ -62,6 +66,12 @@ CONFIG_ARCH_XGENE=y
## file: drivers/acpi/Kconfig
##
CONFIG_ACPI=y
CONFIG_ACPI_NUMA=y
##
## file: drivers/acpi/nfit/Kconfig
##
CONFIG_ACPI_NFIT=y
##
## file: drivers/ata/Kconfig
......@@ -72,6 +82,12 @@ CONFIG_AHCI_TEGRA=m
CONFIG_AHCI_XGENE=m
CONFIG_SATA_AHCI_SEATTLE=m
##
## file: drivers/base/Kconfig
##
CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=64
##
## file: drivers/bluetooth/Kconfig
##
......@@ -88,6 +104,7 @@ CONFIG_TEGRA_ACONNECT=y
## file: drivers/char/hw_random/Kconfig
##
CONFIG_HW_RANDOM_BCM2835=m
CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_HISI=m
CONFIG_HW_RANDOM_MSM=m
CONFIG_HW_RANDOM_XGENE=m
......@@ -116,6 +133,8 @@ CONFIG_STUB_CLK_HI6220=y
## file: drivers/clk/qcom/Kconfig
##
CONFIG_COMMON_CLK_QCOM=y
CONFIG_QCOM_CLK_RPM=m
CONFIG_QCOM_CLK_SMD_RPM=m
CONFIG_MSM_GCC_8916=y
CONFIG_MSM_GCC_8996=y
CONFIG_MSM_MMCC_8996=y
......@@ -125,6 +144,11 @@ CONFIG_MSM_MMCC_8996=y
##
CONFIG_CPUFREQ_DT=m
##
## file: drivers/cpufreq/Kconfig.arm
##
CONFIG_ACPI_CPPC_CPUFREQ=m
##
## file: drivers/cpuidle/Kconfig.arm
##
......@@ -133,7 +157,19 @@ CONFIG_ARM_CPUIDLE=y
##
## file: drivers/crypto/Kconfig
##
CONFIG_CRYPTO_DEV_MARVELL_CESA=m
CONFIG_CRYPTO_DEV_QCE=m
CONFIG_CRYPTO_DEV_SAFEXCEL=m
##
## file: drivers/crypto/cavium/cpt/Kconfig
##
CONFIG_CAVIUM_CPT=m
##
## file: drivers/crypto/cavium/nitrox/Kconfig
##
CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
##
## file: drivers/dma/Kconfig
......@@ -143,6 +179,7 @@ CONFIG_DMA_BCM2835=y
CONFIG_K3_DMA=m
CONFIG_MV_XOR=y
CONFIG_MV_XOR_V2=y
CONFIG_PL330_DMA=m
CONFIG_TEGRA20_APB_DMA=y
CONFIG_TEGRA210_ADMA=y
CONFIG_XGENE_DMA=m
......@@ -158,6 +195,7 @@ CONFIG_QCOM_HIDMA=m
## file: drivers/edac/Kconfig
##
CONFIG_EDAC=y
CONFIG_EDAC_THUNDERX=m
CONFIG_EDAC_XGENE=m
##
......@@ -179,6 +217,7 @@ CONFIG_GPIOLIB=y
CONFIG_GPIO_PL061=y
CONFIG_GPIO_XGENE=y
CONFIG_GPIO_XGENE_SB=m
CONFIG_GPIO_XLP=y
CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_GPIO_MAX77620=y
......@@ -205,6 +244,12 @@ CONFIG_DRM_AST=m
## file: drivers/gpu/drm/bridge/adv7511/Kconfig
##
CONFIG_DRM_I2C_ADV7511=m
CONFIG_DRM_I2C_ADV7511_AUDIO=y
##
## file: drivers/gpu/drm/hisilicon/hibmc/Kconfig
##
CONFIG_DRM_HISI_HIBMC=m
##
## file: drivers/gpu/drm/hisilicon/kirin/Kconfig
......@@ -277,6 +322,7 @@ CONFIG_I2C_QUP=m
CONFIG_I2C_RK3X=m
CONFIG_I2C_TEGRA=m
CONFIG_I2C_THUNDERX=m
CONFIG_I2C_XLP9XX=m
CONFIG_I2C_CROS_EC_TUNNEL=m
CONFIG_I2C_XGENE_SLIMPRO=m
......@@ -306,6 +352,17 @@ CONFIG_INPUT_HISI_POWERKEY=m
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_ARM_SMMU=y
CONFIG_ARM_SMMU_V3=y
CONFIG_QCOM_IOMMU=y
##
## file: drivers/irqchip/Kconfig
##
CONFIG_QCOM_IRQ_COMBINER=y
##
## file: drivers/leds/Kconfig
##
CONFIG_LEDS_GPIO=m
##
## file: drivers/mailbox/Kconfig
......@@ -313,8 +370,14 @@ CONFIG_ARM_SMMU_V3=y
CONFIG_MAILBOX=y
CONFIG_BCM2835_MBOX=y
CONFIG_HI6220_MBOX=y
CONFIG_QCOM_APCS_IPC=m
CONFIG_XGENE_SLIMPRO_MBOX=m
##
## file: drivers/media/platform/Kconfig
##
CONFIG_VIDEO_QCOM_VENUS=m
##
## file: drivers/memory/tegra/Kconfig
##
......@@ -351,7 +414,8 @@ CONFIG_MMC=y
## file: drivers/mmc/host/Kconfig
##
CONFIG_MMC_ARMMMCI=m
CONFIG_MMC_QCOM_DML=m
CONFIG_MMC_QCOM_DML=y
CONFIG_MMC_SDHCI_ACPI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_OF_ARASAN=m
CONFIG_MMC_SDHCI_TEGRA=m
......@@ -359,6 +423,7 @@ CONFIG_MMC_SDHCI_IPROC=m
CONFIG_MMC_MESON_GX=m
CONFIG_MMC_SDHCI_MSM=m
CONFIG_MMC_SPI=m
CONFIG_MMC_CAVIUM_THUNDERX=m
CONFIG_MMC_DW=m
CONFIG_MMC_DW_K3=m
CONFIG_MMC_DW_ROCKCHIP=m
......@@ -415,6 +480,11 @@ CONFIG_AMD_XGBE=m
##
CONFIG_NET_XGENE=m
##
## file: drivers/net/ethernet/apm/xgene-v2/Kconfig
##
CONFIG_NET_XGENE_V2=m
##
## file: drivers/net/ethernet/cavium/Kconfig
##
......@@ -463,6 +533,7 @@ CONFIG_E100=m
## file: drivers/net/ethernet/marvell/Kconfig
##
CONFIG_MVNETA=m
CONFIG_MVPP2=m
##
## file: drivers/net/ethernet/natsemi/Kconfig
......@@ -470,6 +541,11 @@ CONFIG_MVNETA=m
CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NATSEMI=m
##
## file: drivers/net/ethernet/qualcomm/Kconfig