OpenCloudOS-Kernel/arch/riscv
Jakub Kicinski d9c960675a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:

drivers/net/ethernet/google/gve/gve.h
  3ce9345580 ("gve: Secure enough bytes in the first TX desc for all TCP pkts")
  75eaae158b ("gve: Add XDP DROP and TX support for GQI-QPL format")
https://lore.kernel.org/all/20230406104927.45d176f5@canb.auug.org.au/
https://lore.kernel.org/all/c5872985-1a95-0bc8-9dcc-b6f23b439e9d@tessares.net/

Adjacent changes:

net/can/isotp.c
  051737439e ("can: isotp: fix race between isotp_sendsmg() and isotp_release()")
  96d1c81e6a ("can: isotp: add module parameter for maximum pdu size")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-04-06 12:01:20 -07:00
..
boot SoC: DT changes for 6.3 2023-02-20 15:49:56 -08:00
configs riscv: defconfig: Enable the Allwinner D1 platform and drivers 2023-01-27 23:10:08 +01:00
errata RISC-V: fix taking the text_mutex twice during sifive errata patching 2023-03-07 12:39:12 -08:00
include Merge patch series "RISC-V: Fixes for riscv_has_extension[un]likely()'s alternative dependency" 2023-03-29 12:23:00 -07:00
kernel RISC-V: Don't check text_mutex during stop_machine 2023-03-09 14:58:51 -08:00
kvm riscv/kvm: Fix VM hang in case of timer delta being zero. 2023-03-17 13:32:54 +05:30
lib riscv, lib: Fix Zbb strncmp 2023-02-28 18:42:38 -08:00
mm riscv: mm: Fix incorrect ASID argument when flushing TLB 2023-03-21 15:55:19 -07:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-03-09 22:22:11 -08:00
purgatory RISC-V: add infrastructure to allow different str* implementations 2023-01-31 11:43:23 -08:00
Kbuild riscv: move errata/ and kvm/ builds to arch/riscv/Kbuild 2022-06-01 22:26:32 -07:00
Kconfig Merge patch series "RISC-V: Fixes for riscv_has_extension[un]likely()'s alternative dependency" 2023-03-29 12:23:00 -07:00
Kconfig.debug
Kconfig.erratas RISC-V: always select RISCV_ALTERNATIVE for non-xip kernels 2023-03-29 11:48:39 -07:00
Kconfig.socs RISC-V Patches for the 6.3 Merge Window, Part 1 2023-02-25 11:14:08 -08:00
Makefile riscv: Handle zicsr/zifencei issues between clang and binutils 2023-03-23 12:52:49 -07:00