# git rev-parse -q --verify cd278456d4ca0e6b3d5e10ace4566524baa144eb^{commit} cd278456d4ca0e6b3d5e10ace4566524baa144eb already have revision, skipping fetch # git checkout -q -f -B kisskb cd278456d4ca0e6b3d5e10ace4566524baa144eb # git clean -qxdf # < git log -1 # commit cd278456d4ca0e6b3d5e10ace4566524baa144eb # Merge: 7d19ea5e9973 6607aa6f6b68 # Author: Linus Torvalds # Date: Sun Feb 28 12:06:45 2021 -0800 # # Merge tag 'csky-for-linus-5.12-rc1' of git://github.com/c-sky/csky-linux # # Pull arch/csky updates from Guo Ren: # "Features: # - add new memory layout 2.5G(user):1.5G(kernel) # - add kmemleak support # - reconstruct VDSO framework: add VDSO with GENERIC_GETTIMEOFDAY, # GENERIC_TIME_VSYSCALL, HAVE_GENERIC_VDSO # - add faulthandler_disabled() check # - support (fix) swapon # - add (fix) _PAGE_ACCESSED for default pgprot # - abort uaccess retries upon fatal signal (from arm) # # Fixes and optimizations: # - fix perf probe failure # - fix show_regs doesn't contain regs->usp # - remove custom asm/atomic.h implementation # - fix barrier design # - fix futex SMP implementation # - fix asm/cmpxchg.h with correct ordering barrier # - cleanup asm/spinlock.h # - fix PTE global for 2.5:1.5 virtual memory # - remove prologue of page fault handler in entry.S # - fix TLB maintenance synchronization problem # - add show_tlb for CPU_CK860 debug # - fix FAULT_FLAG_XXX param for handle_mm_fault # - fix update_mmu_cache called with user io mapping # - fix do_page_fault parent irq status # - fix a size determination in gpr_get() # - pgtable.h: Coding convention # - kprobe: Fix code in simulate without 'long' # - fix pfn_valid error with wrong max_mapnr # - use free_initmem_default() in free_initmem() # - fix compile error" # # * tag 'csky-for-linus-5.12-rc1' of git://github.com/c-sky/csky-linux: (30 commits) # csky: Fixup compile error # csky: use free_initmem_default() in free_initmem() # csky: Fixup pfn_valid error with wrong max_mapnr # csky: Add VDSO with GENERIC_GETTIMEOFDAY, GENERIC_TIME_VSYSCALL, HAVE_GENERIC_VDSO # csky: kprobe: Fixup code in simulate without 'long' # csky: Fixup swapon # csky: pgtable.h: Coding convention # csky: Fixup _PAGE_ACCESSED for default pgprot # csky: remove unused including # csky: Fix a size determination in gpr_get() # csky: Reconstruct VDSO framework # csky: mm: abort uaccess retries upon fatal signal # csky: Sync riscv mm/fault.c for easy maintenance # csky: Fixup do_page_fault parent irq status # csky: Add faulthandler_disabled() check # csky: Fixup update_mmu_cache called with user io mapping # csky: Fixup FAULT_FLAG_XXX param for handle_mm_fault # csky: Add show_tlb for CPU_CK860 debug # csky: Fix TLB maintenance synchronization problem # csky: Add kmemleak support # ... # < /opt/cross/kisskb/korg/gcc-9.3.0-nolibc/or1k-linux/bin/or1k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-9.3.0-nolibc/or1k-linux/bin/or1k-linux-ld --version # < git log --format=%s --max-count=1 cd278456d4ca0e6b3d5e10ace4566524baa144eb # < make -s -j 48 ARCH=openrisc O=/kisskb/build/linus_or1ksim_defconfig_or32 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.3.0-nolibc/or1k-linux/bin/or1k-linux- or1ksim_defconfig # < make -s -j 48 ARCH=openrisc O=/kisskb/build/linus_or1ksim_defconfig_or32 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.3.0-nolibc/or1k-linux/bin/or1k-linux- help # make -s -j 48 ARCH=openrisc O=/kisskb/build/linus_or1ksim_defconfig_or32 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.3.0-nolibc/or1k-linux/bin/or1k-linux- olddefconfig # make -s -j 48 ARCH=openrisc O=/kisskb/build/linus_or1ksim_defconfig_or32 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.3.0-nolibc/or1k-linux/bin/or1k-linux- Completed OK # rm -rf /kisskb/build/linus_or1ksim_defconfig_or32 # Build took: 0:00:33.375111