github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 06:25:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
aaa2148c7f
linux/block
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
..
partitions Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-03-17 18:07:51 +08:00
badblocks.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
bfq-cgroup.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bfq-iosched.c UPSTREAM: block, bfq: set next_rq to waker_bfqq->next_rq in waker injection 2021-07-15 19:42:16 +00:00
bfq-iosched.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bfq-wf2q.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bio-integrity.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bio.c Revert "BACKPORT: bio: limit bio max size" 2021-05-11 09:34:37 -07:00
blk-cgroup-rwstat.c blk-cgroup: Fix the recursive blkg rwstat 2021-03-30 14:31:48 +02:00
blk-cgroup-rwstat.h blk-cgroup: separate out blkg_rwstat under CONFIG_BLK_CGROUP_RWSTAT 2019-11-07 12:28:13 -07:00
blk-cgroup.c FROMGIT: block: Introduce the ioprio rq-qos policy 2021-07-01 22:31:51 -07:00
blk-core.c ANDROID: Revert "scsi: block: Do not accept any requests while suspended" 2021-07-13 10:52:35 -07:00
blk-crypto-fallback.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-crypto-internal.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-crypto.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-exec.c block: add a blk_account_io_merge_bio helper 2020-05-27 05:21:23 -06:00
blk-flush.c FROMGIT: block: avoid double io accounting for flush request 2021-05-14 13:50:36 -07:00
blk-integrity.c block: remove the unused blk_integrity_merge_bio export 2020-10-06 07:29:53 -06:00
blk-ioc.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-iocost.c blk-iocost: fix weight updates of inner active iocgs 2021-05-19 10:13:11 +02:00
blk-iolatency.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-ioprio.c FROMGIT: block: Introduce the ioprio rq-qos policy 2021-07-01 22:31:51 -07:00
blk-ioprio.h FROMGIT: block: Introduce the ioprio rq-qos policy 2021-07-01 22:31:51 -07:00
blk-lib.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-map.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-merge.c block: recalculate segment count for multi-segment discards correctly 2021-03-30 14:32:06 +02:00
blk-mq-cpumap.c blk-mq: remove the calling of local_memory_node() 2020-10-20 07:08:17 -06:00
blk-mq-debugfs-zoned.c
blk-mq-debugfs.c FROMGIT: block: Introduce the ioprio rq-qos policy 2021-07-01 22:31:51 -07:00
blk-mq-debugfs.h blk-mq: no need to check return value of debugfs_create functions 2019-06-13 03:00:30 -06:00
blk-mq-pci.c block: Fix blk_mq_*_map_queues() kernel-doc headers 2019-05-31 15:12:34 -06:00
blk-mq-rdma.c block: Fix blk_mq_*_map_queues() kernel-doc headers 2019-05-31 15:12:34 -06:00
blk-mq-sched.c Revert "Revert "kyber: fix out of bounds access when preempted"" 2021-06-04 11:15:17 -07:00
blk-mq-sched.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-mq-sysfs.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-mq-tag.c FROMGIT: blk-mq: clear stale request in tags->rq[] before freeing one request pool 2021-05-21 13:17:09 -07:00
blk-mq-tag.h ANDROID: GKI: Add ANDROID_OEM_DATA in struct blk_mq_tags 2021-07-01 22:32:02 -07:00
blk-mq-virtio.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-mq.c ANDROID: vendor_hooks: add vendor hook in blk_mq_rq_ctx_init() 2021-07-14 14:17:35 +00:00
blk-mq.h ANDROID: GKI: Add ANDROID_OEM_DATA in struct blk_mq_ctx 2021-07-01 22:32:01 -07:00
blk-pm.c scsi: block: Fix a race in the runtime power management code 2021-01-06 14:56:50 +01:00
blk-pm.h ANDROID: Revert "scsi: block: Do not accept any requests while suspended" 2021-07-13 10:52:35 -07:00
blk-rq-qos.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-rq-qos.h FROMGIT: block: Introduce the ioprio rq-qos policy 2021-07-01 22:31:51 -07:00
blk-settings.c Revert "BACKPORT: bio: limit bio max size" 2021-05-11 09:34:37 -07:00
blk-stat.c blk-stat: make q->stats->lock irqsafe 2020-09-01 16:48:46 -06:00
blk-stat.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-sysfs.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-throttle.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-timeout.c block: blk-timeout: delete duplicated word 2020-07-31 16:29:47 -06:00
blk-wbt.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-wbt.h blk-wbt: remove wbt_update_limits 2020-05-29 16:30:39 -06:00
blk-zoned.c block: Fix REQ_OP_ZONE_RESET_ALL handling 2021-03-30 14:31:51 +02:00
blk.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bounce.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bsg-lib.c block: drop double zeroing 2020-09-23 09:18:13 -06:00
bsg.c Merge 5.10.20 into android12-5.10 2021-03-07 12:33:33 +01:00
cmdline-parser.c
elevator.c FROMGIT: blk-mq: Introduce the BLK_MQ_F_NO_SCHED_BY_DEFAULT flag 2021-08-05 12:21:53 -07:00
genhd.c block: Suppress uevent for hidden device when removed 2021-03-30 14:31:52 +02:00
ioctl.c block: return -EBUSY when there are open partitions in blkdev_reread_part 2021-04-28 13:39:59 +02:00
ioprio.c Revert "block: grant IOPRIO_CLASS_RT to CAP_SYS_NICE" 2020-10-24 17:30:14 +02:00
Kconfig FROMGIT: block: Introduce the ioprio rq-qos policy 2021-07-01 22:31:51 -07:00
Kconfig.iosched FROMGIT: block/mq-deadline: Add cgroup support 2021-07-01 22:31:54 -07:00
keyslot-manager.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
kyber-iosched.c FROMGIT: blk-mq: Improve performance of non-mq IO schedulers with multiple HW queues 2021-07-01 22:31:49 -07:00
Makefile FROMGIT: block/mq-deadline: Add cgroup support 2021-07-01 22:31:54 -07:00
mq-deadline-cgroup.c FROMGIT: block/mq-deadline: Add cgroup support 2021-07-01 22:31:54 -07:00
mq-deadline-cgroup.h FROMGIT: block/mq-deadline: Add cgroup support 2021-07-01 22:31:54 -07:00
mq-deadline-main.c FROMGIT: block/mq-deadline: Prioritize high-priority requests 2021-07-01 22:31:55 -07:00
opal_proto.h block: sed-opal: Change the check condition for regular session validity 2020-03-12 08:00:10 -06:00
scsi_ioctl.c Revert "Revert "iov_iter: transparently handle compat iovecs in import_iovec"" 2020-11-02 09:27:36 +01:00
sed-opal.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
t10-pi.c block: Allow t10-pi to be modular 2020-01-06 20:59:04 -07:00