github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-12 00:23:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
f9d1b18dda
linux/drivers/net/usb
History
Tao Huang 582f79266f Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 
* android12-5.10: (2274 commits)
  FROMGIT: mm: slub: move sysfs slab alloc/free interfaces to debugfs
  ANDROID: gki - CONFIG_NET_SCH_FQ=y
  ANDROID: GKI: Kconfig.gki: Add GKI_HIDDEN_ETHERNET_CONFIGS
  FROMLIST: media: Kconfig: Fix DVB_CORE can't be selected as module
  ANDROID: Update ABI and symbol list
  Revert "net: usb: cdc_ncm: don't spew notifications"
  ANDROID: Fips 140: move fips symbols entirely in own list
  ANDROID: core of xt_IDLETIMER send_nl_msg support
  ANDROID: start to re-add xt_IDLETIMER send_nl_msg support
  ANDROID: add fips140.ko symbols to module ABI
  ANDROID: inject correct HMAC digest into fips140.ko at build time
  ANDROID: crypto: fips140 - perform load time integrity check
  FROMLIST: crypto: shash - stop comparing function pointers to avoid breaking CFI
  ANDROID: arm64: module: preserve RELA sections for FIPS140 integrity selfcheck
  ANDROID: arm64: simd: omit capability check in may_use_simd()
  ANDROID: kbuild: lto: permit the use of .a archives in LTO modules
  ANDROID: arm64: only permit certain alternatives in the FIPS140 module
  ANDROID: crypto: lib/aes - add vendor hooks for AES library routines
  ANDROID: crypto: lib/sha256 - add vendor hook for sha256() routine
  UPSTREAM: KVM: arm64: Mark the host stage-2 memory pools static
  ...

Conflicts:
	drivers/mmc/core/mmc_ops.c
	drivers/usb/gadget/function/f_uac1.c
	drivers/usb/gadget/function/f_uac2.c
	drivers/usb/gadget/function/f_uvc.c
2021-06-25 11:32:04 +08:00
..
aqc111.c
aqc111.h
asix_common.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
asix_devices.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
asix.h
ax88172a.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ax88179_178a.c net: usb: ax88179_178a: initialize local variables before use 2021-05-07 11:04:31 +02:00
catc.c
cdc_eem.c
cdc_ether.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
cdc_mbim.c
cdc_ncm.c Revert "net: usb: cdc_ncm: don't spew notifications" 2021-06-12 14:48:15 +02:00
cdc_subset.c
cdc-phonet.c net: cdc-phonet: fix data-interface release on probe failure 2021-03-30 14:32:02 +02:00
ch9200.c
cx82310_eth.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
dm9601.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
dm9620.c
gl620a.c
hso.c net: hso: bail out on interrupt URB allocation failure 2021-06-03 09:00:51 +02:00
huawei_cdc_ncm.c
int51x1.c
ipheth.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
kalmia.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
kaweth.c
Kconfig
lan78xx.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
lan78xx.h
lg-vl600.c
Makefile
mcs7830.c
net1080.c
pegasus.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
pegasus.h
plusb.c
qmi_wwan.c net: usb: qmi_wwan: allow qmimux add/del with master up 2021-03-17 17:06:15 +01:00
r8152.c r8152: limit the RX buffer size of RTL8153A for USB 2.0 2021-03-30 14:32:02 +02:00
rndis_host.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
rtl8150.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sierra_net.c
smsc75xx.c net: usb: fix memory leak in smsc75xx_bind 2021-06-03 09:00:35 +02:00
smsc75xx.h
smsc95xx.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
smsc95xx.h
sr9700.c
sr9700.h
sr9800.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sr9800.h
usbnet.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
zaurus.c