leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d2e11fd2b7
linux/arch/mips
History
Jakub Kicinski d2e11fd2b7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Conflicting commits, all resolutions pretty trivial:

drivers/bus/mhi/pci_generic.c
  5c2c853159 ("bus: mhi: pci-generic: configurable network interface MRU")
  56f6f4c4eb ("bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean")

drivers/nfc/s3fwrn5/firmware.c
  a0302ff590 ("nfc: s3fwrn5: remove unnecessary label")
  46573e3ab0 ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")
  801e541c79 ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")

MAINTAINERS
  7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver")
  8a7b46fa79 ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-07-31 09:14:46 -07:00
..
alchemy MIPS: alchemy: xxs1500: add gpio-au1000.h header file 2021-05-25 15:16:23 +02:00
ar7 mips: ar7: convert to CONFIG_COMMON_CLK 2021-06-08 17:00:09 +02:00
ath25
ath79
bcm47xx
bcm63xx MIPS: BCM63XX: Use BUG_ON instead of condition followed by BUG. 2021-04-26 10:23:52 +02:00
bmips
boot - fix for accesing gic via vdso 2021-07-10 10:36:33 -07:00
cavium-octeon MIPS: OCTEON: octeon-usb: Use devm_platform_get_and_ioremap_resource() 2021-06-21 11:32:47 +02:00
cobalt
configs MIPS: Loongson64: Update loongson3_defconfig 2021-05-27 12:35:42 +02:00
crypto asm-generic: unaligned always use struct helpers 2021-05-10 17:50:47 +02:00
dec
fw
generic MIPS: generic: Update node names to avoid unit addresses 2021-04-12 16:48:35 +02:00
include Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-07-23 16:13:06 +01:00
ingenic MIPS: Kconfig: ingenic: Ensure MACH_INGENIC_GENERIC selects all SoCs 2021-06-01 11:44:47 +02:00
jazz
kernel irqchip fixes for 5.14, take #1 2021-07-09 15:35:13 +02:00
kvm - added support for OpeneEmbed SOM9331 board 2021-07-01 17:03:11 -07:00
lantiq MIPS: lantiq: Directly include linux/of.h in xway/dma.c 2021-06-10 13:09:16 +01:00
lib MIPS: Fix kernel hang under FUNCTION_GRAPH_TRACER and PREEMPT_TRACER 2021-05-25 15:33:17 +02:00
loongson2ef
loongson32
loongson64 MIPS: loongsoon64: Reserve memory below starting pfn to prevent Oops 2021-06-29 10:15:46 +02:00
math-emu
mm MIPS: Fix fall-through warnings for Clang 2021-07-13 15:00:23 -05:00
mti-malta MIPS: Malta: Enable magic multipliers for Super I/O UARTs 2021-06-16 09:20:29 +02:00
n64
net bpf: Introduce BPF nospec instruction for mitigating Spectre v4 2021-07-29 00:20:56 +02:00
netlogic mips: netlogic: Use irq_domain_simple_ops for XLP PIC 2021-04-07 13:25:52 +01:00
pci MIPS: Add missing linux/irqdomain.h includes 2021-06-10 13:09:16 +01:00
pic32 clkdev: remove CONFIG_CLKDEV_LOOKUP 2021-06-08 17:00:09 +02:00
pistachio
power
ralink This is the bulk of pin control changes for the v5.14 kernel: 2021-07-01 16:57:14 -07:00
rb532 net: korina: Add support for device tree 2021-04-19 15:58:14 -07:00
sgi-ip22 kernel.h: split out panic and oops helpers 2021-07-01 11:06:04 -07:00
sgi-ip27 MIPS: Add missing linux/irqdomain.h includes 2021-06-10 13:09:16 +01:00
sgi-ip30 MIPS: Add missing linux/irqdomain.h includes 2021-06-10 13:09:16 +01:00
sgi-ip32 kernel.h: split out panic and oops helpers 2021-07-01 11:06:04 -07:00
sibyte
sni
tools
txx9
vdso MIPS: Makefile: Replace -pg with CC_FLAGS_FTRACE 2021-04-21 13:44:35 +02:00
vr41xx
Kbuild
Kbuild.platforms
Kconfig arch: Kconfig: clean up obsolete use of HAVE_IDE 2021-07-30 08:19:09 -06:00
Kconfig.debug MIPS: boot: Support specifying UART port on Ingenic SoCs 2021-06-01 11:44:47 +02:00
Makefile kbuild: require all architectures to have arch/$(SRCARCH)/Kbuild 2021-05-26 23:10:37 +09:00
Makefile.postlink