review.tizen.org Git - platform/kernel/linux-starfive.git/commit

projects / platform / kernel / linux-starfive.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 707a13c f1a0898)

author	Johannes Berg <johannes.berg@intel.com>
	Mon, 19 Jun 2023 10:03:51 +0000 (12:03 +0200)
committer	Johannes Berg <johannes.berg@intel.com>
	Mon, 19 Jun 2023 10:04:16 +0000 (12:04 +0200)
commit	d5a17cfb9875a873474985f630b5061a4f2142b2
tree	14e6a9c9064c3a190ff25aa3af61316646acc36d	tree \| snapshot
parent	707a13c7e488785170a5e7f2467f2823824651e2	commit \| diff
parent	f1a0898b5d6a77d332d036da03bad6fa9770de5b	commit \| diff

Merge wireless into wireless-next

There are some locking changes that will later otherwise
cause conflicts, so merge wireless into wireless-next to
avoid those.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/link.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;