Commit dfd2d876 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'wireless/main' into wireless-next



Pull in wireless/main content since some new code would
otherwise conflict with it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents a790cc3a 10d5ea5a
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@
*.o
*.o.*
*.patch
*.rmeta
*.rsi
*.s
*.so
*.so.dbg
@@ -97,6 +99,7 @@ modules.order
!.gitattributes
!.gitignore
!.mailmap
!.rustfmt.toml

#
# Generated include files
@@ -162,3 +165,6 @@ x509.genkey

# Documentation toolchain
sphinx_*/

# Rust analyzer configuration
/rust-project.json

.rustfmt.toml

0 → 100644
+12 −0
Original line number Diff line number Diff line
edition = "2021"
newline_style = "Unix"

# Unstable options that help catching some mistakes in formatting and that we may want to enable
# when they become stable.
#
# They are kept here since they are useful to run from time to time.
#format_code_in_doc_comments = true
#reorder_impl_items = true
#comment_width = 100
#wrap_comments = true
#normalize_comments = true
+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Date: May 2011
KernelVersion:	3.0
Contact:	Rafał Miłecki <zajec5@gmail.com>
Description:
		Each BCMA core has it's manufacturer id. See
		Each BCMA core has its manufacturer id. See
		include/linux/bcma/bcma.h for possible values.

What:		/sys/bus/bcma/devices/.../id
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ Description: 'FCoE Controller' instances on the fcoe bus.
		1) Write interface name to ctlr_create 2) Configure the FCoE
		Controller (ctlr_X) 3) Enable the FCoE Controller to begin
		discovery and login. The FCoE Controller is destroyed by
		writing it's name, i.e. ctlr_X to the ctlr_delete file.
		writing its name, i.e. ctlr_X to the ctlr_delete file.

Attributes:

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Description:
		on the signal from which time of flight measurements are
		taken.
		The appropriate values to take is dependent on both the
		sensor and it's operating environment:
		sensor and its operating environment:
		* as3935 (0-31 range)
		18 = indoors (default)
		14 = outdoors
Loading