# git rev-parse -q --verify 38525c6919e2f6b27c1855905f342a0def3cbdcf^{commit} 38525c6919e2f6b27c1855905f342a0def3cbdcf already have revision, skipping fetch # git checkout -q -f -B kisskb 38525c6919e2f6b27c1855905f342a0def3cbdcf # git clean -qxdf # < git log -1 # commit 38525c6919e2f6b27c1855905f342a0def3cbdcf # Merge: f9915b964c25 7007fab4ae82 # Author: Linus Torvalds # Date: Tue Oct 20 10:56:34 2020 -0700 # # Merge tag 'for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply # # Pull power supply and reset updates from Sebastian Reichel: # "Power-supply core: # - add wireless type # - properly document current direction # # Battery/charger driver changes: # - new fuel-gauge/charger driver for RN5T618/RN5T619 # - new charger driver for BQ25980, BQ25975 and BQ25960 # - bq27xxx-battery: add support for TI bq34z100 # - gpio-charger: convert to GPIO descriptors # - gpio-charger: add optional support for charge current limiting # - max17040: add support for max17041, max17043, max17044 # - max17040: add support for max17048, max17049, max17058, max17059 # - smb347-charger: add DT support # - smb247-charger: add SMB345 and SMB358 support # - simple-battery: add temperature properties # - lots of minor fixes, cleanups and DT binding YAML conversions # # Reset drivers: # - ocelot: Add support for Sparx5" # # * tag 'for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (81 commits) # power: reset: POWER_RESET_OCELOT_RESET should depend on Ocelot or Sparx5 # power: supply: bq25980: Fix uninitialized wd_reg_val and overrun # power: supply: ltc2941: Fix ptr to enum cast # power: supply: test-power: revise parameter printing to use sprintf # power: supply: charger-manager: fix incorrect check on charging_duration_ms # power: supply: max17040: Fix ptr to enum cast # power: supply: bq25980: Fix uninitialized wd_reg_val # power: supply: bq25980: remove redundant zero check on ret # power: reset: ocelot: Add support for Sparx5 # dt-bindings: reset: ocelot: Add Sparx5 support # power: supply: sbs-battery: keep error code when get_property() fails # power: supply: bq25980: Add support for the BQ259xx family # dt-binding: bq25980: Add the bq25980 flash charger # power: supply: fix spelling mistake "unprecise" -> "imprecise" # power: supply: test_power: add missing newlines when printing parameters by sysfs # power: supply: pm2301: drop duplicated i2c_device_id # power: supply: charger-manager: drop unused charger assignment # power: supply: rt9455: skip 'struct acpi_device_id' when !CONFIG_ACPI # power: supply: goldfish: skip 'struct acpi_device_id' when !CONFIG_ACPI # power: supply: bq25890: skip 'struct acpi_device_id' when !CONFIG_ACPI # ... # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 38525c6919e2f6b27c1855905f342a0def3cbdcf # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:11:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:12, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:78:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ In file included from /kisskb/src/arch/powerpc/include/asm/cmpxchg.h:6:0, from /kisskb/src/arch/powerpc/include/asm/atomic.h:11, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/linux/crypto.h:15, from /kisskb/src/include/crypto/hash.h:11, from /kisskb/src/lib/iov_iter.c:2: /kisskb/src/lib/iov_iter.c: In function 'iovec_from_user.part.32': /kisskb/src/arch/powerpc/include/asm/uaccess.h:287:2: error: 'asm' operand has impossible constraints __asm__ __volatile__( \ ^ /kisskb/src/include/linux/compiler.h:78:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:583:34: note: in expansion of macro 'unsafe_op_wrap' #define unsafe_get_user(x, p, e) unsafe_op_wrap(__get_user_allowed(x, p), e) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:329:10: note: in expansion of macro '__get_user_asm' case 4: __get_user_asm(x, (u32 __user *)ptr, retval, "lwz"); break; \ ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:363:3: note: in expansion of macro '__get_user_size_allowed' __get_user_size_allowed(__gu_val, __gu_addr, __gu_size, __gu_err); \ ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:100:2: note: in expansion of macro '__get_user_nocheck' __get_user_nocheck((x), (ptr), sizeof(*(ptr)), false) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:583:49: note: in expansion of macro '__get_user_allowed' #define unsafe_get_user(x, p, e) unsafe_op_wrap(__get_user_allowed(x, p), e) ^ /kisskb/src/lib/iov_iter.c:1668:3: note: in expansion of macro 'unsafe_get_user' unsafe_get_user(len, &uiov[i].iov_len, uaccess_end); ^ make[2]: *** [/kisskb/src/scripts/Makefile.build:283: lib/iov_iter.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1777: lib] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 # Build took: 0:01:48.763944