iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
156f886cf69715265f7b65cb4153bce8f8570326
linux/arch/mips
History
Jakub Kicinski f4083a752a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h
  9e26680733 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp")
  9e518f2580 ("bnxt_en: 1PPS functions to configure TSIO pins")
  099fdeda65 ("bnxt_en: Event handler for PPS events")

kernel/bpf/helpers.c
include/linux/bpf-cgroup.h
  a2baf4e8bb ("bpf: Fix potentially incorrect results with bpf_get_local_storage()")
  c7603cfa04 ("bpf: Add ambient BPF runtime context stored in current")

drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
  5957cc557d ("net/mlx5: Set all field of mlx5_irq before inserting it to the xarray")
  2d0b41a376 ("net/mlx5: Refcount mlx5_irq with integer")

MAINTAINERS
  7b637cd52f ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo")
  7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-08-13 06:41:22 -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
MIPS: Remove empty prom_free_prom_memory functions
2021-01-07 17:11:33 +01:00
ath79
MIPS: of: Introduce helper function to get DTB
2021-02-04 13:34:51 +01:00
bcm47xx
MIPS: Remove empty prom_free_prom_memory functions
2021-01-07 17:11:33 +01:00
bcm63xx
MIPS: BCM63XX: Use BUG_ON instead of condition followed by BUG.
2021-04-26 10:23:52 +02:00
bmips
MIPS: bmips: include <linux/dma-direct.h> for phys_to_dma
2021-03-06 08:43:40 +01:00
boot
Merge tag 'mips_5.14_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
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
MIPS: Remove empty prom_free_prom_memory functions
2021-01-07 17:11:33 +01:00
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
MIPS: DEC: Restore bootmem reservation for firmware working memory area
2020-10-14 23:57:57 +02:00
fw
MIPS: Remove empty prom_free_prom_memory functions
2021-01-07 17:11:33 +01:00
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-08-13 06:41:22 -07:00
ingenic
MIPS: Kconfig: ingenic: Ensure MACH_INGENIC_GENERIC selects all SoCs
2021-06-01 11:44:47 +02:00
jazz
MIPS: jazz: always allow little-endian builds
2021-01-22 13:53:21 +01:00
kernel
Merge tag 'irqchip-fixes-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
2021-07-09 15:35:13 +02:00
kvm
Merge tag 'mips_5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
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
Merge tag 'mips_5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
2021-02-21 13:18:26 -08:00
loongson32
MIPS: Remove empty prom_free_prom_memory functions
2021-01-07 17:11:33 +01:00
loongson64
MIPS: loongsoon64: Reserve memory below starting pfn to prevent Oops
2021-06-29 10:15:46 +02:00
math-emu
MIPS: Use fallthrough for arch/mips
2020-05-07 11:55:47 +02:00
mm
MIPS: Fix fall-through warnings for Clang
2021-07-13 15:00:23 -05:00
mti-malta
MIPS: Malta: Do not byte-swap accesses to the CBUS UART
2021-07-21 12:52:14 +02:00
n64
mips: Add N64 machine type
2021-01-22 11:40:00 +01:00
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
driver core: lift dma_default_coherent into common code
2021-02-13 09:51:45 +01:00
power
…
ralink
Merge tag 'pinctrl-v5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
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
MIPS: Remove empty prom_free_prom_memory functions
2021-01-07 17:11:33 +01:00
sni
MIPS: SNI: Fix spurious interrupts
2020-09-16 22:40:58 +02:00
tools
MIPS: tools: Fix resource leak in elf-entry.c
2020-05-24 09:29:48 +02:00
txx9
MIPS: Remove empty prom_free_prom_memory functions
2021-01-07 17:11:33 +01:00
vdso
MIPS: Makefile: Replace -pg with CC_FLAGS_FTRACE
2021-04-21 13:44:35 +02:00
vr41xx
MIPS: Remove empty prom_free_prom_memory functions
2021-01-07 17:11:33 +01:00
Kbuild
MIPS: Fix "make clean" error due to recent changes
2020-05-13 13:20:22 +02:00
Kbuild.platforms
mips: Add N64 machine type
2021-01-22 11:40:00 +01:00
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
mips: Fix non-POSIX regexp
2021-08-05 20:52:03 +09:00
Makefile.postlink
MIPS: fix indentation of the 'RELOCS' message
2020-01-20 15:37:30 -08:00