git-server-git.apps.pok.os.sepia.ceph.com Git

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commit

author	Johannes Berg <johannes.berg@intel.com>
	Tue, 18 Mar 2025 08:45:23 +0000 (09:45 +0100)
committer	Johannes Berg <johannes.berg@intel.com>
	Tue, 18 Mar 2025 08:46:36 +0000 (09:46 +0100)
commit	c924c5e9b8c65b3a479a90e5e37d74cc8cd9fe0a
tree	9626c13418dd3770f2772980a7dacdc110c442b6	tree \| snapshot
parent	54be64fdf3ba6dbad2f5c48e466e1db43ad74bca	commit \| diff
parent	50698b298b3995d253bd0b85ff7f60cae6f51e6a	commit \| diff

Merge net-next/main to resolve conflicts

There are a few conflicts between the work that went
into wireless and that's here now, resolve them.

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

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

drivers/net/wireless/intel/iwlwifi/iwl-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history