Carlos Llamas 41cffbaf9d Merge v6.15-rc3 into android-mainline ...

Steps on the way to v6.15-rc3

Resolved merge conflicts in:
    drivers/ufs/core/ufshcd.c

Cc: Jaegeuk Kim <jaegeuk@google.com>
Cc: Eric Biggers <ebiggers@google.com>
Change-Id: I9c51f9667be9de76b243f6c3bf258a1e4a76f53a
Signed-off-by: Carlos Llamas <cmllamas@google.com>

2025-05-01 09:36:25 -07:00

..

partitions

Merge tag 'for-6.15/block-20250322' of git://git.kernel.dk/linux

2025-03-26 18:08:55 -07:00

badblocks.c

badblocks: Fix a nonsense WARN_ON() which checks whether a u64 variable < 0

2025-03-10 07:41:58 -06:00

bdev.c

fs: move the bdex_statx call to vfs_getattr_nosec

2025-04-17 10:14:34 +02:00

bfq-cgroup.c

Revert "block, bfq: merge bfq_release_process_ref() into bfq_put_cooperator()"

2024-11-19 19:05:32 -07:00

bfq-iosched.c

block, bfq: Switch to use hrtimer_setup()

2025-02-18 10:32:33 +01:00

bfq-iosched.h

block, bfq: remove bfq_log_bfqg()

2024-09-10 16:32:09 -06:00

bfq-wf2q.c

…

bio-integrity-auto.c

block: split struct bio_integrity_payload

2025-03-03 11:17:52 -07:00

bio-integrity.c

block: integrity: Do not call set_page_dirty_lock()

2025-04-16 14:16:48 -06:00

bio.c

Merge 2e3fcbcc3b ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline

2025-04-16 16:44:35 -07:00

blk-cgroup-fc-appid.c

…

blk-cgroup-rwstat.c

blk-cgroup: use group allocation/free of per-cpu counters API

2024-04-03 09:10:17 -06:00

blk-cgroup-rwstat.h

blk-cgroup: rwstat: fix kernel-doc warnings in header file

2025-01-13 07:47:09 -07:00

blk-cgroup.c

Merge tag 'for-6.15/block-20250322' of git://git.kernel.dk/linux

2025-03-26 18:08:55 -07:00

blk-cgroup.h

block: correct locking order for protecting blk-wbt parameters

2025-03-19 11:35:45 -06:00

blk-core.c

treewide: Switch/rename to timer_delete[_sync]()

2025-04-05 10:30:12 +02:00

blk-crypto-fallback.c

UPSTREAM: blk-crypto: add basic hardware-wrapped key support

2025-04-01 18:32:10 -07:00

blk-crypto-internal.h

UPSTREAM: blk-crypto: add ioctls to create and prepare hardware-wrapped keys

2025-04-01 18:32:10 -07:00

blk-crypto-profile.c

ANDROID: block: export blk_crypto_derive_sw_secret()

2025-04-01 18:32:10 -07:00

blk-crypto-sysfs.c

UPSTREAM: blk-crypto: show supported key types in sysfs

2025-04-01 18:32:10 -07:00

blk-crypto.c

UPSTREAM: blk-crypto: add ioctls to create and prepare hardware-wrapped keys

2025-04-01 18:32:10 -07:00

blk-flush.c

block: remove unused parameter

2025-03-12 08:25:28 -06:00

blk-ia-ranges.c

block: get rid of request queue ->sysfs_dir_lock

2025-01-29 07:16:47 -07:00

blk-integrity.c

Merge tag 'for-6.14/io_uring-20250119' of git://git.kernel.dk/linux

2025-01-20 20:27:33 -08:00

blk-ioc.c

block: replace call_rcu by kfree_rcu for simple kmem_cache_free callback

2024-10-22 08:16:40 -06:00

blk-iocost.c

Merge tag 'for-6.15/block-20250322' of git://git.kernel.dk/linux

2025-03-26 18:08:55 -07:00

blk-iolatency.c

block: force noio scope in blk_mq_freeze_queue

2025-01-31 07:20:08 -07:00

blk-ioprio.c

blk-cgroup: Simplify policy files registration

2025-03-11 09:22:55 -10:00

blk-ioprio.h

blk-ioprio: remove per-disk structure

2024-07-28 16:47:51 -06:00

blk-lib.c

block: fix detection of unsupported WRITE SAME in blkdev_issue_write_zeroes

2024-08-28 08:49:25 -06:00

blk-map.c

block: remove blk_rq_bio_prep

2025-01-04 15:27:35 -07:00

blk-merge.c

Merge tag 'for-6.15/block-20250322' of git://git.kernel.dk/linux

2025-03-26 18:08:55 -07:00

blk-mq-cpumap.c

blk-mq: create correct map for fallback case

2025-01-23 06:34:32 -07:00

blk-mq-debugfs.c

block: protect debugfs attribute method hctx_busy_show

2025-03-13 07:23:43 -06:00

