Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7502b09f authored by Todd Kjos's avatar Todd Kjos
Browse files

Merge branch 'android-4.19' into android-4.19-stable 

Final merge of android-4.19

Change-Id: Ifa789a66260ed6207e829555ad2050d30e3de555
parents 34513175 67ff5a2f

Documentation/ABI/stable/sysfs-bus-nvmem

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ Description: 
		This file allows user to read/write the raw NVMEM contents.

		Permissions for write to this file depends on the nvmem

		provider configuration.

		Note: This file is only present if CONFIG_NVMEM_SYSFS

		is enabled



		ex:

		hexdump /sys/bus/nvmem/devices/qfprom0/nvmem

Documentation/ABI/testing/sysfs-class-power

+2 −1
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ Description: 
		Access: Read

		Valid values: "Unknown", "Good", "Overheat", "Dead",

			      "Over voltage", "Unspecified failure", "Cold",

			      "Watchdog timer expire", "Safety timer expire"

			      "Watchdog timer expire", "Safety timer expire",

			      "Over current", "Warm", "Cool", "Hot"



What:		/sys/class/power_supply/<supply_name>/precharge_current

Date:		June 2017

Documentation/ABI/testing/sysfs-fs-f2fs

+15 −0
Original line number Diff line number Diff line
@@ -323,3 +323,18 @@ What: /sys/fs/f2fs/<disk>/mounted_time_sec 
Date:		February 2020

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:	Show the mounted time in secs of this partition.



What:		/sys/fs/f2fs/<disk>/data_io_flag

Date:		April 2020

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:	Give a way to attach REQ_META|FUA to data writes

		given temperature-based bits. Now the bits indicate:

		*      REQ_META     |      REQ_FUA      |

		*    5 |    4 |   3 |    2 |    1 |   0 |

		* Cold | Warm | Hot | Cold | Warm | Hot |



What:		/sys/fs/f2fs/<disk>/iostat_period_ms

Date:		April 2020

Contact:	"Daeho Jeong" <daehojeong@google.com>

Description:	Give a way to change iostat_period time. 3secs by default.

		The new iostat trace gives stats gap given the period.

Documentation/admin-guide/kernel-parameters.txt

+3 −1
Original line number Diff line number Diff line
@@ -4032,7 +4032,9 @@ 
				[[,]s[mp]#### \

				[[,]b[ios] | a[cpi] | k[bd] | t[riple] | e[fi] | p[ci]] \

				[[,]f[orce]

			Where reboot_mode is one of warm (soft) or cold (hard) or gpio,

			Where reboot_mode is one of warm (soft) or cold (hard) or gpio

					(prefix with 'panic_' to set mode for panic

					reboot only),

			      reboot_type is one of bios, acpi, kbd, triple, efi, or pci,

			      reboot_force is either force or not specified,

			      reboot_cpu is s[mp]#### with #### being the processor

Documentation/arm64/index.rst

0 → 100644
+27 −0
Original line number Diff line number Diff line 
==================

ARM64 Architecture

==================



.. toctree::

    :maxdepth: 1



    acpi_object_usage

    arm-acpi

    booting

    cpu-feature-registers

    elf_hwcaps

    hugetlbpage

    legacy_instructions

    memory

    pointer-authentication

    silicon-errata

    sve

    tagged-address-abi

    tagged-pointers



.. only::  subproject and html



   Indices

   =======



   * :ref:`genindex`