# git rev-parse -q --verify 5e857ce6eae7ca21b2055cca4885545e29228fe2^{commit} 5e857ce6eae7ca21b2055cca4885545e29228fe2 already have revision, skipping fetch # git checkout -q -f -B kisskb 5e857ce6eae7ca21b2055cca4885545e29228fe2 # git clean -qxdf # < git log -1 # commit 5e857ce6eae7ca21b2055cca4885545e29228fe2 # Merge: 670d0a4b1070 0c389d89abc2 # Author: Linus Torvalds # Date: Thu Jun 18 12:35:51 2020 -0700 # # Merge branch 'hch' (maccess patches from Christoph Hellwig) # # Merge non-faulting memory access cleanups from Christoph Hellwig: # "Andrew and I decided to drop the patches implementing your suggested # rename of the probe_kernel_* and probe_user_* helpers from -mm as # there were way to many conflicts. # # After -rc1 might be a good time for this as all the conflicts are # resolved now" # # This also adds a type safety checking patch on top of the renaming # series to make the subtle behavioral difference between 'get_user()' and # 'get_kernel_nofault()' less potentially dangerous and surprising. # # * emailed patches from Christoph Hellwig : # maccess: make get_kernel_nofault() check for minimal type compatibility # maccess: rename probe_kernel_address to get_kernel_nofault # maccess: rename probe_user_{read,write} to copy_{from,to}_user_nofault # maccess: rename probe_kernel_{read,write} to copy_{from,to}_kernel_nofault # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld --version # < git log --format=%s --max-count=1 5e857ce6eae7ca21b2055cca4885545e29228fe2 # < make -s -j 48 ARCH=arm O=/kisskb/build/linus_imx_v4_v5_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- imx_v4_v5_defconfig # < make -s -j 48 ARCH=arm O=/kisskb/build/linus_imx_v4_v5_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- help # make -s -j 48 ARCH=arm O=/kisskb/build/linus_imx_v4_v5_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- olddefconfig # make -s -j 48 ARCH=arm O=/kisskb/build/linus_imx_v4_v5_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- Completed OK # rm -rf /kisskb/build/linus_imx_v4_v5_defconfig_arm-gcc4.9 # Build took: 0:01:08.703334