Stephen Rothwell [Tue, 1 Mar 2022 02:19:10 +0000 (13:19 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/broonie/sound.git
Stephen Rothwell [Tue, 1 Mar 2022 02:16:03 +0000 (13:16 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/tiwai/sound.git
Stephen Rothwell [Tue, 1 Mar 2022 02:13:54 +0000 (13:13 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/broonie/regmap.git
Stephen Rothwell [Tue, 1 Mar 2022 02:12:17 +0000 (13:12 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/deller/linux-fbdev.git
Stephen Rothwell [Tue, 1 Mar 2022 02:10:43 +0000 (13:10 +1100)]
Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux
Stephen Rothwell [Tue, 1 Mar 2022 02:09:05 +0000 (13:09 +1100)]
Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git
Stephen Rothwell [Tue, 1 Mar 2022 02:07:54 +0000 (13:07 +1100)]
Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git
Stephen Rothwell [Tue, 1 Mar 2022 02:04:37 +0000 (13:04 +1100)]
Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel
# Conflicts:
# drivers/gpu/drm/dp/drm_dp.c
# drivers/gpu/drm/i915/display/intel_bw.c
# drivers/gpu/drm/i915/display/intel_snps_phy.c
Stephen Rothwell [Tue, 1 Mar 2022 02:02:42 +0000 (13:02 +1100)]
Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux
Stephen Rothwell [Tue, 1 Mar 2022 02:01:09 +0000 (13:01 +1100)]
Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc
Stephen Rothwell [Tue, 1 Mar 2022 01:29:20 +0000 (12:29 +1100)]
Stephen Rothwell [Tue, 1 Mar 2022 01:06:55 +0000 (12:06 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/herbert/cryptodev-2.6.git
Stephen Rothwell [Tue, 1 Mar 2022 01:05:11 +0000 (12:05 +1100)]
Merge branch 'spi-nor/next' of git://git./linux/kernel/git/mtd/linux.git
Stephen Rothwell [Tue, 1 Mar 2022 01:02:46 +0000 (12:02 +1100)]
Merge branch 'nand/next' of git://git./linux/kernel/git/mtd/linux.git
# Conflicts:
# Documentation/devicetree/bindings/mtd/nand-controller.yaml
Stephen Rothwell [Tue, 1 Mar 2022 00:59:32 +0000 (11:59 +1100)]
Merge branch 'mtd/next' of git://git./linux/kernel/git/mtd/linux.git
Stephen Rothwell [Tue, 1 Mar 2022 00:56:29 +0000 (11:56 +1100)]
Merge branch 'main' of git git://git./linux/kernel/git/wireless/wireless-next.git
# Conflicts:
# net/mac80211/mlme.c
Stephen Rothwell [Tue, 1 Mar 2022 00:54:44 +0000 (11:54 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth-next.git
Stephen Rothwell [Tue, 1 Mar 2022 00:52:54 +0000 (11:52 +1100)]
Merge branch 'mlx5-next' of git://git./linux/kernel/git/mellanox/linux.git
Stephen Rothwell [Tue, 1 Mar 2022 00:50:45 +0000 (11:50 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next.git
Stephen Rothwell [Tue, 1 Mar 2022 00:48:32 +0000 (11:48 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/bpf/bpf-next.git
Stephen Rothwell [Tue, 1 Mar 2022 00:32:01 +0000 (11:32 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/netdev/net-next.git
# Conflicts:
# drivers/hwmon/adt7310.c
Stephen Rothwell [Tue, 1 Mar 2022 00:30:12 +0000 (11:30 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/rdma/rdma.git
Stephen Rothwell [Tue, 1 Mar 2022 00:28:02 +0000 (11:28 +1100)]
Merge branch 'opp/linux-next' of git://git./linux/kernel/git/vireshk/pm.git
Stephen Rothwell [Tue, 1 Mar 2022 00:26:50 +0000 (11:26 +1100)]
Merge branch 'cpupower' of git://git./linux/kernel/git/shuah/linux.git
Stephen Rothwell [Tue, 1 Mar 2022 00:24:41 +0000 (11:24 +1100)]
Merge branch 'cpufreq/arm/linux-next' of git://git./linux/kernel/git/vireshk/pm.git
Stephen Rothwell [Tue, 1 Mar 2022 00:09:56 +0000 (11:09 +1100)]
Merge branch 'linux-next' of git://git./linux/kernel/git/rafael/linux-pm.git
Stephen Rothwell [Tue, 1 Mar 2022 00:07:47 +0000 (11:07 +1100)]
Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git
Stephen Rothwell [Tue, 1 Mar 2022 00:05:21 +0000 (11:05 +1100)]
Merge branch 'master' of git://linuxtv.org/media_tree.git
Stephen Rothwell [Tue, 1 Mar 2022 00:04:09 +0000 (11:04 +1100)]
Merge branch 'docs-next' of git://git.lwn.net/linux.git
Stephen Rothwell [Tue, 1 Mar 2022 00:02:17 +0000 (11:02 +1100)]
Merge branch 'hwmon-next' of git://git./linux/kernel/git/groeck/linux-staging.git
Stephen Rothwell [Mon, 28 Feb 2022 23:47:52 +0000 (10:47 +1100)]
Merge branch 'i2c/for-next' of git://git./linux/kernel/git/wsa/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 23:46:15 +0000 (10:46 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/hid/hid.git
Stephen Rothwell [Mon, 28 Feb 2022 23:32:41 +0000 (10:32 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/helgaas/pci.git
Stephen Rothwell [Mon, 28 Feb 2022 23:30:32 +0000 (10:30 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/printk/linux.git
Tiezhu Yang [Tue, 22 Feb 2022 09:57:05 +0000 (17:57 +0800)]
bpf: Add some description about BPF_JIT_ALWAYS_ON in Kconfig
When CONFIG_BPF_JIT_ALWAYS_ON is enabled, /proc/sys/net/core/bpf_jit_enable
is permanently set to 1 and setting any other value than that will return
failure.
Add the above description in the help text of config BPF_JIT_ALWAYS_ON, and
then we can distinguish between BPF_JIT_ALWAYS_ON and BPF_JIT_DEFAULT_ON.
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Song Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/1645523826-18149-2-git-send-email-yangtiezhu@loongson.cn
Stephen Rothwell [Mon, 28 Feb 2022 23:14:21 +0000 (10:14 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/viro/vfs.git
# Conflicts:
# arch/x86/um/Kconfig
Stephen Rothwell [Mon, 28 Feb 2022 23:14:20 +0000 (10:14 +1100)]
Merge branch 'locks-next' of git://git./linux/kernel/git/jlayton/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:20 +0000 (10:14 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/dlemoal/zonefs.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:19 +0000 (10:14 +1100)]
Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:19 +0000 (10:14 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/cel/linux
Stephen Rothwell [Mon, 28 Feb 2022 23:14:18 +0000 (10:14 +1100)]
Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:18 +0000 (10:14 +1100)]
Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:17 +0000 (10:14 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/gfs2/linux-gfs2.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:17 +0000 (10:14 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/mszeredi/fuse.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:16 +0000 (10:14 +1100)]
Merge branch 'dev' of git://git./linux/kernel/git/jaegeuk/f2fs.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:16 +0000 (10:14 +1100)]
Merge branch 'dev' of git://git./linux/kernel/git/tytso/ext4.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:16 +0000 (10:14 +1100)]
Merge branch 'for_next' of git://git./linux/kernel/git/jack/linux-fs.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:15 +0000 (10:14 +1100)]
Merge branch 'dev' of git://git./linux/kernel/git/xiang/erofs.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:15 +0000 (10:14 +1100)]
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:14 +0000 (10:14 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/kdave/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:14 +0000 (10:14 +1100)]
Merge branch 'master' of git://git./fs/fscrypt/fscrypt.git
Stephen Rothwell [Mon, 28 Feb 2022 23:14:14 +0000 (10:14 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/brauner/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:46 +0000 (09:57 +1100)]
Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:45 +0000 (09:57 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/s390/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:45 +0000 (09:57 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/riscv/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:44 +0000 (09:57 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/leo/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:44 +0000 (09:57 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/powerpc/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:44 +0000 (09:57 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/deller/parisc-linux.git
# Conflicts:
# arch/parisc/lib/memcpy.c
Stephen Rothwell [Mon, 28 Feb 2022 22:57:43 +0000 (09:57 +1100)]
Merge branch 'for-next' of git://github.com/openrisc/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:43 +0000 (09:57 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/greentime/linux.git
# Conflicts:
# arch/nds32/Kbuild
# arch/nds32/Kconfig
Stephen Rothwell [Mon, 28 Feb 2022 22:57:42 +0000 (09:57 +1100)]
Merge branch 'mips-next' of git://git./linux/kernel/git/mips/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:41 +0000 (09:57 +1100)]
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:41 +0000 (09:57 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/gerg/m68knommu.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:41 +0000 (09:57 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/geert/linux-m68k.git
Stephen Rothwell [Mon, 28 Feb 2022 22:57:40 +0000 (09:57 +1100)]
Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git
# Conflicts:
# arch/h8300/mm/memory.c
Stephen Rothwell [Mon, 28 Feb 2022 22:55:37 +0000 (09:55 +1100)]
Merge branch 'renesas-clk' of git://git./linux/kernel/git/geert/renesas-drivers.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:37 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/abelvesa/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:37 +0000 (09:55 +1100)]
Merge branch 'clk-next' of git://git./linux/kernel/git/clk/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:36 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:36 +0000 (09:55 +1100)]
Merge branch 'ti-next' of git://git./linux/kernel/git/ti/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:33 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/tegra/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:33 +0000 (09:55 +1100)]
Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:33 +0000 (09:55 +1100)]
Merge branch 'sunxi/for-next' of git://git./linux/kernel/git/sunxi/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:32 +0000 (09:55 +1100)]
Merge branch 'stm32-next' of git://git./linux/kernel/git/atorgue/stm32.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:30 +0000 (09:55 +1100)]
Merge branch 'for-linux-next' of git://git./linux/kernel/git/sudeep.holla/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:26 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/krzk/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:23 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/mmind/linux-rockchip.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:23 +0000 (09:55 +1100)]
Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux
Stephen Rothwell [Mon, 28 Feb 2022 22:55:20 +0000 (09:55 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/geert/renesas-devel.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:20 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/nsaenz/linux-rpi.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:20 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/qcom/linux.git
# Conflicts:
# arch/arm64/configs/defconfig
Stephen Rothwell [Mon, 28 Feb 2022 22:55:19 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/tmlind/linux-omap.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:19 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/gclement/mvebu.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:19 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/matthias.bgg/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:18 +0000 (09:55 +1100)]
Merge branch 'next' of git://git./linux/kernel/git/ssantosh/linux-keystone.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:15 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/shawnguo/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:14 +0000 (09:55 +1100)]
Merge branch 'for-next' of https://git./linux/kernel/git/krzk/linux-mem-ctrl.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:13 +0000 (09:55 +1100)]
Merge branch 'at91-next' of git://git./linux/kernel/git/at91/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:13 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/joel/bmc.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:12 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/amlogic/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:12 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/mani/linux-actions.git
Stephen Rothwell [Mon, 28 Feb 2022 22:55:12 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/soc/soc.git
# Conflicts:
# arch/arm/Kconfig
Stephen Rothwell [Mon, 28 Feb 2022 22:55:11 +0000 (09:55 +1100)]
Merge branch 'for-next/core' of git://git./linux/kernel/git/arm64/linux
Stephen Rothwell [Mon, 28 Feb 2022 22:55:10 +0000 (09:55 +1100)]
Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git
Stephen Rothwell [Mon, 28 Feb 2022 22:40:36 +0000 (09:40 +1100)]
Merge branch 'master' of git://git./linux/kernel/git/arnd/asm-generic.git
Stephen Rothwell [Mon, 28 Feb 2022 22:38:28 +0000 (09:38 +1100)]
Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git
Stephen Rothwell [Mon, 28 Feb 2022 22:37:16 +0000 (09:37 +1100)]
Merge branch 'perf/core' of git://git./linux/kernel/git/acme/linux.git
Stephen Rothwell [Mon, 28 Feb 2022 22:36:02 +0000 (09:36 +1100)]
Merge branch 'for-next' of git://git./linux/kernel/git/masahiroy/linux-kbuild.git
Stephen Rothwell [Mon, 28 Feb 2022 22:30:52 +0000 (09:30 +1100)]
Merge branch 'for-next/kspp' of git://git./linux/kernel/git/gustavoars/linux.git
Mark Brown [Mon, 28 Feb 2022 22:23:37 +0000 (22:23 +0000)]
Merge remote-tracking branch 'asoc/for-5.18' into asoc-next
projects / linux-2.6-block.git / log