diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-27 09:27:01 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-27 09:27:01 +0200 |
commit | 97318d6427f62b723c89f4150f8f48126ef74961 (patch) | |
tree | 771550fabd4b7d67dd4827550bac458036185cb9 /arch/mips/configs | |
parent | usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove... (diff) | |
parent | Linux 6.3-rc4 (diff) | |
download | linux-97318d6427f62b723c89f4150f8f48126ef74961.tar.xz linux-97318d6427f62b723c89f4150f8f48126ef74961.zip |
Merge 6.3-rc4 into usb-next
We need the USB fixes here, and the USB gadget update for future
development patches to be based on.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/configs')
-rw-r--r-- | arch/mips/configs/mtx1_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig index c0c61c37d0b1..58b05eeb3045 100644 --- a/arch/mips/configs/mtx1_defconfig +++ b/arch/mips/configs/mtx1_defconfig @@ -284,6 +284,7 @@ CONFIG_IXGB=m CONFIG_SKGE=m CONFIG_SKY2=m CONFIG_MYRI10GE=m +CONFIG_FEALNX=m CONFIG_NATSEMI=m CONFIG_NS83820=m CONFIG_S2IO=m |