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
..
davinci	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drv-intf	ARM: s3c24xx: drop s3c-camif setup platform code	2020-08-19 20:57:32 +02:00
i2c	media: smiapp: Move definitions under driver directory	2020-02-27 17:49:04 -03:00
tpg	media: v4l2-tpg: Clamp hue in tpg_s_hue()	2020-08-26 18:51:34 +02:00
camsys_head.h
cec-notifier.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
cec-pin.h	media: cec-gpio: handle gpiod_get_value errors correctly	2020-04-29 12:04:38 +02:00
cec.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
demux.h
dmxdev.h
dvb_ca_en50221.h
dvb_demux.h
dvb_frontend.h
dvb_math.h
dvb_net.h
dvb_ringbuffer.h
dvb_vb2.h
dvb-usb-ids.h	media: dvb-usb: Add Cinergy S2 PCIe Dual Port support	2020-05-25 09:09:39 +02:00
dvbdev.h	media: dvbdev.h: keep * together with the type	2020-07-19 14:26:25 +02:00
fwht-ctrls.h
h264-ctrls.h	UPSTREAM: media: uapi: Move the H264 stateless control types out of staging	2021-06-04 11:15:19 -07:00
hevc-ctrls.h
imx.h
media-dev-allocator.h
media-device.h	media: media-device.h: drop duplicated word in comment	2020-07-19 14:00:07 +02:00
media-devnode.h	media: media-devnode.h: drop duplicated word in comment	2020-07-19 14:00:12 +02:00
media-entity.h	ANDROID: media: v4l2-core: extend the v4l2 format to support request	2021-06-04 11:15:20 -07:00
media-request.h
mpeg2-ctrls.h
rc-core.h	media: rc: harmonize infrared durations to microseconds	2020-09-03 16:18:55 +02:00
rc-map.h	media: rc: compile rc-cec.c into rc-core	2021-03-17 17:06:20 +01:00
rcar-fcp.h
rk-isp10-config.h
rk-isp10-ioctl.h
tc35874x.h
tuner-types.h
tuner.h
tveeprom.h
v4l2-async.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
v4l2-chip-ident.h
v4l2-clk.h
v4l2-common.h	media: vivid: Add support to the CSC API	2020-09-26 10:21:34 +02:00
v4l2-config_rockchip.h
v4l2-controls_rockchip.h	media: v4l2-controls_rockchip: add private controls for audio	2021-02-24 11:21:07 +08:00
v4l2-ctrls.h	UPSTREAM: media: v4l: Add HDR10 static metadata controls	2021-06-04 11:15:19 -07:00
v4l2-dev.h	media: v4l2-dev: Add v4l2_device_register_ro_subdev_node()	2020-05-12 17:04:07 +02:00
v4l2-device.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
v4l2-dv-timings.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
v4l2-event.h
v4l2-fh.h	media: v4l2-fh: define v4l2_fh struct regardless of condition	2020-04-21 13:40:06 +02:00
v4l2-flash-led-class.h
v4l2-fwnode.h	media: v4l2-fwnode: v4l2_fwnode_endpoint_parse caller must init vep argument	2020-12-30 11:53:11 +01:00
v4l2-h264.h	media: uapi: h264: Clean slice invariants syntax elements	2020-09-01 14:13:28 +02:00
v4l2-image-sizes.h	media: v4l2-image-sizes: add HD and Full-HD definitions	2020-04-21 17:21:51 +02:00
v4l2-ioctl.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
v4l2-jpeg.h	media: add v4l2 JPEG helpers	2020-04-14 11:47:47 +02:00
v4l2-mc.h	media: v4l2: Correct kernel-doc inconsistency	2020-08-06 11:25:07 +02:00
v4l2-mediabus.h	media: v4l2-fwnode: Return -EINVAL for invalid bus-type	2020-12-30 11:53:11 +01:00
v4l2-mem2mem.h	media: v4l2-mem2mem: add v4l2_m2m_suspend, v4l2_m2m_resume	2020-08-28 15:20:40 +02:00
v4l2-rect.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
v4l2-subdev.h	media: v4l2-subdev.h: fix a kernel-doc markup	2020-09-30 18:50:20 +02:00
videobuf-core.h
videobuf-dma-contig.h
videobuf-dma-sg.h	media: videobuf-dma-sg: number of pages should be unsigned long	2020-09-03 11:12:20 +02:00
videobuf-vmalloc.h
videobuf2-core.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
videobuf2-dma-contig.h	media: videobuf2-dma-contig: fix bad kfree in vb2_dma_contig_clear_max_seg_size	2020-06-11 19:20:55 +02:00
videobuf2-dma-sg.h
videobuf2-dvb.h
videobuf2-memops.h
videobuf2-v4l2.h	media: videobuf2-v4l2.c: add vb2_video_unregister_device helper function	2020-08-28 14:58:48 +02:00
videobuf2-vmalloc.h
vp8-ctrls.h
vsp1.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00