github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
e58b8f0d41
linux/block
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
..
partitions Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-03-17 18:07:51 +08:00
badblocks.c
bfq-cgroup.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bfq-iosched.c Revert "Revert "kyber: fix out of bounds access when preempted"" 2021-06-04 11:15:17 -07: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.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-core.c rk: revert to v4.19 2021-03-17 18:05:39 +08: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
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-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 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-mq-debugfs.h
blk-mq-pci.c
blk-mq-rdma.c
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 FROMGIT: blk-mq: clear stale request in tags->rq[] before freeing one request pool 2021-05-21 13:17:09 -07:00
blk-mq-virtio.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-mq.c FROMGIT: blk-mq: clearing flush request reference in tags->rqs[] 2021-05-21 13:17:10 -07:00
blk-mq.h FROMGIT: blk-mq: grab rq->refcount before calling ->fn in blk_mq_tagset_busy_iter 2021-05-21 13:17:09 -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 scsi: block: Do not accept any requests while suspended 2021-01-12 20:18:17 +01:00
blk-rq-qos.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-rq-qos.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-settings.c Revert "BACKPORT: bio: limit bio max size" 2021-05-11 09:34:37 -07:00
blk-stat.c
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
blk-wbt.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-wbt.h
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 block: fix comment and add lockdep assert 2020-10-09 12:34:06 -06: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 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kconfig.iosched
keyslot-manager.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
kyber-iosched.c Revert "Revert "kyber: fix out of bounds access when preempted"" 2021-06-04 11:15:17 -07:00
Makefile rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mq-deadline.c Revert "Revert "kyber: fix out of bounds access when preempted"" 2021-06-04 11:15:17 -07:00
opal_proto.h
OWNERS ANDROID: Add OWNERS files referring to the respective android-mainline OWNERS 2021-04-03 14:11:30 +00: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