linux/include/uapi/linux/usb
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
..
audio.h ALSA: usb-audio: Fix parse of UAC2 Extension Units 2019-07-05 08:06:47 +02:00
cdc-wdm.h License cleanup: add SPDX license identifier to uapi header files with a license 2017-11-02 11:20:11 +01:00
cdc.h License cleanup: add SPDX license identifier to uapi header files with no license 2017-11-02 11:19:54 +01:00
ch9.h FROMGIT: usb: ch9: Add USB 3.2 SSP attributes 2021-01-20 16:05:59 +01:00
ch11.h USB: Add support to store lane count used by USB 3.2 2018-04-22 16:11:19 +02:00
charger.h usb: charger: assign specific number for enum value 2020-02-10 11:08:30 -08:00
f_accessory.h ANDROID: usb: gadget: f_accessory: Add Android Accessory function 2019-05-03 10:40:01 -07:00
functionfs.h License cleanup: add SPDX license identifier to uapi header files with no license 2017-11-02 11:19:54 +01:00
g_printer.h License cleanup: add SPDX license identifier to uapi header files with a license 2017-11-02 11:20:11 +01:00
g_uvc.h usb: gadget: f_uvc: add suspend and resume function 2021-06-16 19:16:52 +08:00
gadgetfs.h License cleanup: add SPDX license identifier to uapi header files with no license 2017-11-02 11:19:54 +01:00
midi.h License cleanup: add SPDX license identifier to uapi header files with a license 2017-11-02 11:20:11 +01:00
raw_gadget.h usb: raw-gadget: support stalling/halting/wedging endpoints 2020-05-14 12:30:18 +03:00
tmc.h usb: usbtmc: Add ioctl USBTMC_IOCTL_API_VERSION 2018-09-20 13:04:02 +02:00
video.h Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-06-25 11:32:04 +08:00