# git rev-parse -q --verify eb03e318135419b8b781f83cdfa7dbb9252afad6^{commit} eb03e318135419b8b781f83cdfa7dbb9252afad6 already have revision, skipping fetch # git checkout -q -f -B kisskb eb03e318135419b8b781f83cdfa7dbb9252afad6 # git clean -qxdf # < git log -1 # commit eb03e318135419b8b781f83cdfa7dbb9252afad6 # Merge: 029c77f89a15 95339f40a8b6 # Author: Linus Torvalds # Date: Thu May 25 10:26:36 2023 -0700 # # Merge tag 'for-v6.4-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply # # Pull power supply fixes from Sebastian Reichel: # # - Fix power_supply_get_battery_info for devices without parent devices # resulting in NULL pointer dereference # # - Fix desktop systems reporting to run on battery once a power-supply # device with device scope appears (e.g. a HID keyboard with a battery) # # - Ratelimit debug print about driver not providing data # # - Fix race condition related to external_power_changed in multiple # drivers (ab8500, axp288, bq25890, sc27xx, bq27xxx) # # - Fix LED trigger switching from blinking to solid-on when charging # finishes # # - Fix multiple races in bq27xxx battery driver # # - mt6360: handle potential ENOMEM from devm_work_autocancel # # - sbs-charger: Fix SBS_CHARGER_STATUS_CHARGE_INHIBITED bit # # - rt9467: avoid passing 0 to dev_err_probe # # * tag 'for-v6.4-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (21 commits) # power: supply: Fix logic checking if system is running from battery # power: supply: mt6360: add a check of devm_work_autocancel in mt6360_charger_probe # power: supply: sbs-charger: Fix INHIBITED bit for Status reg # power: supply: rt9467: Fix passing zero to 'dev_err_probe' # power: supply: Ratelimit no data debug output # power: supply: Fix power_supply_get_battery_info() if parent is NULL # power: supply: bq24190: Call power_supply_changed() after updating input current # power: supply: bq25890: Call power_supply_changed() after updating input current or voltage # power: supply: bq27xxx: Use mod_delayed_work() instead of cancel() + schedule() # power: supply: bq27xxx: After charger plug in/out wait 0.5s for things to stabilize # power: supply: bq27xxx: Ensure power_supply_changed() is called on current sign changes # power: supply: bq27xxx: Move bq27xxx_battery_update() down # power: supply: bq27xxx: Add cache parameter to bq27xxx_battery_current_and_status() # power: supply: bq27xxx: Fix poll_interval handling and races on remove # power: supply: bq27xxx: Fix I2C IRQ race on remove # power: supply: bq27xxx: Fix bq27xxx_battery_update() race condition # power: supply: leds: Fix blink to LED on transition # power: supply: sc27xx: Fix external_power_changed race # power: supply: bq25890: Fix external_power_changed race # power: supply: axp288_fuel_gauge: Fix external_power_changed race # ... # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 eb03e318135419b8b781f83cdfa7dbb9252afad6 # < make -s -j 40 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- allmodconfig # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig # < make -s -j 40 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- help # make -s -j 40 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- olddefconfig # make -s -j 40 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c: In function 'mtk_hdmi_pll_prepare': /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c:357:12: sorry, unimplemented: '-mgeneral-regs-only' and floating point code static int mtk_hdmi_pll_prepare(struct clk_hw *hw) ^ /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c:357:12: sorry, unimplemented: '-mgeneral-regs-only' and floating point code /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c: In function 'mtk_hdmi_pll_set_rate': /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c:408:12: sorry, unimplemented: '-mgeneral-regs-only' and floating point code static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, ^ /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c:408:12: sorry, unimplemented: '-mgeneral-regs-only' and floating point code /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c:408:12: sorry, unimplemented: '-mgeneral-regs-only' and floating point code /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c:408:12: sorry, unimplemented: '-mgeneral-regs-only' and floating point code make[5]: *** [/kisskb/src/scripts/Makefile.build:252: drivers/phy/mediatek/phy-mtk-hdmi-mt8195.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/phy/mediatek] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/phy] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:494: drivers] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/trace/define_trace.h:102:0, from /kisskb/src/fs/xfs/scrub/trace.h:988, from /kisskb/src/fs/xfs/scrub/trace.c:40: /kisskb/src/fs/xfs/./scrub/trace.h: In function 'trace_raw_output_xchk_fsgate_class': /kisskb/src/fs/xfs/scrub/scrub.h:111:28: error: initializer element is not constant #define XREP_ALREADY_FIXED (1 << 31) /* checking our repair work */ ^ /kisskb/src/include/trace/trace_events.h:203:27: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_event_printf(iter, print); \ ^ /kisskb/src/fs/xfs/./scrub/trace.h:164:2: note: in expansion of macro 'TP_printk' TP_printk("dev %d:%d type %s fsgates '%s'", ^ /kisskb/src/fs/xfs/./scrub/trace.h:167:5: note: in expansion of macro '__print_flags' __print_flags(__entry->fsgate_flags, "|", XFS_SCRUB_STATE_STRINGS)) ^ /kisskb/src/fs/xfs/./scrub/trace.h:103:4: note: in expansion of macro 'XREP_ALREADY_FIXED' { XREP_ALREADY_FIXED, "already_fixed" } ^ /kisskb/src/fs/xfs/./scrub/trace.h:167:47: note: in expansion of macro 'XFS_SCRUB_STATE_STRINGS' __print_flags(__entry->fsgate_flags, "|", XFS_SCRUB_STATE_STRINGS)) ^ /kisskb/src/fs/xfs/scrub/scrub.h:111:28: note: (near initialization for '__flags[3].mask') #define XREP_ALREADY_FIXED (1 << 31) /* checking our repair work */ ^ /kisskb/src/include/trace/trace_events.h:203:27: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_event_printf(iter, print); \ ^ /kisskb/src/fs/xfs/./scrub/trace.h:164:2: note: in expansion of macro 'TP_printk' TP_printk("dev %d:%d type %s fsgates '%s'", ^ /kisskb/src/fs/xfs/./scrub/trace.h:167:5: note: in expansion of macro '__print_flags' __print_flags(__entry->fsgate_flags, "|", XFS_SCRUB_STATE_STRINGS)) ^ /kisskb/src/fs/xfs/./scrub/trace.h:103:4: note: in expansion of macro 'XREP_ALREADY_FIXED' { XREP_ALREADY_FIXED, "already_fixed" } ^ /kisskb/src/fs/xfs/./scrub/trace.h:167:47: note: in expansion of macro 'XFS_SCRUB_STATE_STRINGS' __print_flags(__entry->fsgate_flags, "|", XFS_SCRUB_STATE_STRINGS)) ^ make[4]: *** [/kisskb/src/scripts/Makefile.build:252: fs/xfs/scrub/trace.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:494: fs/xfs] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:494: fs] Error 2 make[1]: *** [/kisskb/src/Makefile:2026: .] Error 2 make: *** [Makefile:226: __sub-make] Error 2 Command 'make -s -j 40 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_arm64-allmodconfig_arm64-gcc5 # Build took: 0:04:38.635612