# 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/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 449dc8c97089a6e09fb2dac4d92b1b7ac0eb7c1e # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_rsk7201_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- rsk7201_defconfig # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_rsk7201_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 48 ARCH=sh O=/kisskb/build/linus_rsk7201_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 48 ARCH=sh O=/kisskb/build/linus_rsk7201_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh2a/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2a/../../entry-common.S:385: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2a/../../entry-common.S:388: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/ptrace_32.c:168:5: error: conflicting types for 'fpregs_get' int fpregs_get(struct task_struct *target, ^ In file included from /kisskb/src/arch/sh/kernel/ptrace_32.c:31:0: /kisskb/src/arch/sh/include/asm/fpu.h:40:12: note: previous declaration of 'fpregs_get' was here extern int fpregs_get(struct task_struct *target, ^ make[2]: *** [/kisskb/src/scripts/Makefile.build:280: arch/sh/kernel/ptrace_32.o] Error 1 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/arch/sh/kernel/process_32.c: In function 'dump_fpu': /kisskb/src/arch/sh/kernel/process_32.c:107:19: error: excess elements in struct initializer [-Werror] (struct membuf){fpu, sizeof(*fpu)}); ^ /kisskb/src/arch/sh/kernel/process_32.c:107:19: error: (near initialization for '(anonymous)') [-Werror] /kisskb/src/arch/sh/kernel/process_32.c:107:19: error: excess elements in struct initializer [-Werror] /kisskb/src/arch/sh/kernel/process_32.c:107:19: error: (near initialization for '(anonymous)') [-Werror] /kisskb/src/arch/sh/kernel/process_32.c:107:19: error: invalid use of undefined type 'struct membuf' /kisskb/src/arch/sh/kernel/process_32.c:106:14: error: too few arguments to function 'fpregs_get' fpvalid = !fpregs_get(tsk, NULL, ^ In file included from /kisskb/src/arch/sh/kernel/process_32.c:27:0: /kisskb/src/arch/sh/include/asm/fpu.h:40:12: note: declared here extern int fpregs_get(struct task_struct *target, ^ cc1: all warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:281: arch/sh/kernel/process_32.o] Error 1 make[1]: *** [/kisskb/src/Makefile:1781: arch/sh/kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/sh/clk/cpg.c: In function 'r8': /kisskb/src/drivers/sh/clk/cpg.c:41:17: warning: passing argument 1 of 'ioread8' discards 'const' qualifier from pointer target type return ioread8(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:29:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread8(void __iomem *); ^ /kisskb/src/drivers/sh/clk/cpg.c: In function 'r16': /kisskb/src/drivers/sh/clk/cpg.c:46:18: warning: passing argument 1 of 'ioread16' discards 'const' qualifier from pointer target type return ioread16(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:30:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread16(void __iomem *); ^ /kisskb/src/drivers/sh/clk/cpg.c: In function 'r32': /kisskb/src/drivers/sh/clk/cpg.c:51:18: warning: passing argument 1 of 'ioread32' discards 'const' qualifier from pointer target type return ioread32(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:32:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread32(void __iomem *); ^ make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 48 ARCH=sh O=/kisskb/build/linus_rsk7201_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_rsk7201_defconfig_sh4-gcc4.9 # Build took: 0:00:25.781466