@@ -118,6 +118,15 @@ CONFIG_BLK_DEV_DRBD mark<ENFORCED> note<LP:#17803
CONFIG_XEN_ACPI_PROCESSOR policy<{'amd64': '-'}>
CONFIG_XEN_ACPI_PROCESSOR mark<ENFORCED> note<LP:#1671203>
+CONFIG_USB_XHCI_HCD policy<{'amd64': 'y'}>
+CONFIG_USB_XHCI_HCD mark<ENFORCED> note<LP:#1867002> note<Enable xHCI for PCI passthrough>
+
+CONFIG_USB_XHCI_PCI policy<{'amd64': 'y'}>
+CONFIG_USB_XHCI_PCI mark<ENFORCED> note<LP:#1867002> note<Enable xHCI for PCI passthrough>
+
+CONFIG_USB_XHCI_PLATFORM policy<{'amd64': 'm'}>
+CONFIG_USB_XHCI_PLATFORM mark<ENFORCED> note<LP:#1867002> note<Enable xHCI for PCI passthrough>
+
# From linux-azure initial packaging
CONFIG_POWERCAP policy<{'amd64': 'n'}>
@@ -126,18 +135,15 @@ CONFIG_POWERCAP mark<ENFORCED> note<kernel re
CONFIG_CHROME_PLATFORMS policy<{'amd64': 'n'}>
CONFIG_CHROME_PLATFORMS mark<ENFORCED> note<kernel reduction>
-CONFIG_USB_UHCI_HCD policy<{'amd64': '-'}>
+CONFIG_USB_UHCI_HCD policy<{'amd64': 'n'}>
CONFIG_USB_UHCI_HCD mark<ENFORCED> note<kernel reduction>
-CONFIG_USB_EHCI_HCD policy<{'amd64': '-'}>
+CONFIG_USB_EHCI_HCD policy<{'amd64': 'n'}>
CONFIG_USB_EHCI_HCD mark<ENFORCED> note<kernel reduction>
CONFIG_USB_EHCI_HCD_PLATFORM policy<{'amd64': '-'}>
CONFIG_USB_EHCI_HCD_PLATFORM mark<ENFORCED> note<kernel reduction>
-CONFIG_USB_XHCI_HCD policy<{'amd64': '-'}>
-CONFIG_USB_XHCI_HCD mark<ENFORCED> note<kernel reduction>
-
CONFIG_TOUCHSCREEN_ELAN policy<{'amd64': '-'}>
CONFIG_TOUCHSCREEN_ELAN mark<ENFORCED> note<kernel reduction>
@@ -550,6 +550,7 @@ CONFIG_CAIF_VIRTIO=m
CONFIG_CALGARY_IOMMU=y
CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
CONFIG_CAN=m
+# CONFIG_CAN_8DEV_USB is not set
CONFIG_CAN_BCM=m
CONFIG_CAN_CALC_BITTIMING=y
# CONFIG_CAN_CC770 is not set
@@ -559,17 +560,23 @@ CONFIG_CAN_C_CAN_PLATFORM=m
# CONFIG_CAN_DEBUG_DEVICES is not set
CONFIG_CAN_DEV=m
CONFIG_CAN_EMS_PCI=m
+# CONFIG_CAN_EMS_USB is not set
+# CONFIG_CAN_ESD_USB2 is not set
+# CONFIG_CAN_GS_USB is not set
CONFIG_CAN_GW=m
CONFIG_CAN_HI311X=m
# CONFIG_CAN_IFI_CANFD is not set
CONFIG_CAN_JANZ_ICAN3=m
CONFIG_CAN_KVASER_PCI=m
+# CONFIG_CAN_KVASER_USB is not set
CONFIG_CAN_LEDS=y
+# CONFIG_CAN_MCBA_USB is not set
# CONFIG_CAN_MCP251X is not set
# CONFIG_CAN_M_CAN is not set
CONFIG_CAN_PEAK_PCI=m
CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_PCIEFD=m
+# CONFIG_CAN_PEAK_USB is not set
CONFIG_CAN_PLX_PCI=m
CONFIG_CAN_RAW=m
CONFIG_CAN_SJA1000=m
@@ -936,6 +943,7 @@ CONFIG_CUSE=m
# CONFIG_CXL_LIB is not set
CONFIG_CX_ECAT=m
CONFIG_CYCLADES=m
+# CONFIG_CYPRESS_FIRMWARE is not set
# CONFIG_CYZ_INTR is not set
CONFIG_DA9052_WATCHDOG=m
CONFIG_DA9063_WATCHDOG=m
@@ -1169,6 +1177,7 @@ CONFIG_DRM_RADEON=m
# CONFIG_DRM_RADEON_USERPTR is not set
# CONFIG_DRM_TINYDRM is not set
CONFIG_DRM_TTM=m
+# CONFIG_DRM_UDL is not set
CONFIG_DRM_VBOXVIDEO=m
# CONFIG_DRM_VGEM is not set
CONFIG_DRM_VIRTIO_GPU=m
@@ -1372,6 +1381,7 @@ CONFIG_FB_NOTIFY=y
CONFIG_FB_SM501=m
# CONFIG_FB_SM712 is not set
CONFIG_FB_SM750=m
+# CONFIG_FB_SMSCUFX is not set
# CONFIG_FB_SVGALIB is not set
CONFIG_FB_SYS_COPYAREA=m
CONFIG_FB_SYS_FILLRECT=m
@@ -1380,6 +1390,7 @@ CONFIG_FB_SYS_IMAGEBLIT=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_UDL is not set
# CONFIG_FB_UVESA is not set
# CONFIG_FB_VESA is not set
# CONFIG_FB_VGA16 is not set
@@ -1686,6 +1697,7 @@ CONFIG_HDLC_X25=m
CONFIG_HDMI=y
CONFIG_HDM_DIM2=m
# CONFIG_HDM_I2C is not set
+# CONFIG_HDM_USB is not set
# CONFIG_HEADERS_CHECK is not set
CONFIG_HFSPLUS_FS=m
CONFIG_HFSPLUS_FS_POSIX_ACL=y
@@ -1705,6 +1717,7 @@ CONFIG_HID_ASUS=m
# CONFIG_HID_CHERRY is not set
# CONFIG_HID_CHICONY is not set
# CONFIG_HID_CMEDIA is not set
+# CONFIG_HID_CORSAIR is not set
# CONFIG_HID_CYPRESS is not set
# CONFIG_HID_DRAGONRISE is not set
# CONFIG_HID_ELECOM is not set
@@ -1735,6 +1748,7 @@ CONFIG_HID_NTI=m
# CONFIG_HID_PANTHERLORD is not set
# CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PID is not set
# CONFIG_HID_PLANTRONICS is not set
# CONFIG_HID_PRIMAX is not set
# CONFIG_HID_RMI is not set
@@ -1846,6 +1860,7 @@ CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_DESIGNWARE_PLATFORM=m
# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+# CONFIG_I2C_DIOLAN_U2C is not set
# CONFIG_I2C_EMEV2 is not set
CONFIG_I2C_GPIO=m
CONFIG_I2C_HELPER_AUTO=y
@@ -1869,6 +1884,7 @@ CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_PXA_PCI is not set
+# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SCMI=m
CONFIG_I2C_SIMTEC=m
CONFIG_I2C_SIS5595=m
@@ -1878,6 +1894,7 @@ CONFIG_I2C_SIS96X=m
CONFIG_I2C_SMBUS=m
CONFIG_I2C_STUB=m
CONFIG_I2C_TAOS_EVM=m
+# CONFIG_I2C_TINY_USB is not set
CONFIG_I2C_VIA=m
CONFIG_I2C_VIAPRO=m
CONFIG_I2C_XILINX=m
@@ -1903,6 +1920,7 @@ CONFIG_IEEE802154=m
CONFIG_IEEE802154_6LOWPAN=m
# CONFIG_IEEE802154_ADF7242 is not set
# CONFIG_IEEE802154_AT86RF230 is not set
+# CONFIG_IEEE802154_ATUSB is not set
CONFIG_IEEE802154_CA8210=m
CONFIG_IEEE802154_CA8210_DEBUGFS=y
# CONFIG_IEEE802154_CC2520 is not set
@@ -2005,9 +2023,11 @@ CONFIG_INPUT=y
# CONFIG_INPUT_AD714X is not set
# CONFIG_INPUT_ADXL34X is not set
# CONFIG_INPUT_APANEL is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
# CONFIG_INPUT_ATLAS_BTNS is not set
# CONFIG_INPUT_AXP20X_PEK is not set
# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_CMA3000 is not set
# CONFIG_INPUT_DA9052_ONKEY is not set
# CONFIG_INPUT_DA9063_ONKEY is not set
@@ -2024,9 +2044,11 @@ CONFIG_INPUT_FF_MEMLESS=m
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
+# CONFIG_INPUT_IMS_PCU is not set
CONFIG_INPUT_JOYDEV=m
# CONFIG_INPUT_JOYSTICK is not set
CONFIG_INPUT_KEYBOARD=y
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
# CONFIG_INPUT_KXTJ9 is not set
# CONFIG_INPUT_LEDS is not set
CONFIG_INPUT_MATRIXKMAP=m
@@ -2043,6 +2065,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_PCF8574 is not set
# CONFIG_INPUT_PCSPKR is not set
CONFIG_INPUT_POLLDEV=m
+# CONFIG_INPUT_POWERMATE is not set
# CONFIG_INPUT_REGULATOR_HAPTIC is not set
# CONFIG_INPUT_RETU_PWRBUTTON is not set
CONFIG_INPUT_SPARSEKMAP=m
@@ -2050,6 +2073,7 @@ CONFIG_INPUT_TABLET=y
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_UINPUT=y
# CONFIG_INPUT_WM831X_ON is not set
+# CONFIG_INPUT_YEALINK is not set
CONFIG_INSTRUCTION_DECODER=y
# CONFIG_INT340X_THERMAL is not set
CONFIG_INTEGRITY=y
@@ -2282,20 +2306,27 @@ CONFIG_IRQ_WORK=y
CONFIG_IRTTY_SIR=m
CONFIG_IR_ENE=m
CONFIG_IR_FINTEK=m
+# CONFIG_IR_IGORPLUGUSB is not set
+# CONFIG_IR_IGUANA is not set
+# CONFIG_IR_IMON is not set
CONFIG_IR_ITE_CIR=m
CONFIG_IR_JVC_DECODER=m
CONFIG_IR_LIRC_CODEC=m
+# CONFIG_IR_MCEUSB is not set
CONFIG_IR_MCE_KBD_DECODER=m
CONFIG_IR_NEC_DECODER=m
CONFIG_IR_NUVOTON=m
CONFIG_IR_RC5_DECODER=m
CONFIG_IR_RC6_DECODER=m
+# CONFIG_IR_REDRAT3 is not set
CONFIG_IR_SANYO_DECODER=m
CONFIG_IR_SERIAL=m
CONFIG_IR_SERIAL_TRANSMITTER=y
CONFIG_IR_SHARP_DECODER=m
CONFIG_IR_SIR=m
CONFIG_IR_SONY_DECODER=m
+# CONFIG_IR_STREAMZAP is not set
+# CONFIG_IR_TTUSBIR is not set
CONFIG_IR_WINBOND_CIR=m
CONFIG_IR_XMP_DECODER=m
CONFIG_ISA_BUS=y
@@ -2387,11 +2418,14 @@ CONFIG_KGDB_KDB=y
CONFIG_KGDB_LOW_LEVEL_TRAP=y
CONFIG_KGDB_SERIAL_CONSOLE=y
# CONFIG_KGDB_TESTS is not set
+# CONFIG_KINGSUN_DONGLE is not set
CONFIG_KPROBES=y
CONFIG_KPROBES_ON_FTRACE=y
# CONFIG_KPROBES_SANITY_TEST is not set
CONFIG_KPROBE_EVENTS=y
CONFIG_KRETPROBES=y
+# CONFIG_KS959_DONGLE is not set
+# CONFIG_KSDAZZLE_DONGLE is not set
CONFIG_KSM=y
CONFIG_KVM=m
CONFIG_KVM_AMD=m
@@ -2507,6 +2541,7 @@ CONFIG_LPC_SCH=m
CONFIG_LRU_CACHE=m
# CONFIG_LSI_ET1011C_PHY is not set
CONFIG_LSM_MMAP_MIN_ADDR=0
+# CONFIG_LTE_GDM724X is not set
CONFIG_LWTUNNEL=y
CONFIG_LWTUNNEL_BPF=y
# CONFIG_LXT_PHY is not set
@@ -2555,6 +2590,7 @@ CONFIG_MCB_LPC=m
CONFIG_MCB_PCI=m
# CONFIG_MCORE2 is not set
CONFIG_MCP2120_DONGLE=m
+# CONFIG_MCS_FIR is not set
CONFIG_MD=y
CONFIG_MDIO=m
# CONFIG_MDIO_BITBANG is not set
@@ -2578,6 +2614,7 @@ CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_RADIO_SUPPORT is not set
# CONFIG_MEDIA_SDR_SUPPORT is not set
CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MEDIA_USB_SUPPORT is not set
CONFIG_MEGARAID_LEGACY=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_MM=m
@@ -2618,6 +2655,7 @@ CONFIG_MFD_DA9052_SPI=y
# CONFIG_MFD_DA9062 is not set
CONFIG_MFD_DA9063=m
# CONFIG_MFD_DA9150 is not set
+# CONFIG_MFD_DLN2 is not set
CONFIG_MFD_INTEL_LPSS=m
CONFIG_MFD_INTEL_LPSS_ACPI=m
CONFIG_MFD_INTEL_LPSS_PCI=m
@@ -2651,6 +2689,7 @@ CONFIG_MFD_TPS65086=m
CONFIG_MFD_TPS65912=y
CONFIG_MFD_TPS65912_I2C=m
CONFIG_MFD_TPS65912_SPI=y
+# CONFIG_MFD_VIPERBOARD is not set
CONFIG_MFD_VX855=m
# CONFIG_MFD_WL1273_CORE is not set
CONFIG_MFD_WM5102=y
@@ -2678,6 +2717,7 @@ CONFIG_MINIX_SUBPARTITION=y
CONFIG_MISC_FILESYSTEMS=y
CONFIG_MISC_RTSX=m
CONFIG_MISC_RTSX_PCI=m
+# CONFIG_MISC_RTSX_USB is not set
# CONFIG_MK8 is not set
# CONFIG_MKISS is not set
CONFIG_MLX4_CORE=m
@@ -3060,12 +3100,15 @@ CONFIG_NFC_DIGITAL=m
CONFIG_NFC_HCI=m
# CONFIG_NFC_MICROREAD_I2C is not set
# CONFIG_NFC_MRVL_UART is not set
+# CONFIG_NFC_MRVL_USB is not set
CONFIG_NFC_NCI=m
CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NCI_UART=m
# CONFIG_NFC_NXP_NCI is not set
# CONFIG_NFC_PN533_I2C is not set
+# CONFIG_NFC_PN533_USB is not set
# CONFIG_NFC_PN544_I2C is not set
+# CONFIG_NFC_PORT100 is not set
# CONFIG_NFC_S3FWRN5_I2C is not set
CONFIG_NFC_SHDLC=y
# CONFIG_NFC_SIM is not set
@@ -3277,6 +3320,7 @@ CONFIG_NLS_UTF8=m
CONFIG_NODES_SHIFT=10
CONFIG_NODES_SPAN_OTHER_NODES=y
CONFIG_NOP_TRACER=y
+# CONFIG_NOP_USB_XCEIV is not set
CONFIG_NOTIFIER_ERROR_INJECTION=m
CONFIG_NOZOMI=m
CONFIG_NO_BOOTMEM=y
@@ -3673,6 +3717,7 @@ CONFIG_RCU_PERF_TEST=m
CONFIG_RCU_STALL_COMMON=y
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_TRACE is not set
+# CONFIG_RC_ATI_REMOTE is not set
CONFIG_RC_CORE=m
CONFIG_RC_DECODERS=y
CONFIG_RC_DEVICES=y
@@ -4324,6 +4369,7 @@ CONFIG_SHMEM=y
# CONFIG_SH_TIMER_CMT is not set
# CONFIG_SH_TIMER_MTU2 is not set
# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_SIGMATEL_FIR is not set
CONFIG_SIGNALFD=y
CONFIG_SIGNATURE=y
CONFIG_SIGNED_PE_FILE_VERIFICATION=y
@@ -4494,6 +4540,13 @@ CONFIG_SYSVIPC_SYSCTL=y
CONFIG_SYSV_FS=m
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_TABLET_SERIAL_WACOM4 is not set
+# CONFIG_TABLET_USB_ACECAD is not set
+# CONFIG_TABLET_USB_AIPTEK is not set
+# CONFIG_TABLET_USB_GTCO is not set
+# CONFIG_TABLET_USB_HANWANG is not set
+# CONFIG_TABLET_USB_KBTAB is not set
+# CONFIG_TABLET_USB_PEGASUS is not set
+# CONFIG_TAHVO_USB is not set
CONFIG_TAP=m
CONFIG_TARGET_CORE=m
CONFIG_TASKSTATS=y
@@ -4634,6 +4687,7 @@ CONFIG_TTY=y
CONFIG_TTY_PRINTK=y
CONFIG_TUN=y
# CONFIG_TUN_VNET_CROSS_LE is not set
+# CONFIG_TYPEC is not set
# CONFIG_UBSAN is not set
CONFIG_UCS2_STRING=y
CONFIG_UDF_FS=m
@@ -4670,9 +4724,91 @@ CONFIG_UNWINDER_FRAME_POINTER=y
# CONFIG_UNWINDER_ORC is not set
CONFIG_UPROBES=y
CONFIG_UPROBE_EVENTS=y
+CONFIG_USB=y
+# CONFIG_USBIP_CORE is not set
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ATM is not set
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_CHAOSKEY is not set
+CONFIG_USB_COMMON=y
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_DEFAULT_PERSIST is not set
+# CONFIG_USB_DWC2 is not set
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EZUSB_FX2 is not set
+# CONFIG_USB_FOTG210_HCD is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+# CONFIG_USB_HID is not set
+# CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_HSIC_USB4604 is not set
+# CONFIG_USB_HUB_USB251XB is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_IRDA is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_ISP1760 is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+# CONFIG_USB_LED_TRIG is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
+# CONFIG_USB_MAX3421_HCD is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_NET_DRIVERS is not set
+# CONFIG_USB_OHCI_HCD is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_SUPPORT is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+CONFIG_USB_PCI=y
+# CONFIG_USB_PHY is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_STORAGE is not set
+CONFIG_USB_SUPPORT=y
CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_TMC is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_ULPI_BUS is not set
+# CONFIG_USB_USS720 is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_WUSB_CBAF is not set
+CONFIG_USB_XHCI_DBGCAP=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_XHCI_PLATFORM=m
+# CONFIG_USB_YUREX is not set
CONFIG_USELIB=y
CONFIG_USERFAULTFD=y
CONFIG_USERIO=m
BugLink: https://bugs.launchpad.net/bugs/1867002 The module drivers/usb/host/xhci-plat-hcd.ko is already included to the main modules package by the current rules. Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com> --- debian.azure/config/annotations | 16 ++- debian.azure/config/config.common.ubuntu | 138 ++++++++++++++++++++++- 2 files changed, 148 insertions(+), 6 deletions(-)