Merge 6.2-rc7 into usb-next

Browse source

We need the USB fixes in here, and this resolves a merge conflict with
the i915 driver as reported in linux-next

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Greg Kroah-Hartman 2023-02-06 08:33:30 +01:00

parent 4f6dfc2136 4ec5183ec4

commit 924fb3ec50

490 changed files with 4370 additions and 2189 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

include/uapi/linux/netfilter/nf_conntrack_sctp.h

View file

3

include/uapi/linux/netfilter/nfnetlink_cttimeout.h

View file