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

Merge bdefb8ce ("tty: rp2: Fix reset with non forgiving PCIe host...


Merge bdefb8ce ("tty: rp2: Fix reset with non forgiving PCIe host bridges") into android14-6.1-lts

Steps on the way to 6.1.113

Resolves merge conflicts:
	fs/f2fs/file.c
	include/linux/sbitmap.h
	include/linux/usb/usbnet.h
	lib/sbitmap.c

Change-Id: Idb91c8878c10a6dbde9e27b0ad8194a2b1625ec2
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 086571e4 bdefb8ce
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment