Merge 365cd15e8f ("wifi: cfg80211: rewrite merging of inherited elements") into android13-5.15-lts

Browse Source

Steps on the way to 5.15.121

Resolves merge conflicts in:
	net/wireless/scan.c
by merging the commit away entirely.

It will come back in the future in a merge-safe way.

Change-Id: If3e6956fdcd96a361f91070be6bcb0d4d1c6e3f4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

...

This commit is contained in:

Greg Kroah-Hartman

2023-07-27 10:19:13 +00:00

parent 1f20dc4cdd 365cd15e8f

commit d567dc0a2c

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

Diff Content Not Available