# git rev-parse -q --verify 449dc8c97089a6e09fb2dac4d92b1b7ac0eb7c1e^{commit} 449dc8c97089a6e09fb2dac4d92b1b7ac0eb7c1e already have revision, skipping fetch # git checkout -q -f -B kisskb 449dc8c97089a6e09fb2dac4d92b1b7ac0eb7c1e # git clean -qxdf # < git log -1 # commit 449dc8c97089a6e09fb2dac4d92b1b7ac0eb7c1e # Merge: b79675e15a75 46cbd0b05799 # Author: Linus Torvalds # Date: Fri Aug 7 21:27:37 2020 -0700 # # Merge tag 'for-v5.9' 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 COOL/WARM/HOT state from JEITA JISC8712:2015 specification # - convert simple-battery DT binding to YAML # - add long-life charging mode # # Battery/charger drivers: # - bq25150: new charger driver # - bq27xxx: add support for BQ27z561 and BQ28z610 # - max17040: support CAPACITY_ALERT_MIN # - sbs-battery: add PEC support # - wilco-ec: support long-life charging mode # - bq25890: fix DT binding # - misc. fixes and cleanups # # Reset drivers: # - linkstation: new reset driver" # # * tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (32 commits) # power: supply: wilco_ec: Add long life charging mode # power: supply: bq27xxx_battery: Add the BQ28z610 Battery monitor # dt-bindings: power: Add BQ28z610 compatible # power: supply: bq27xxx_battery: Add the BQ27Z561 Battery monitor # dt-bindings: power: Add BQ27Z561 compatible # power: supply: test_power: Fix battery_current initial value # power: supply: Fix kerneldoc of power_supply_temp2resist_simple() # power: supply: cpcap-battery: Fix kerneldoc of cpcap_battery_read_accumulated() # dt-bindings: power: Convert battery.txt to battery.yaml # power: supply: rt5033_battery: Fix error code in rt5033_battery_probe() # power: supply: max17040: Add POWER_SUPPLY_PROP_CAPACITY_ALERT_MIN # power: supply: check if calc_soc succeeded in pm860x_init_battery # power: supply: bq2xxxx: Replace HTTP links with HTTPS ones # power: reset: add driver for LinkStation power off # power: supply: sc27xx: prevent adc * 1000 from overflow # math64: New DIV_S64_ROUND_CLOSEST helper # power: fix duplicated words in bq2415x_charger.h # power: Convert to DEFINE_SHOW_ATTRIBUTE # power: reset: keystone-reset: Replace HTTP links with HTTPS ones # power: supply: bq25150 introduce the bq25150 # ... # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version # < git log --format=%s --max-count=1 449dc8c97089a6e09fb2dac4d92b1b7ac0eb7c1e # < make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # Added to kconfig # < make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- help # make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- olddefconfig .config:12444:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- In file included from /kisskb/src/arch/mips/include/asm/bug.h:42:0, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/thread_info.h:12, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:15, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/include/linux/seqlock.h: In function 'write_seqcount_begin_nested': /kisskb/src/include/asm-generic/percpu.h:31:40: error: implicit declaration of function 'raw_smp_processor_id' [-Werror=implicit-function-declaration] #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^ /kisskb/src/include/asm-generic/bug.h:145:27: note: in definition of macro 'WARN_ON_ONCE' int __ret_warn_once = !!(condition); \ ^ /kisskb/src/include/linux/compiler_types.h:301:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^ /kisskb/src/include/linux/compiler_types.h:313:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^ /kisskb/src/include/asm-generic/percpu.h:119:10: note: in expansion of macro 'READ_ONCE' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^ /kisskb/src/include/linux/percpu-defs.h:231:2: note: in expansion of macro 'RELOC_HIDE' RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)) ^ /kisskb/src/include/asm-generic/percpu.h:44:31: note: in expansion of macro 'SHIFT_PERCPU_PTR' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^ /kisskb/src/include/asm-generic/percpu.h:31:25: note: in expansion of macro 'per_cpu_offset' #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^ /kisskb/src/include/asm-generic/percpu.h:44:53: note: in expansion of macro '__my_cpu_offset' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^ /kisskb/src/include/linux/percpu-defs.h:242:2: note: in expansion of macro 'arch_raw_cpu_ptr' arch_raw_cpu_ptr(ptr); \ ^ /kisskb/src/include/asm-generic/percpu.h:119:21: note: in expansion of macro 'raw_cpu_ptr' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^ /kisskb/src/include/asm-generic/percpu.h:138:11: note: in expansion of macro '__this_cpu_generic_read_nopreempt' __ret = __this_cpu_generic_read_nopreempt(pcp); \ ^ /kisskb/src/include/asm-generic/percpu.h:320:31: note: in expansion of macro 'this_cpu_generic_read' #define this_cpu_read_1(pcp) this_cpu_generic_read(pcp) ^ /kisskb/src/include/linux/percpu-defs.h:321:23: note: in expansion of macro 'this_cpu_read_1' case 1: pscr_ret__ = stem##1(variable); break; \ ^ /kisskb/src/include/linux/percpu-defs.h:507:29: note: in expansion of macro '__pcpu_size_call_return' #define this_cpu_read(pcp) __pcpu_size_call_return(this_cpu_read_, pcp) ^ /kisskb/src/include/linux/lockdep.h:565:9: note: in expansion of macro 'this_cpu_read' this_cpu_read(hardirqs_enabled))); \ ^ /kisskb/src/include/linux/seqlock.h:285:2: note: in expansion of macro 'lockdep_assert_preemption_disabled' lockdep_assert_preemption_disabled(); ^ In file included from /kisskb/src/include/linux/smp.h:82:0, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/time32.h:13, from /kisskb/src/include/linux/time.h:74, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/arch/mips/include/asm/smp.h: At top level: /kisskb/src/arch/mips/include/asm/smp.h:28:19: error: static declaration of 'raw_smp_processor_id' follows non-static declaration static inline int raw_smp_processor_id(void) ^ In file included from /kisskb/src/arch/mips/include/asm/bug.h:42:0, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/thread_info.h:12, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:15, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/include/asm-generic/percpu.h:31:40: note: previous implicit declaration of 'raw_smp_processor_id' was here #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^ /kisskb/src/include/asm-generic/bug.h:145:27: note: in definition of macro 'WARN_ON_ONCE' int __ret_warn_once = !!(condition); \ ^ /kisskb/src/include/linux/compiler_types.h:301:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^ /kisskb/src/include/linux/compiler_types.h:313:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^ /kisskb/src/include/asm-generic/percpu.h:119:10: note: in expansion of macro 'READ_ONCE' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^ /kisskb/src/include/linux/percpu-defs.h:231:2: note: in expansion of macro 'RELOC_HIDE' RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)) ^ /kisskb/src/include/asm-generic/percpu.h:44:31: note: in expansion of macro 'SHIFT_PERCPU_PTR' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^ /kisskb/src/include/asm-generic/percpu.h:31:25: note: in expansion of macro 'per_cpu_offset' #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^ /kisskb/src/include/asm-generic/percpu.h:44:53: note: in expansion of macro '__my_cpu_offset' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^ /kisskb/src/include/linux/percpu-defs.h:242:2: note: in expansion of macro 'arch_raw_cpu_ptr' arch_raw_cpu_ptr(ptr); \ ^ /kisskb/src/include/asm-generic/percpu.h:119:21: note: in expansion of macro 'raw_cpu_ptr' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^ /kisskb/src/include/asm-generic/percpu.h:138:11: note: in expansion of macro '__this_cpu_generic_read_nopreempt' __ret = __this_cpu_generic_read_nopreempt(pcp); \ ^ /kisskb/src/include/asm-generic/percpu.h:320:31: note: in expansion of macro 'this_cpu_generic_read' #define this_cpu_read_1(pcp) this_cpu_generic_read(pcp) ^ /kisskb/src/include/linux/percpu-defs.h:321:23: note: in expansion of macro 'this_cpu_read_1' case 1: pscr_ret__ = stem##1(variable); break; \ ^ /kisskb/src/include/linux/percpu-defs.h:507:29: note: in expansion of macro '__pcpu_size_call_return' #define this_cpu_read(pcp) __pcpu_size_call_return(this_cpu_read_, pcp) ^ /kisskb/src/include/linux/lockdep.h:565:9: note: in expansion of macro 'this_cpu_read' this_cpu_read(hardirqs_enabled))); \ ^ /kisskb/src/include/linux/seqlock.h:285:2: note: in expansion of macro 'lockdep_assert_preemption_disabled' lockdep_assert_preemption_disabled(); ^ cc1: some warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:114: arch/mips/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1195: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mipsel # Build took: 0:00:14.074602