# git rev-parse -q --verify c03c21ba6f4e95e406a1a7b4c34ef334b977c194^{commit} c03c21ba6f4e95e406a1a7b4c34ef334b977c194 already have revision, skipping fetch # git checkout -q -f -B kisskb c03c21ba6f4e95e406a1a7b4c34ef334b977c194 # git clean -qxdf # < git log -1 # commit c03c21ba6f4e95e406a1a7b4c34ef334b977c194 # Merge: 414eece95b98 8f0bfc25c907 # Author: Linus Torvalds # Date: Tue Feb 23 16:09:23 2021 -0800 # # Merge tag 'keys-misc-20210126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs # # Pull keyring updates from David Howells: # "Here's a set of minor keyrings fixes/cleanups that I've collected from # various people for the upcoming merge window. # # A couple of them might, in theory, be visible to userspace: # # - Make blacklist_vet_description() reject uppercase letters as they # don't match the all-lowercase hex string generated for a blacklist # search. # # This may want reconsideration in the future, but, currently, you # can't add to the blacklist keyring from userspace and the only # source of blacklist keys generates lowercase descriptions. # # - Fix blacklist_init() to use a new KEY_ALLOC_* flag to indicate that # it wants KEY_FLAG_KEEP to be set rather than passing KEY_FLAG_KEEP # into keyring_alloc() as KEY_FLAG_KEEP isn't a valid alloc flag. # # This isn't currently a problem as the blacklist keyring isn't # currently writable by userspace. # # The rest of the patches are cleanups and I don't think they should # have any visible effect" # # * tag 'keys-misc-20210126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs: # watch_queue: rectify kernel-doc for init_watch() # certs: Replace K{U,G}IDT_INIT() with GLOBAL_ROOT_{U,G}ID # certs: Fix blacklist flag type confusion # PKCS#7: Fix missing include # certs: Fix blacklisted hexadecimal hash string check # certs/blacklist: fix kernel doc interface issue # crypto: public_key: Remove redundant header file from public_key.h # keys: remove trailing semicolon in macro definition # crypto: pkcs7: Use match_string() helper to simplify the code # PKCS#7: drop function from kernel-doc pkcs7_validate_trust_one # encrypted-keys: Replace HTTP links with HTTPS ones # crypto: asymmetric_keys: fix some comments in pkcs7_parser.h # KEYS: remove redundant memset # security: keys: delete repeated words in comments # KEYS: asymmetric: Fix kerneldoc # security/keys: use kvfree_sensitive() # watch_queue: Drop references to /dev/watch_queue # keys: Remove outdated __user annotations # security: keys: Fix fall-through warnings for Clang # < /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 c03c21ba6f4e95e406a1a7b4c34ef334b977c194 # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_44x_fsp2_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- 44x/fsp2_defconfig # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_44x_fsp2_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_44x_fsp2_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_44x_fsp2_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- INFO: Uncompressed kernel (size 0xa770bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) Image Name: Linux-5.11.0-gc03c21ba6f4e Created: Wed Feb 24 19:24:32 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4589857 Bytes = 4482.28 KiB = 4.38 MiB Load Address: 00000000 Entry Point: 00000000 Completed OK # rm -rf /kisskb/build/linus_44x_fsp2_defconfig_powerpc-gcc5 # Build took: 0:01:32.077475