blk-mq-debugfs.h

block: Replace zone_wlock debugfs entry with zone_wplugs entry

2024-04-17 08:44:03 -06:00

blk-mq-sched.c

block: remove unused parameter

2025-03-12 08:25:28 -06:00

blk-mq-sched.h

…

blk-mq-sysfs.c

block: protect hctx attributes/params using q->elevator_lock

2025-03-10 07:31:06 -06:00

blk-mq-tag.c

block: remove unused parameter

2025-03-12 08:25:28 -06:00

blk-mq.c

block: don't grab elevator lock during queue initialization

2025-04-03 08:32:03 -06:00

blk-mq.h

block: remove unused parameter

2025-03-12 08:25:28 -06:00

blk-pm.c

block: force noio scope in blk_mq_freeze_queue

2025-01-31 07:20:08 -07:00

blk-pm.h

…

blk-rq-qos.c

block: refactor rq_qos_wait()

2025-02-11 13:04:11 -07:00

blk-rq-qos.h

block: skip QUEUE_FLAG_STATS and rq-qos for passthrough io

2023-12-01 18:29:18 -07:00

blk-settings.c

Merge tag 'for-6.15/block-20250322' of git://git.kernel.dk/linux

2025-03-26 18:08:55 -07:00

blk-stat.c

treewide: Switch/rename to timer_delete[_sync]()

2025-04-05 10:30:12 +02:00

blk-stat.h

treewide: Switch/rename to timer_delete[_sync]()

2025-04-05 10:30:12 +02:00

blk-sysfs.c

block: fix resource leak in blk_register_queue() error path

2025-04-14 08:28:26 -06:00

blk-throttle.c

treewide: Switch/rename to timer_delete[_sync]()

2025-04-05 10:30:12 +02:00

blk-throttle.h

block: add SPDX header line to blk-throttle.h

2025-04-14 08:28:09 -06:00

blk-timeout.c

…

blk-wbt.c

blk-wbt: Cleanup a comment in wb_timer_fn

2025-02-25 08:43:52 -07:00

blk-wbt.h

blk-wbt: remove the separate write cache tracking

2023-12-26 09:28:10 -07:00

blk-zoned.c

Merge 0cb71708c5 ("Merge tag 'pci-v6.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci") into android-mainline

2025-03-25 08:41:01 +00:00

blk.h

Merge tag 'for-6.15/block-20250322' of git://git.kernel.dk/linux

2025-03-26 18:08:55 -07:00

bounce.c

block: mark bounce buffering as incompatible with integrity

2025-03-03 11:17:52 -07:00

bsg-lib.c

block: remove unused parameter 'q' parameter in __blk_rq_map_sg()

2025-03-13 05:46:19 -06:00

bsg.c

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2023-06-30 11:57:07 -07:00

disk-events.c

block: move bdev_mark_dead out of disk_check_media_change

2023-10-28 13:29:23 +02:00

early-lookup.c

wrapper for access to ->bd_partno

2024-05-02 17:48:09 -04:00

elevator.c

block: introduce a dedicated lock for protecting queue elevator updates

2025-03-10 07:30:18 -06:00

elevator.h

block: introduce a dedicated lock for protecting queue elevator updates

2025-03-10 07:30:18 -06:00

fops.c

block: don't revert iter for -EIOCBQUEUED

2025-01-23 06:18:41 -07:00

genhd.c

block: introduce a dedicated lock for protecting queue elevator updates

2025-03-10 07:30:18 -06:00

holder.c

block: fix deadlock between bd_link_disk_holder and partition scan

2024-02-23 07:44:19 -07:00

ioctl.c

UPSTREAM: blk-crypto: add ioctls to create and prepare hardware-wrapped keys

2025-04-01 18:32:10 -07:00

ioprio.c

block: move __get_task_ioprio() into header file

2024-01-08 12:27:39 -07:00

Kconfig

lib/crc64-rocksoft: stop wrapping the crypto API

2025-02-08 20:06:19 -08:00

Kconfig.iosched

…

kyber-iosched.c

block: remove unused parameter

2025-03-12 08:25:28 -06:00

Makefile

block: move the block layer auto-integrity code into a new file

2025-03-03 11:17:52 -07:00

mq-deadline.c

UPSTREAM: mq-deadline: don't call req_get_ioprio from the I/O completion handler

2025-01-27 10:04:48 +00:00

opal_proto.h

block: sed-opal: handle empty atoms when parsing response

2024-02-16 15:52:45 -07:00

OWNERS

…

sed-opal.c

block: sed-opal: add ioctl IOC_OPAL_SET_SID_PW

2024-10-22 08:16:40 -06:00

t10-pi.c

Merge tag 'for-6.15/block-20250322' of git://git.kernel.dk/linux

2025-03-26 18:08:55 -07:00

TEST_MAPPING

ANDROID: Add CtsDrmTestCases to the kernel-presubmit group

2025-01-21 10:38:30 -08:00