# git rev-parse -q --verify c54b245d011855ea91c5beff07f1db74143ce614^{commit} c54b245d011855ea91c5beff07f1db74143ce614 already have revision, skipping fetch # git checkout -q -f -B kisskb c54b245d011855ea91c5beff07f1db74143ce614 # git clean -qxdf # < git log -1 # commit c54b245d011855ea91c5beff07f1db74143ce614 # Merge: e17c120f48f7 5e6b8a50a7ce # Author: Linus Torvalds # Date: Mon Jun 28 20:39:26 2021 -0700 # # Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace # # Pull user namespace rlimit handling update from Eric Biederman: # "This is the work mainly by Alexey Gladkov to limit rlimits to the # rlimits of the user that created a user namespace, and to allow users # to have stricter limits on the resources created within a user # namespace." # # * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: # cred: add missing return error code when set_cred_ucounts() failed # ucounts: Silence warning in dec_rlimit_ucounts # ucounts: Set ucount_max to the largest positive value the type can hold # kselftests: Add test to check for rlimit changes in different user namespaces # Reimplement RLIMIT_MEMLOCK on top of ucounts # Reimplement RLIMIT_SIGPENDING on top of ucounts # Reimplement RLIMIT_MSGQUEUE on top of ucounts # Reimplement RLIMIT_NPROC on top of ucounts # Use atomic_t for ucounts reference counting # Add a reference to ucounts for each cred # Increase size of ucounts to atomic_long_t # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 c54b245d011855ea91c5beff07f1db74143ce614 # < make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:4586:warning: override: reassigning to symbol GCC_PLUGIN_CYC_COMPLEXITY .config:4588:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:4592:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:4594:warning: override: reassigning to symbol UML_NET_SLIP .config:4597:warning: override: reassigning to symbol UML_NET_MCAST .config:4599:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 LINK linux Completed OK # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:09:29.709496