# git rev-parse -q --verify 9c91e6a5befb89d1494dd156dd4563f9e948a74f^{commit} 9c91e6a5befb89d1494dd156dd4563f9e948a74f already have revision, skipping fetch # git checkout -q -f -B kisskb 9c91e6a5befb89d1494dd156dd4563f9e948a74f # git clean -qxdf # < git log -1 # commit 9c91e6a5befb89d1494dd156dd4563f9e948a74f # Merge: 752272f16dd1 5781823fd0d3 # Author: Linus Torvalds # Date: Mon Nov 25 18:07:36 2019 -0800 # # Merge tag 'edac_for_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras # # Pull EDAC updates from Borislav Petkov: # "A lot of changes this time around, details below. # # From the next cycle onwards, we'll switch the EDAC tree to topic # branches (instead of a single edac-for-next branch) which should make # the changes handling more flexible, hopefully. We'll see. # # Summary: # # - Rework error logging functions to accept a count of errors # parameter (Hanna Hawa) # # - Part one of substantial EDAC core + ghes_edac driver cleanup # (Robert Richter) # # - Print additional useful logging information in skx_* (Tony Luck) # # - Improve amd64_edac hw detection + cleanups (Yazen Ghannam) # # - Misc cleanups, fixes and code improvements" # # * tag 'edac_for_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: (35 commits) # EDAC/altera: Use the Altera System Manager driver # EDAC/altera: Cleanup the ECC Manager # EDAC/altera: Use fast register IO for S10 IRQs # EDAC/ghes: Do not warn when incrementing refcount on 0 # EDAC/Documentation: Describe CPER module definition and DIMM ranks # EDAC: Unify the mc_event tracepoint call # EDAC/ghes: Remove intermediate buffer pvt->detail_location # EDAC/ghes: Fix grain calculation # EDAC/ghes: Use standard kernel macros for page calculations # EDAC: Remove misleading comment in struct edac_raw_error_desc # EDAC/mc: Reduce indentation level in edac_mc_handle_error() # EDAC/mc: Remove needless zero string termination # EDAC/mc: Do not BUG_ON() in edac_mc_alloc() # EDAC: Introduce an mci_for_each_dimm() iterator # EDAC: Remove EDAC_DIMM_OFF() macro # EDAC: Replace EDAC_DIMM_PTR() macro with edac_get_dimm() function # EDAC/amd64: Get rid of the ECC disabled long message # EDAC/ghes: Fix locking and memory barrier issues # EDAC/amd64: Check for memory before fully initializing an instance # EDAC/amd64: Use cached data when checking for ECC # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa64-linux/bin/hppa64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa64-linux/bin/hppa64-linux-ld --version # < git log --format=%s --max-count=1 9c91e6a5befb89d1494dd156dd4563f9e948a74f # < make -s -j 8 ARCH=parisc O=/kisskb/build/linus_a500_defconfig_parisc64 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa64-linux/bin/hppa64-linux- a500_defconfig # make -s -j 8 ARCH=parisc O=/kisskb/build/linus_a500_defconfig_parisc64 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa64-linux/bin/hppa64-linux- In file included from /kisskb/src/arch/parisc/include/asm/atomic.h:10, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/arch/parisc/include/asm/bitops.h:13, from /kisskb/src/include/linux/bitops.h:26, from /kisskb/src/include/linux/kernel.h:12, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/preempt.h:11, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/fs/nfs/read.c:11: /kisskb/src/fs/nfs/read.c: In function 'nfs_read_completion': /kisskb/src/arch/parisc/include/asm/cmpxchg.h:48:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr)))) ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/fs/nfs/read.c:196:5: note: in expansion of macro 'xchg' xchg(&nfs_req_openctx(req)->error, error); ^~~~ /kisskb/src/fs/nfs/read.c: In function 'nfs_readpage': /kisskb/src/arch/parisc/include/asm/cmpxchg.h:48:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr)))) ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/fs/nfs/read.c:352:2: note: in expansion of macro 'xchg' xchg(&ctx->error, 0); ^~~~ In file included from /kisskb/src/arch/parisc/include/asm/atomic.h:10, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/arch/parisc/include/asm/bitops.h:13, from /kisskb/src/include/linux/bitops.h:26, from /kisskb/src/include/linux/kernel.h:12, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:9, from /kisskb/src/drivers/scsi/scsi_debug.c:18: /kisskb/src/drivers/scsi/scsi_debug.c: In function 'resp_start_stop': /kisskb/src/arch/parisc/include/asm/cmpxchg.h:48:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr)))) /kisskb/src/arch/parisc/include/asm/atomic.h:78:30: note: in expansion of macro 'xchg' #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) ^~~~ /kisskb/src/drivers/scsi/scsi_debug.c:1618:2: note: in expansion of macro 'atomic_xchg' atomic_xchg(&devip->stopped, stop); ^~~~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_a500_defconfig_parisc64 # Build took: 0:02:51.119565