From: Daniel Golle <daniel@makrotopia.org>
Date: Thu, 6 Aug 2020 14:57:22 +0000 (+0100)
Subject: Revert "procd: update to git HEAD"
X-Git-Tag: v21.02.0-rc1~1984
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=728a0c68d15ede323b913942f3a6c2e0e8d4780e;p=openwrt%2Fstaging%2Fchunkeey.git

Revert "procd: update to git HEAD"

This reverts commit e0e607f0d000e62c6af8d822d7c3f57c2a582136.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk
index 8a7232d8be..fbd3c81911 100644
--- a/package/kernel/linux/modules/block.mk
+++ b/package/kernel/linux/modules/block.mk
@@ -565,17 +565,3 @@ define KernelPackage/scsi-tape
 endef
 
 $(eval $(call KernelPackage,scsi-tape))
-
-define KernelPackage/iosched-bfq
-  SUBMENU:=$(BLOCK_MENU)
-  TITLE:=Kernel support for BFQ I/O scheduler
-  KCONFIG:= \
-    CONFIG_IOSCHED_BFQ \
-    CONFIG_BFQ_GROUP_IOSCHED=y \
-    CONFIG_BFQ_CGROUP_DEBUG=n
-  FILES:= \
-    $(LINUX_DIR)/block/bfq.ko
-  AUTOLOAD:=$(call AutoLoad,10,bfq)
-endef
-
-$(eval $(call KernelPackage,iosched-bfq))
diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 6e9433b7c3..4373149ff9 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
-PKG_SOURCE_DATE:=2020-08-06
-PKG_SOURCE_VERSION:=16159bb1f70f662738395f2750a7a5e74a410408
-PKG_MIRROR_HASH:=52189cf7ded713524e5afb94132665e2558be24c7c64fda89be4341bbe3af8c4
+PKG_SOURCE_DATE:=2020-07-30
+PKG_SOURCE_VERSION:=2ae5cbcf1d4509837a16eceafca374e9bf0ea850
+PKG_MIRROR_HASH:=479d4a4bfb71ef54300e7b669846e596db7792566302b4d29e3265643d89bce3
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4
index 7755bf4cba..dbd23ce0f4 100644
--- a/target/linux/x86/config-5.4
+++ b/target/linux/x86/config-5.4
@@ -56,13 +56,17 @@ CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ATA=y
 CONFIG_ATA_GENERIC=y
 CONFIG_ATA_PIIX=y
+# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BOUNCE=y
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_CLKBLD_I8253=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKEVT_I8253=y
@@ -88,8 +92,8 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
 CONFIG_CPU_IDLE_GOV_LADDER=y
+# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_CYRIX_32=y
@@ -141,7 +145,9 @@ CONFIG_EFI_EARLYCON=y
 # CONFIG_EISA is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXT4_FS=y
+# CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
+# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_STAT_FS=y
 # CONFIG_F71808E_WDT is not set
@@ -185,8 +191,9 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_VDSO_32=y
 # CONFIG_GEOS is not set
 CONFIG_GLOB=y
-# CONFIG_HALTPOLL_CPUIDLE is not set
+# CONFIG_HABANA_AI is not set
 # CONFIG_HANGCHECK_TIMER is not set
+# CONFIG_HALTPOLL_CPUIDLE is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
@@ -272,8 +279,10 @@ CONFIG_I8253_LOCK=y
 # CONFIG_IBMASR is not set
 # CONFIG_IBM_RTL is not set
 # CONFIG_IE6XX_WDT is not set
+# CONFIG_IGC is not set
 CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INIT_STACK_NONE=y
 CONFIG_INPUT=y
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INSTRUCTION_DECODER=y
@@ -323,6 +332,7 @@ CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_MIGRATION=y
+# CONFIG_MISC_ALCOR_PCI is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
@@ -378,6 +388,7 @@ CONFIG_PCI_GOANY=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_LABEL=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
+# CONFIG_PCI_MESON is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCSPKR_PLATFORM=y
@@ -407,6 +418,7 @@ CONFIG_RTC_MC146818_LIB=y
 # CONFIG_SC1200_WDT is not set
 CONFIG_SCSI=y
 # CONFIG_SCSI_FDOMAIN_ISA is not set
+# CONFIG_SCSI_MYRS is not set
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y
@@ -432,6 +444,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TINY_SRCU=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_TQMX86_WDT is not set
 CONFIG_UNWINDER_FRAME_POINTER=y
@@ -439,6 +452,7 @@ CONFIG_UNWINDER_FRAME_POINTER=y
 CONFIG_UP_LATE_INIT=y
 CONFIG_USB=y
 CONFIG_USB_COMMON=y
+# CONFIG_USB_EHCI_FSL is not set
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EHCI_PCI=y