github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-11 08:03:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
ff6f00a18f
linux/include/media
History
Tao Huang 8a8168e343 Merge remote branch 'android12-5.10-2021-08' of https://android.googlesource.com/kernel/common 
* android12-5.10-2021-08: (429 commits)
  ANDROID: Update symbol list for mtk
  ANDROID: scheduler: export task_sched_runtime
  FROMLIST: mm: slub: fix slub_debug disabling for list of slabs
  FROMLIST: mm/madvise: add MADV_WILLNEED to process_madvise()
  ANDROID: Update the exynos symbol list
  FROMGIT: firmware: arm_scmi: Free mailbox channels if probe fails
  ANDROID: GKI: gki_defconfig: Enable CONFIG_NFC
  ANDROID: sched: Make uclamp changes depend on CAP_SYS_NICE
  ANDROID: GKI: update xiaomi symbol list and ABI XML
  ANDROID: ABI: update generic symbol list
  ANDROID: scsi: ufs: Enable CONFIG_SCSI_UFS_HPB
  ANDROID: scsi: ufs: Make CONFIG_SCSI_UFS_HPB compatible with the GKI
  UPSTREAM: arm64: vdso: Avoid ISB after reading from cntvct_el0
  ANDROID: GKI: Disable X86_MCE drivers
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: ABI: update allowed list for exynos
  FROMGIT: sched: Skip priority checks with SCHED_FLAG_KEEP_PARAMS
  FROMGIT: sched: Don't report SCHED_FLAG_SUGOV in sched_getattr()
  FROMGIT: sched/deadline: Fix reset_on_fork reporting of DL tasks
  BACKPORT: FROMGIT: sched: Fix UCLAMP_FLAG_IDLE setting
  ...

Change-Id: I5e0600bb4ccd0333366b016b42332e1e79e56b61

Conflicts:
	drivers/usb/gadget/configfs.c
	include/linux/usb/gadget.h
2021-08-24 20:07:38 +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
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 media: dvb_frontend.h: Fix shifting signed 32-bit value problem 2019-08-14 05:04:08 -03:00
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 media: v4l: Add definitions for HEVC stateless decoding 2019-10-24 18:09:18 -03:00
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
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-clk.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
v4l2-common.h media: vivid: Add support to the CSC API 2020-09-26 10:21:34 +02:00
v4l2-controls_rockchip.h Revert "isp10: rockchip: v0.1.6" 2021-08-06 20:26:11 +08:00
v4l2-ctrls.h ANDROID: add kabi padding for structures for the android12 release 2021-07-14 20:51:51 -07:00
v4l2-dev.h ANDROID: add kabi padding for structures for the android12 release 2021-07-14 20:51:51 -07: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 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
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 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 237 2019-06-19 17:09:07 +02:00
videobuf-dma-contig.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 237 2019-06-19 17:09:07 +02:00
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 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 237 2019-06-19 17:09:07 +02:00
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 ANDROID: add kabi padding for structures for the android12 release 2021-07-14 20:51:51 -07:00
videobuf2-vmalloc.h
vp8-ctrls.h media: uapi: new file needs types.h 2019-07-23 08:19:32 -04:00
vsp1.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00