# git rev-parse -q --verify 6c1dd1fe5d8a1d43ed96e2e0ed44a88c73c5c039^{commit} 6c1dd1fe5d8a1d43ed96e2e0ed44a88c73c5c039 already have revision, skipping fetch # git checkout -q -f -B kisskb 6c1dd1fe5d8a1d43ed96e2e0ed44a88c73c5c039 # git clean -qxdf # < git log -1 # commit 6c1dd1fe5d8a1d43ed96e2e0ed44a88c73c5c039 # Merge: e9b4c5890858 c00f94b3a5be # Author: Linus Torvalds # Date: Tue Jan 9 13:24:06 2024 -0800 # # Merge tag 'integrity-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity # # Pull integrity updates from Mimi Zohar: # # - Add a new IMA/EVM maintainer and reviewer # # - Disable EVM on overlayfs # # The EVM HMAC and the original file signatures contain filesystem # specific metadata (e.g. i_ino, i_generation and s_uuid), preventing # the security.evm xattr from directly being copied up to the overlay. # Further before calculating and writing out the overlay file's EVM # HMAC, EVM must first verify the existing backing file's # 'security.evm' value. # # For now until a solution is developed, disable EVM on overlayfs. # # - One bug fix and two cleanups # # * tag 'integrity-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity: # overlay: disable EVM # evm: add support to disable EVM on unsupported filesystems # evm: don't copy up 'security.evm' xattr # MAINTAINERS: Add Eric Snowberg as a reviewer to IMA # MAINTAINERS: Add Roberto Sassu as co-maintainer to IMA and EVM # KEYS: encrypted: Add check for strsep # ima: Remove EXPERIMENTAL from Kconfig # ima: Reword IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 6c1dd1fe5d8a1d43ed96e2e0ed44a88c73c5c039 # make -s -j 40 ARCH=powerpc O=/kisskb/build/linus_corenet32_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- corenet32_smp_defconfig Using /kisskb/src/arch/powerpc/configs/corenet_base.config as base Merging /kisskb/src/arch/powerpc/configs/85xx-32bit.config Merging /kisskb/src/arch/powerpc/configs/85xx-smp.config Merging /kisskb/src/arch/powerpc/configs/85xx-hw.config Merging /kisskb/src/arch/powerpc/configs/fsl-emb-nonhw.config Merging /kisskb/src/arch/powerpc/configs/dpaa.config # # merged configuration written to .config (needs make) # # < make -s -j 40 ARCH=powerpc O=/kisskb/build/linus_corenet32_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 40 ARCH=powerpc O=/kisskb/build/linus_corenet32_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 40 ARCH=powerpc O=/kisskb/build/linus_corenet32_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/kernel/cgroup/rstat.c:218:22: warning: no previous prototype for 'bpf_rstat_flush' [-Wmissing-prototypes] __weak noinline void bpf_rstat_flush(struct cgroup *cgrp, ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' /kisskb/src/net/core/filter.c:11799:17: warning: no previous prototype for 'bpf_dynptr_from_skb' [-Wmissing-prototypes] __bpf_kfunc int bpf_dynptr_from_skb(struct sk_buff *skb, u64 flags, ^ /kisskb/src/net/core/filter.c:11812:17: warning: no previous prototype for 'bpf_dynptr_from_xdp' [-Wmissing-prototypes] __bpf_kfunc int bpf_dynptr_from_xdp(struct xdp_buff *xdp, u64 flags, ^ /kisskb/src/net/core/filter.c:11825:17: warning: no previous prototype for 'bpf_sock_addr_set_sun_path' [-Wmissing-prototypes] __bpf_kfunc int bpf_sock_addr_set_sun_path(struct bpf_sock_addr_kern *sa_kern, ^ /kisskb/src/net/core/filter.c:11926:17: warning: no previous prototype for 'bpf_sock_destroy' [-Wmissing-prototypes] __bpf_kfunc int bpf_sock_destroy(struct sock_common *sock) ^ /kisskb/src/net/core/xdp.c:711:17: warning: no previous prototype for 'bpf_xdp_metadata_rx_timestamp' [-Wmissing-prototypes] __bpf_kfunc int bpf_xdp_metadata_rx_timestamp(const struct xdp_md *ctx, u64 *timestamp) ^ /kisskb/src/net/core/xdp.c:733:17: warning: no previous prototype for 'bpf_xdp_metadata_rx_hash' [-Wmissing-prototypes] __bpf_kfunc int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx, u32 *hash, ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-shift-negative-value' /kisskb/src/net/socket.c:1694:21: warning: no previous prototype for 'update_socket_protocol' [-Wmissing-prototypes] __weak noinline int update_socket_protocol(int family, int type, int protocol) ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' Completed OK # rm -rf /kisskb/build/linus_corenet32_smp_defconfig_powerpc-gcc5 # Build took: 0:01:22.272763