Fixup recent kconfig cleanup
Commit 8551799e01 [Resolve v5.10 kernel configuration file differences] disabled CONFIG_NET_TEAM by accident, so enable it. Additionally bpf_testmodule test failed if we disable CONFIG_KPROBES. bpf_testmodule (keyword: ) test results: * Check kernel config(do_prepare) FAIL ERROR CMD OR INFO IS : line:64 "CONFIG_KPROBES=y, CONFIG_KPROBE_EVENTS=y, is expected" Verification: BPF related test and formal regression tests were carried out by colleagues in the test team at Wind River. Closes-Bug: #1951765 Signed-off-by: Jiping Ma <jiping.ma2@windriver.com> Change-Id: Id43301c3fed44dc130e0568cdc7cb8e1cd94dde4
This commit is contained in:
parent
e0a913e78a
commit
c9cdb90276
@ -116,7 +116,6 @@ CONFIG_DP83640_PHY=y
|
||||
# CONFIG_PANIC_ON_OOPS is not set
|
||||
# CONFIG_SOUND is not set
|
||||
# CONFIG_FIREWIRE is not set
|
||||
# CONFIG_KPROBES is not set
|
||||
# CONFIG_XEN is not set
|
||||
# CONFIG_BT is not set
|
||||
# CONFIG_USB_USBNET is not set
|
||||
@ -1594,7 +1593,3 @@ CONFIG_SERIAL_8250_LPSS=y
|
||||
CONFIG_ZRAM_WRITEBACK=y
|
||||
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
|
||||
# CONFIG_CMA is not set
|
||||
#
|
||||
# IEEE 1394 (FireWire) support
|
||||
#
|
||||
# CONFIG_NET_TEAM is not set
|
||||
|
Loading…
x
Reference in New Issue
Block a user