From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 May 2019 21:57:23 +0000 (-0700)
Subject: Merge tag 'for-v5.1-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux... 
X-Git-Tag: v5.4-rc1~1156
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=600d7258316d87cf9ecd58b6fdc8a35deca0870c;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'for-v5.1-rc' of git://git./linux/kernel/git/sre/linux-power-supply

Pull power supply fixes from Sebastian Reichel:
 "Two more fixes for the 5.1 cycle.

  One division by zero fix in a specific driver and one core workaround
  for bad userspace behaviour from systemd regarding uevents. IMHO this
  can be considered to be a userspace bug, but the debug messages are
  useless anyways

   - cpcap-battery: fix a division by zero

   - core: fix systemd issue due to log messages produced by uevent"

* tag 'for-v5.1-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power: supply: sysfs: prevent endless uevent loop with CONFIG_POWER_SUPPLY_DEBUG
  power: supply: cpcap-battery: Fix division by zero
---

600d7258316d87cf9ecd58b6fdc8a35deca0870c