From: Peter Michael Green Date: Tue, 26 Apr 2016 15:34:06 +0000 (+0000) Subject: extract packaging changes from 4.4.6-1+rpi5 (6eb28159c97d4462390f54c83580c024dff4d103) X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~21 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d6875604508986d6a5a537ea36d811543be80cdb;p=linux-4.9.git extract packaging changes from 4.4.6-1+rpi5 (6eb28159c97d4462390f54c83580c024dff4d103) --- diff --git a/debian/changelog b/debian/changelog index 278ddd893208..4e59eca68868 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux-4.4 (4.4.6-1+rpi5) jessie-staging; urgency=medium + + * Unshelve some more config settings. + + -- Peter Michael Green Tue, 26 Apr 2016 15:34:06 +0000 + linux-4.4 (4.4.6-1+rpi4) jessie-staging; urgency=medium * With previous version rpi2 kernel booted but rpi kernel didn't. diff --git a/debian/config/armhf/config.shelved b/debian/config/armhf/config.shelved index e5ff53f96e66..f4a1226c3952 100644 --- a/debian/config/armhf/config.shelved +++ b/debian/config/armhf/config.shelved @@ -1,203 +1,3 @@ -++ ../linux-4.4-4.4.6-1+rpi2/debian/config/armhf/config.rpix 2016-04-17 02:05:52.000000000 +0000 -#!!!!!!Changes from foundation config added for testing.!!!!!!!! -# CONFIG_KERNEL_XZ is not set -# CONFIG_AUDIT is not set -# CONFIG_RCU_STALL_COMMON is not set -# CONFIG_CGROUP_PIDS is not set -# CONFIG_MEMCG_SWAP is not set -# CONFIG_CGROUP_PERF is not set -# CONFIG_CFS_BANDWIDTH is not set -# CONFIG_CHECKPOINT_RESTORE is not set -# CONFIG_USER_NS is not set -# CONFIG_BPF_SYSCALL is not set -# CONFIG_UPROBES is not set -# CONFIG_MODULE_FORCE_LOAD is not set -# CONFIG_MODULE_FORCE_UNLOAD is not set -# CONFIG_BLK_DEV_INTEGRITY is not set -# CONFIG_KARMA_PARTITION is not set -# CONFIG_KSM is not set -# CONFIG_ZSWAP is not set -# CONFIG_ZPOOL is not set -# CONFIG_ZBUD is not set -# CONFIG_KEXEC is not set -# CONFIG_CPU_IDLE is not set -# CONFIG_FPE_NWFPE is not set -# CONFIG_FPE_FASTFPE is not set -# CONFIG_SUSPEND is not set -# CONFIG_HIBERNATION is not set -# CONFIG_PM is not set -# CONFIG_ARM_CPU_SUSPEND is not set -# CONFIG_PACKET_DIAG is not set -# CONFIG_UNIX_DIAG is not set -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -# CONFIG_NET_KEY_MIGRATE is not set -# CONFIG_IP_FIB_TRIE_STATS is not set -# CONFIG_IP_PNP_BOOTP is not set -# CONFIG_NET_IPGRE_BROADCAST is not set -# CONFIG_NET_IPVTI is not set -# CONFIG_NET_FOU is not set -# CONFIG_NET_FOU_IP_TUNNELS is not set -# CONFIG_INET_UDP_DIAG is not set -# CONFIG_TCP_CONG_ADVANCED is not set -# CONFIG_TCP_MD5SIG is not set -# CONFIG_IPV6_ROUTE_INFO is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -# CONFIG_IPV6_VTI is not set -# CONFIG_IPV6_SIT_6RD is not set -# CONFIG_IPV6_GRE is not set -# CONFIG_NETWORK_SECMARK is not set -# CONFIG_NET_PTP_CLASSIFY is not set -# CONFIG_NF_CONNTRACK_TIMEOUT is not set -# CONFIG_NF_CT_NETLINK_TIMEOUT is not set -# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set -# CONFIG_NF_TABLES is not set -# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set -# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set -# CONFIG_IP_SET_HASH_IPMARK is not set -# CONFIG_IP_SET_HASH_MAC is not set -# CONFIG_IP_SET_HASH_NETPORTNET is not set -# CONFIG_IP_SET_HASH_NETNET is not set -# CONFIG_IP_VS_IPV6 is not set -# CONFIG_IP_VS_FO is not set -# CONFIG_IP_VS_OVF is not set -# CONFIG_NF_LOG_ARP is not set -# CONFIG_IP_NF_MATCH_RPFILTER is not set -# CONFIG_IP_NF_TARGET_SYNPROXY is not set -# CONFIG_IP6_NF_MATCH_RPFILTER is not set -# CONFIG_IP6_NF_TARGET_SYNPROXY is not set -# CONFIG_IP_DCCP is not set -# CONFIG_NET_SCTPPROBE is not set -# CONFIG_RDS is not set -# CONFIG_TIPC is not set -# CONFIG_ATM_CLIP is not set -# CONFIG_ATM_LANE is not set -# CONFIG_ATM_BR2684 is not set -# CONFIG_L2TP_DEBUGFS is not set -# CONFIG_BRIDGE_VLAN_FILTERING is not set -# CONFIG_VLAN_8021Q_MVRP is not set -# CONFIG_LLC2 is not set -# CONFIG_DEV_APPLETALK is not set -# CONFIG_PHONET is not set -# CONFIG_NET_SCH_ATM is not set -# CONFIG_NET_SCH_FQ is not set -# CONFIG_NET_SCH_HHF is not set -# CONFIG_NET_SCH_PIE is not set -# CONFIG_CLS_U32_PERF is not set -# CONFIG_NET_CLS_BPF is not set -# CONFIG_NET_CLS_FLOWER is not set -# CONFIG_NET_EMATCH_CANID is not set -# CONFIG_NET_ACT_VLAN is not set -# CONFIG_NET_ACT_BPF is not set -# CONFIG_NET_ACT_CONNMARK is not set -# CONFIG_NET_CLS_IND is not set -# CONFIG_DCB is not set -# CONFIG_BATMAN_ADV_DAT is not set -# CONFIG_BATMAN_ADV_NC is not set -# CONFIG_BATMAN_ADV_MCAST is not set -# CONFIG_NETLINK_MMAP is not set -# CONFIG_NETLINK_DIAG is not set -# CONFIG_MPLS_ROUTING is not set -# CONFIG_NET_L3_MASTER_DEV is not set -# CONFIG_CGROUP_NET_PRIO is not set -# CONFIG_BPF_JIT is not set -# CONFIG_NET_DROP_MONITOR is not set -# -# Packet Radio protocols -# -# -# AX.25 network device drivers -# -# CONFIG_CAN_SLCAN is not set -# CONFIG_CAN_SJA1000 is not set -# CONFIG_CAN_EMS_USB is not set -# CONFIG_CAN_ESD_USB2 is not set -# CONFIG_CAN_GS_USB is not set -# CONFIG_CAN_KVASER_USB is not set -# CONFIG_CAN_PEAK_USB is not set -# CONFIG_CAN_8DEV_USB is not set -# CONFIG_CAN_SOFTING is not set -# -# IrDA protocols -# -# -# IrDA options -# -# CONFIG_IRDA_DEBUG is not set -# -# Infrared-port device drivers -# -# -# SIR device drivers -# -# -# Dongle support -# -# CONFIG_DONGLE is not set -# -# FIR device drivers -# -# CONFIG_BT_HCIBTSDIO is not set -# CONFIG_BT_HCIUART_ATH3K is not set -# CONFIG_BT_HCIUART_LL is not set -# CONFIG_BT_HCIUART_INTEL is not set -# CONFIG_BT_HCIUART_QCA is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_CEPH_LIB is not set -# CONFIG_NFC_DIGITAL is not set -# CONFIG_NFC_SIM is not set -# CONFIG_LWTUNNEL is not set -# CONFIG_MTD_AR7_PARTS is not set -# CONFIG_MTD_BLOCK_RO is not set -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set -# CONFIG_MTD_OOPS is not set -# CONFIG_MTD_SWAP is not set -# CONFIG_MTD_RAM is not set -# CONFIG_MTD_PLATRAM is not set -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_SST25L is not set -# CONFIG_MTD_NAND_ECC_BCH is not set -# CONFIG_MTD_NAND_NANDSIM is not set -# CONFIG_MTD_ONENAND is not set -# CONFIG_MTD_LPDDR is not set -# CONFIG_MTD_SPI_NOR is not set -# CONFIG_MTD_UBI_BLOCK is not set -# CONFIG_PARPORT is not set -# CONFIG_BLK_DEV_NULL_BLK is not set -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_BLK_DEV_RBD is not set -# CONFIG_SENSORS_LIS3LV02D is not set -# CONFIG_AD525X_DPOT is not set -# CONFIG_ICS932S401 is not set -# CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_APDS9802ALS is not set -# CONFIG_ISL29003 is not set -# CONFIG_ISL29020 is not set -# CONFIG_SENSORS_TSL2550 is not set -# CONFIG_SENSORS_BH1780 is not set -# CONFIG_SENSORS_BH1770 is not set -# CONFIG_SENSORS_APDS990X is not set -# CONFIG_HMC6352 is not set -# CONFIG_DS1682 is not set -# CONFIG_TI_DAC7512 is not set -# CONFIG_C2PORT is not set -# CONFIG_EEPROM_AT25 is not set -# CONFIG_EEPROM_LEGACY is not set -# CONFIG_EEPROM_MAX6875 is not set -# CONFIG_SENSORS_LIS3_I2C is not set -# CONFIG_RAID_ATTRS is not set -# CONFIG_SCSI_NETLINK is not set -# CONFIG_BLK_DEV_SR_VENDOR is not set -# CONFIG_CHR_DEV_SCH is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_UFSHCD is not set # CONFIG_SCSI_DH is not set diff --git a/debian/config/armhf/config.test b/debian/config/armhf/config.test index 9cd6c9892a74..8406ed73effa 100644 --- a/debian/config/armhf/config.test +++ b/debian/config/armhf/config.test @@ -53,3 +53,204 @@ CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_IA64=y CONFIG_XZ_DEC_SPARC=y CONFIG_OID_REGISTRY=y + + +# CONFIG_KERNEL_XZ is not set +# CONFIG_AUDIT is not set +# CONFIG_RCU_STALL_COMMON is not set +# CONFIG_CGROUP_PIDS is not set +# CONFIG_MEMCG_SWAP is not set +# CONFIG_CGROUP_PERF is not set +# CONFIG_CFS_BANDWIDTH is not set +# CONFIG_CHECKPOINT_RESTORE is not set +# CONFIG_USER_NS is not set +# CONFIG_BPF_SYSCALL is not set +# CONFIG_UPROBES is not set +# CONFIG_MODULE_FORCE_LOAD is not set +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_BLK_DEV_INTEGRITY is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_KSM is not set +# CONFIG_ZSWAP is not set +# CONFIG_ZPOOL is not set +# CONFIG_ZBUD is not set +# CONFIG_KEXEC is not set +# CONFIG_CPU_IDLE is not set +# CONFIG_FPE_NWFPE is not set +# CONFIG_FPE_FASTFPE is not set +# CONFIG_SUSPEND is not set +# CONFIG_HIBERNATION is not set +# CONFIG_PM is not set +# CONFIG_ARM_CPU_SUSPEND is not set +# CONFIG_PACKET_DIAG is not set +# CONFIG_UNIX_DIAG is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_NET_KEY_MIGRATE is not set +# CONFIG_IP_FIB_TRIE_STATS is not set +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_NET_IPGRE_BROADCAST is not set +# CONFIG_NET_IPVTI is not set +# CONFIG_NET_FOU is not set +# CONFIG_NET_FOU_IP_TUNNELS is not set +# CONFIG_INET_UDP_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6_ROUTE_INFO is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +# CONFIG_IPV6_VTI is not set +# CONFIG_IPV6_SIT_6RD is not set +# CONFIG_IPV6_GRE is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NET_PTP_CLASSIFY is not set +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +# CONFIG_NF_CT_NETLINK_TIMEOUT is not set +# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set +# CONFIG_NF_TABLES is not set +# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set +# CONFIG_IP_SET_HASH_IPMARK is not set +# CONFIG_IP_SET_HASH_MAC is not set +# CONFIG_IP_SET_HASH_NETPORTNET is not set +# CONFIG_IP_SET_HASH_NETNET is not set +# CONFIG_IP_VS_IPV6 is not set +# CONFIG_IP_VS_FO is not set +# CONFIG_IP_VS_OVF is not set +# CONFIG_NF_LOG_ARP is not set +# CONFIG_IP_NF_MATCH_RPFILTER is not set +# CONFIG_IP_NF_TARGET_SYNPROXY is not set +# CONFIG_IP6_NF_MATCH_RPFILTER is not set +# CONFIG_IP6_NF_TARGET_SYNPROXY is not set +# CONFIG_IP_DCCP is not set +# CONFIG_NET_SCTPPROBE is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM_CLIP is not set +# CONFIG_ATM_LANE is not set +# CONFIG_ATM_BR2684 is not set +# CONFIG_L2TP_DEBUGFS is not set +# CONFIG_BRIDGE_VLAN_FILTERING is not set +# CONFIG_VLAN_8021Q_MVRP is not set +# CONFIG_LLC2 is not set +# CONFIG_DEV_APPLETALK is not set +# CONFIG_PHONET is not set +# CONFIG_NET_SCH_ATM is not set +# CONFIG_NET_SCH_FQ is not set +# CONFIG_NET_SCH_HHF is not set +# CONFIG_NET_SCH_PIE is not set +# CONFIG_CLS_U32_PERF is not set +# CONFIG_NET_CLS_BPF is not set +# CONFIG_NET_CLS_FLOWER is not set +# CONFIG_NET_EMATCH_CANID is not set +# CONFIG_NET_ACT_VLAN is not set +# CONFIG_NET_ACT_BPF is not set +# CONFIG_NET_ACT_CONNMARK is not set +# CONFIG_NET_CLS_IND is not set +# CONFIG_DCB is not set +# CONFIG_BATMAN_ADV_DAT is not set +# CONFIG_BATMAN_ADV_NC is not set +# CONFIG_BATMAN_ADV_MCAST is not set +# CONFIG_NETLINK_MMAP is not set + +# settings unshelved in +rpi6# CONFIG_NETLINK_DIAG is not set +# CONFIG_MPLS_ROUTING is not set +# CONFIG_NET_L3_MASTER_DEV is not set +# CONFIG_CGROUP_NET_PRIO is not set +# CONFIG_BPF_JIT is not set +# CONFIG_NET_DROP_MONITOR is not set +# +# Packet Radio protocols +# +# +# AX.25 network device drivers +# +# CONFIG_CAN_SLCAN is not set +# CONFIG_CAN_SJA1000 is not set +# CONFIG_CAN_EMS_USB is not set +# CONFIG_CAN_ESD_USB2 is not set +# CONFIG_CAN_GS_USB is not set +# CONFIG_CAN_KVASER_USB is not set +# CONFIG_CAN_PEAK_USB is not set +# CONFIG_CAN_8DEV_USB is not set +# CONFIG_CAN_SOFTING is not set +# +# IrDA protocols +# +# +# IrDA options +# +# CONFIG_IRDA_DEBUG is not set +# +# Infrared-port device drivers +# +# +# SIR device drivers +# +# +# Dongle support +# +# CONFIG_DONGLE is not set +# +# FIR device drivers +# +# CONFIG_BT_HCIBTSDIO is not set +# CONFIG_BT_HCIUART_ATH3K is not set +# CONFIG_BT_HCIUART_LL is not set +# CONFIG_BT_HCIUART_INTEL is not set +# CONFIG_BT_HCIUART_QCA is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_CEPH_LIB is not set +# CONFIG_NFC_DIGITAL is not set +# CONFIG_NFC_SIM is not set +# CONFIG_LWTUNNEL is not set +# CONFIG_MTD_AR7_PARTS is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set +# CONFIG_MTD_SWAP is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_PLATRAM is not set +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_ONENAND is not set +# CONFIG_MTD_LPDDR is not set +# CONFIG_MTD_SPI_NOR is not set +# CONFIG_MTD_UBI_BLOCK is not set +# CONFIG_PARPORT is not set +# CONFIG_BLK_DEV_NULL_BLK is not set +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +# CONFIG_BLK_DEV_RBD is not set +# CONFIG_SENSORS_LIS3LV02D is not set +# CONFIG_AD525X_DPOT is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_APDS9802ALS is not set +# CONFIG_ISL29003 is not set +# CONFIG_ISL29020 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_SENSORS_BH1780 is not set +# CONFIG_SENSORS_BH1770 is not set +# CONFIG_SENSORS_APDS990X is not set +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_C2PORT is not set +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_SENSORS_LIS3_I2C is not set +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_BLK_DEV_SR_VENDOR is not set +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set