Skip to content

Commit

Permalink
Sync with Debian debian/4.9.25-1_bpo8+1 (commit 1456081e825130fa)
Browse files Browse the repository at this point in the history
  • Loading branch information
mika committed May 24, 2017
1 parent 1d4978f commit 12494c7
Show file tree
Hide file tree
Showing 50 changed files with 1,222 additions and 1,063 deletions.
333 changes: 328 additions & 5 deletions linux/debian/config/config

Large diffs are not rendered by default.

30 changes: 29 additions & 1 deletion linux/debian/config/defines
Expand Up @@ -2,9 +2,22 @@
abiname: 1-grml
ignore-changes:
__cpuhp_*
bpf_analyzer
cxl_*
mm_iommu_*
register_cxl_calls
unregister_cxl_calls
module:arch/x86/kvm/*
module:drivers/hv/*
module:drivers/iio/common/st_sensors/**
module:drivers/net/wireless/**
module:drivers/nvdimm/*
module:drivers/power/supply/bq27xxx_battery
module:drivers/scsi/cxgbi/*
module:drivers/scsi/libiscs*
module:drivers/scsi/qla2xxx/qla2xxx
module:drivers/scsi/ufs/*
module:drivers/target/**
module:drivers/usb/host/**
module:drivers/usb/musb/**
module:net/ceph/libceph
Expand All @@ -14,6 +27,20 @@ ignore-changes:
# Exported for related protocols only
can_rx_register
ip6_xmit
module:net/dccp/dccp
module:net/rds/rds
# devfreq is unlikely to be useful for OOT modules
devfreq_*
devm_devfreq_*
update_devfreq
# Assume IB drivers are added/updated through OFED, which also updates IB core
module:drivers/infiniband/**
# Declared in private header, not usable OOT
acpi_ec_add_query_handler
acpi_ec_remove_query_handler
first_ec
# Exported for tracefs only
debugfs_create_automount

[base]
arches:
Expand Down Expand Up @@ -56,7 +83,8 @@ featuresets:
# rt

[build]
# Enable module signing by default (implemented in the linux-signed package)
debug-info: false
# Disable module signing for now
signed-modules: false

[featureset-rt_base]
Expand Down
2 changes: 1 addition & 1 deletion linux/debian/config/featureset-rt/config
Expand Up @@ -6,4 +6,4 @@ CONFIG_WAKEUP_LATENCY_HIST=y
CONFIG_RCU_EXPERT=y
#. Certificate paths are resolved relative to debian/build/source_rt
CONFIG_SYSTEM_TRUSTED_KEYS="../../certs/benh@debian.org.cert.pem"
CONFIG_HWLAT_DETECTOR=m
CONFIG_HWLAT_TRACER=y
5 changes: 0 additions & 5 deletions linux/debian/config/i386/config.686
Expand Up @@ -41,11 +41,6 @@ CONFIG_KEYBOARD_GPIO_POLLED=m
##
CONFIG_MOUSE_PS2_OLPC=y

##
## file: drivers/leds/Kconfig
##
CONFIG_LEDS_GPIO=m

##
## file: drivers/net/hamradio/Kconfig
##
Expand Down
2 changes: 0 additions & 2 deletions linux/debian/config/i386/defines
@@ -1,6 +1,4 @@
[base]
#flavours:
# 686
featuresets:
none
# rt
Expand Down
33 changes: 33 additions & 0 deletions linux/debian/config/kernelarch-x86/config
Expand Up @@ -412,7 +412,11 @@ CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
## file: drivers/crypto/qat/Kconfig
##
CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
CONFIG_CRYPTO_DEV_QAT_C3XXX=m
CONFIG_CRYPTO_DEV_QAT_C62X=m
CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
CONFIG_CRYPTO_DEV_QAT_C62XVF=m

##
## file: drivers/dma/Kconfig
Expand Down Expand Up @@ -451,6 +455,7 @@ CONFIG_EDAC_R82600=m
CONFIG_EDAC_I5000=m
CONFIG_EDAC_I5100=m
CONFIG_EDAC_I7300=m
CONFIG_EDAC_SKX=m
CONFIG_EDAC_AMD8131=m
CONFIG_EDAC_AMD8111=m

Expand Down Expand Up @@ -481,6 +486,7 @@ CONFIG_EFI_RUNTIME_MAP=y
## file: drivers/gpio/Kconfig
##
CONFIG_GPIOLIB=y
CONFIG_GPIO_AMDPT=m
# CONFIG_GPIO_ICH is not set
# CONFIG_GPIO_LYNXPOINT is not set
# CONFIG_GPIO_F7188X is not set
Expand All @@ -501,6 +507,11 @@ CONFIG_DRM_R128=m
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m

##
## file: drivers/gpu/drm/amd/acp/Kconfig
##
CONFIG_DRM_AMD_ACP=y

##
## file: drivers/gpu/drm/amd/amdgpu/Kconfig
##
Expand Down Expand Up @@ -630,6 +641,15 @@ CONFIG_SENSORS_W83L785TS=m
CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_ACPI_POWER=m

##
## file: drivers/hwtracing/intel_th/Kconfig
##
CONFIG_INTEL_TH=m
CONFIG_INTEL_TH_PCI=m
CONFIG_INTEL_TH_GTH=m
CONFIG_INTEL_TH_MSU=m
CONFIG_INTEL_TH_PTI=m

##
## file: drivers/i2c/Kconfig
##
Expand Down Expand Up @@ -792,6 +812,7 @@ CONFIG_HYPERV_KEYBOARD=m
##
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_TSC_SERIO=m
CONFIG_TOUCHSCREEN_SURFACE3_SPI=m

##
## file: drivers/iommu/Kconfig
Expand Down Expand Up @@ -1334,6 +1355,7 @@ CONFIG_PINCTRL_SUNRISEPOINT=y
CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_LAPTOP=m
CONFIG_CHROMEOS_PSTORE=m
CONFIG_CROS_KBD_LED_BACKLIGHT=m

##
## file: drivers/platform/x86/Kconfig
Expand Down Expand Up @@ -1382,6 +1404,7 @@ CONFIG_ACPI_TOSHIBA=m
CONFIG_TOSHIBA_BT_RFKILL=m
CONFIG_TOSHIBA_HAPS=m
CONFIG_ACPI_CMPC=m
CONFIG_INTEL_HID_EVENT=m
CONFIG_INTEL_VBTN=m
CONFIG_INTEL_IPS=m
CONFIG_IBM_RTL=m
Expand Down Expand Up @@ -1512,8 +1535,10 @@ CONFIG_COMEDI_ADL_PCI8164=m
CONFIG_COMEDI_ADL_PCI9111=m
CONFIG_COMEDI_ADL_PCI9118=m
CONFIG_COMEDI_ADV_PCI1710=m
CONFIG_COMEDI_ADV_PCI1720=m
CONFIG_COMEDI_ADV_PCI1723=m
CONFIG_COMEDI_ADV_PCI1724=m
CONFIG_COMEDI_ADV_PCI1760=m
CONFIG_COMEDI_ADV_PCI_DIO=m
CONFIG_COMEDI_AMPLC_DIO200_PCI=m
CONFIG_COMEDI_AMPLC_PC236_PCI=m
Expand Down Expand Up @@ -1657,6 +1682,7 @@ CONFIG_INTEL_PCH_THERMAL=m
## file: drivers/thermal/int340x_thermal/Kconfig
##
CONFIG_INT340X_THERMAL=m
CONFIG_INT3406_THERMAL=m

##
## file: drivers/thunderbolt/Kconfig
Expand Down Expand Up @@ -1736,6 +1762,8 @@ CONFIG_USB_SL811_CS=m
##
CONFIG_USBIP_CORE=m
CONFIG_USBIP_VHCI_HCD=m
CONFIG_USBIP_VHCI_HC_PORTS=31
CONFIG_USBIP_VHCI_NR_HCS=8
CONFIG_USBIP_HOST=m
# CONFIG_USBIP_DEBUG is not set

Expand Down Expand Up @@ -2039,6 +2067,11 @@ CONFIG_SND_HDA_INTEL=m
##
CONFIG_SND_SOC=m

##
## file: sound/soc/amd/Kconfig
##
CONFIG_SND_SOC_AMD_ACP=m

##
## file: sound/soc/intel/Kconfig
##
Expand Down

This file was deleted.

@@ -1,8 +1,7 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 03 Nov 2016 15:25:26 -0600
Subject: cpupower: Fix checks for CPU existence
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=135391
Bug-Debian: https://bugs.debian.org/843071
Forwarded: https://marc.info/?l=linux-pm&m=149248268214265

Calls to cpufreq_cpu_exists(cpu) were converted to
cpupower_is_cpu_online(cpu) when libcpupower was introduced and the
Expand All @@ -16,9 +15,6 @@ cpufreq-set has already been fixed (commit c25badc9ceb6).
In cpufreq-bench, which prints an error message for offline CPUs,
properly distinguish and report the zero and negative cases.

Reported-by: Jose <jjorge@free.fr>
Reported-by: Julien RIVAUD <frnchfrgg@free.fr>
Cc: stable <stable@vger.kernel.org> # 4.7+
Fixes: ac5a181d065d ("cpupower: Add cpuidle parts into library")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
Expand Down

0 comments on commit 12494c7

Please sign in to comment.