linux-stable/arch/arm
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
..
boot Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
common
configs ARM: multi_v7_defconfig: Make NOP_USB_XCEIV driver built-in 2021-07-16 23:02:53 +02:00
crypto crypto: arm - use a pattern rule for generating *.S files 2021-05-14 19:07:54 +08:00
include mm: rename pud_page_vaddr to pud_pgtable and make it return pmd_t * 2021-07-08 11:48:22 -07:00
kernel arm: convert to setup_initial_init_mm() 2021-07-08 11:48:21 -07:00
lib
mach-actions
mach-alpine
mach-artpec
mach-asm9260
mach-aspeed
mach-at91
mach-axxia
mach-bcm
mach-berlin
mach-clps711x
mach-cns3xxx
mach-davinci arch: Kconfig: clean up obsolete use of HAVE_IDE 2021-07-30 08:19:09 -06:00
mach-digicolor
mach-dove
mach-ep93xx
mach-exynos ARM: exynos: add missing of_node_put for loop iteration 2021-05-11 08:33:01 -04:00
mach-footbridge ARM updates for 5.13-rc1: 2021-05-06 09:28:07 -07:00
mach-gemini
mach-highbank
mach-hisi
mach-imx ARM: imx: fix missing 3rd argument in macro imx_mmdc_perf_init 2021-07-23 15:33:30 +08:00
mach-integrator
mach-iop32x
mach-ixp4xx ARM: ixp4xx: goramo_mlr depends on old PCI driver 2021-08-02 14:32:53 +02:00
mach-keystone
mach-lpc18xx
mach-lpc32xx
mach-mediatek
mach-meson
mach-milbeaut
mach-mmp
mach-moxart
mach-mstar
mach-mv78xx0
mach-mvebu of: net: pass the dst buffer to of_get_mac_address() 2021-04-13 14:35:02 -07:00
mach-mxs
mach-nomadik
mach-npcm ARM: npcm: wpcm450: select interrupt controller driver 2021-05-18 15:27:27 +02:00
mach-nspire
mach-omap1 Non-urgent fixes for omaps for v5.14 merge window 2021-06-23 18:45:23 -07:00
mach-omap2 ARM: omap2+: hwmod: fix potential NULL pointer access 2021-07-27 11:10:37 +03:00
mach-orion5x
mach-oxnas
mach-pxa ARM: PXA: Fix cplds irqdesc allocation when using legacy mode 2021-05-10 14:12:25 +01:00
mach-qcom
mach-rda
mach-realtek
mach-realview
mach-rockchip
mach-rpc ARM: riscpc: Fix fall-through warning for Clang 2021-07-29 12:51:00 -05:00
mach-s3c ARM: s3c: Remove unnecessary break in RX1950 2021-05-11 08:29:40 -04:00
mach-s5pv210
mach-sa1100
mach-shmobile
mach-socfpga
mach-spear ARM/spi: spear: Drop PL022 num_chipselect 2021-04-08 15:21:58 +01:00
mach-sti
mach-stm32
mach-sunxi
mach-tegra
mach-uniphier
mach-ux500
mach-versatile
mach-vexpress
mach-vt8500
mach-zynq arm: zynq: don't disable CONFIG_ARM_GLOBAL_TIMER due to CONFIG_CPU_FREQ anymore 2021-06-16 17:33:04 +02:00
mm arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM 2021-07-10 09:17:13 -07:00
net bpf: Introduce BPF nospec instruction for mitigating Spectre v4 2021-07-29 00:20:56 +02:00
nwfpe
plat-omap
plat-orion
plat-pxa
plat-versatile
probes ARM development updates for 5.14-rc1: 2021-07-06 11:52:58 -07:00
tools ARM development updates for 5.14-rc1: 2021-07-06 11:52:58 -07:00
vdso
vfp
xen ARM development updates for 5.14-rc1: 2021-07-06 11:52:58 -07:00
Kbuild
Kconfig libata-5.14-2021-07-30 2021-07-30 10:56:47 -07:00
Kconfig-nommu
Kconfig.assembler
Kconfig.debug ARM: SoC changes for 5.14 2021-07-10 09:22:44 -07:00
Makefile kbuild: require all architectures to have arch/$(SRCARCH)/Kbuild 2021-05-26 23:10:37 +09:00