Commit 6c450eca authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 00f75760 ("ata: sata_mv: Fix PCI device ID table declaration... 


Merge 00f75760 ("ata: sata_mv: Fix PCI device ID table declaration compilation warning") into android14-5.15-lts

Steps on the way to 5.15.154

Resolves conflicts in:
	kernel/locking/rwsem.c
	net/core/sock_map.c

Change-Id: I8bafc9faf9e0d9e7f1da807f700b7f3aa148d026
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 665a6cd7 00f75760
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment