Commit b9adba35 authored Jan 05, 2022 by Jakub Kicinski

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net



No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents 4e4f325a 75acfdb6

Documentation/i2c/summary.rst

+5 −3

Original line number	Diff line number	Diff line
		@@ -11,9 +11,11 @@ systems. Some systems use variants that don't meet branding requirements,
		and so are not advertised as being I2C but come under different names,
		e.g. TWI (Two Wire Interface), IIC.

		The official I2C specification is the `"I2C-bus specification and user
		manual" (UM10204) <https://www.nxp.com/docs/en/user-guide/UM10204.pdf>`_
		published by NXP Semiconductors.
		The latest official I2C specification is the `"I2C-bus specification and user
		manual" (UM10204) <https://www.nxp.com/webapp/Download?colCode=UM10204>`_
		published by NXP Semiconductors. However, you need to log-in to the site to
		access the PDF. An older version of the specification (revision 6) is archived
		`here <https://web.archive.org/web/20210813122132/https://www.nxp.com/docs/en/user-guide/UM10204.pdf>`_.

		SMBus (System Management Bus) is based on the I2C protocol, and is mostly
		a subset of I2C protocols and signaling. Many I2C devices will work on an

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -3769,7 +3769,8 @@ S: Supported
		F: drivers/net/wireless/broadcom/brcm80211/

		BROADCOM BRCMSTB GPIO DRIVER
		M: Gregory Fong <gregory.0xf0@gmail.com>
		M: Doug Berger <opendmb@gmail.com>
		M: Florian Fainelli <f.fainelli@gmail.com>
		L: bcm-kernel-feedback-list@broadcom.com
		S: Supported
		F: Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		VERSION = 5
		PATCHLEVEL = 16
		SUBLEVEL = 0
		EXTRAVERSION = -rc7
		EXTRAVERSION = -rc8
		NAME = Gobble Gobble

		# DOCUMENTATION

arch/x86/tools/relocs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
		"(__parainstructions\|__alt_instructions)(_end)?\|"
		"(__iommu_table\|__apicdrivers\|__smp_locks)(_end)?\|"
		"__(start\|end)_pci_.*\|"
		#if CONFIG_FW_LOADER_BUILTIN
		#if CONFIG_FW_LOADER
		"__(start\|end)_builtin_fw\|"
		#endif
		"__(start\|stop)___ksymtab(_gpl)?\|"

drivers/gpio/gpio-aspeed-sgpio.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -395,7 +395,7 @@ static void aspeed_sgpio_irq_handler(struct irq_desc *desc)
		reg = ioread32(bank_reg(data, bank, reg_irq_status));

		for_each_set_bit(p, &reg, 32)
		generic_handle_domain_irq(gc->irq.domain, i * 32 + p * 2);
		generic_handle_domain_irq(gc->irq.domain, (i * 32 + p) * 2);
		}

		chained_irq_exit(ic, desc);