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

..

alpha

sock: allow reading and changing sk_userlocks with setsockopt

2021-08-04 12:52:03 +01:00

arc

ARC: fp: set FPU_STATUS.FWE to enable FPU_STATUS update on context switch

2021-08-03 18:58:33 -07:00

arm

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

2021-08-13 06:41:22 -07:00

arm64

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

2021-08-13 06:41:22 -07:00

csky

Merge tag 'kbuild-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2021-07-10 11:01:38 -07:00

h8300

Merge tag 'libata-5.14-2021-07-30' of git://git.kernel.dk/linux-block

2021-07-30 10:56:47 -07:00

hexagon

Merge tag 'kbuild-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2021-07-10 11:01:38 -07:00

ia64

Merge tag 'libata-5.14-2021-07-30' of git://git.kernel.dk/linux-block

2021-07-30 10:56:47 -07:00

m68k

Merge tag 'libata-5.14-2021-07-30' of git://git.kernel.dk/linux-block

2021-07-30 10:56:47 -07:00

microblaze

Merge tag 'kbuild-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2021-07-10 11:01:38 -07:00

mips

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

2021-08-13 06:41:22 -07:00

nds32

nds32: fix up stack guard gap

2021-07-21 15:51:37 +02:00

nios2

Merge tag 'kbuild-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2021-07-10 11:01:38 -07:00

openrisc

Merge tag 'kbuild-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2021-07-10 11:01:38 -07:00

parisc

sock: allow reading and changing sk_userlocks with setsockopt

2021-08-04 12:52:03 +01:00

powerpc

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

2021-08-05 15:08:47 -07:00

riscv

Merge tag 'riscv-for-linus-5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

2021-08-07 10:15:04 -07:00

s390

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

2021-08-05 15:08:47 -07:00

sh

Merge tag 'libata-5.14-2021-07-30' of git://git.kernel.dk/linux-block

2021-07-30 10:56:47 -07:00

sparc

sock: allow reading and changing sk_userlocks with setsockopt

2021-08-04 12:52:03 +01:00

um

Merge tag 'kbuild-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2021-07-10 11:01:38 -07:00

x86

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

2021-08-13 06:41:22 -07:00

xtensa

Merge tag 'libata-5.14-2021-07-30' of git://git.kernel.dk/linux-block

2021-07-30 10:56:47 -07:00

.gitignore

…

Kconfig

Kconfig: Introduce ARCH_WANTS_NO_INSTR and CC_HAS_NO_PROFILE_FN_ATTR

2021-06-22 11:07:18 -07:00