This is the 5.4.77 stable release

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl+q9MMACgkQONu9yGCS
 aT6DUxAAkaHLOErOqgTjcShOVAgrf6E+PXo68tE8ikiHoN+jWASX1edlX1SmCzal
 x9QQzD79nSqAPGal0IO3KktvaeGEPWgH/ygsLCOihrLqU8/QXqzWdaL/XGryca9W
 n5ReZqGInsLvZ06/XC8PeliQMVZqNrtAusiE5zqT4Saie4s0Yy4VJZ4qFL4vCOSI
 YDFi5U2W/ugT0YPyCvrjRFGoLH/WuNiysyGda6TQwi7Wqj2cHylhY2fi1rOoIYBa
 /LHRpGnUEPxVZi7AttuQyJnKslXvFJk0c2uiI0VYCYZUcxO244aU7HniwTxOxjU5
 XJgDyouZRbKhqkOfJqjosaUdNSquEZA7QnR4UMB/3wFWW38fJgWVDkvYm58wBktI
 87OsMn/WdGzCsO7v2LVrHhijwMO94d/RW8wUlkpLrBD1IYTkSka0Wly7HV5+jyBf
 b0B6ZncDUV2E0hNoJKOmziojm1YN2NrAMlqowxjrZCVouNeNGeBvFzxp1qkSm1YN
 X40gL6wi6kv8WKl89QR+Wx+CwaH0ip6/Jko9umjBGBt5UDjFiXqmeq71XGzehjEj
 ztUSwE37QfDZjuZNQaTMwCuBRRmkXRQFJjAEFp2AsT5qB35S64+Khq1t1FZiq1bF
 twrvNmPkcG4tBFBaUEwLRPfxoDyq0MAKMH4PU8KLSH7DwtSO0Jk=
 =NoZn
 -----END PGP SIGNATURE-----

Merge 5.4.77 into android11-5.4-lts

Changes in 5.4.77
	powercap: restrict energy meter to root access
	Linux 5.4.77

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4076b4f375f8227386f0a61117f5a5ed81ea23e1
This commit is contained in:
Greg Kroah-Hartman 2020-11-11 11:17:39 +01:00
commit b115ea8632
2 changed files with 3 additions and 3 deletions

View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 4
SUBLEVEL = 76
SUBLEVEL = 77
EXTRAVERSION =
NAME = Kleptomaniac Octopus

View file

@ -367,9 +367,9 @@ static void create_power_zone_common_attributes(
&dev_attr_max_energy_range_uj.attr;
if (power_zone->ops->get_energy_uj) {
if (power_zone->ops->reset_energy_uj)
dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUSR;
else
dev_attr_energy_uj.attr.mode = S_IRUGO;
dev_attr_energy_uj.attr.mode = S_IRUSR;
power_zone->zone_dev_attrs[count++] =
&dev_attr_energy_uj.attr;
}