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

Commit 16b8d19f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-5.4.30 (5cfdde5e) into msm-5.4"

parents a6ae9f82 8ec8dcf3
Loading
Loading
Loading
Loading
+0 −16
Original line number Diff line number Diff line
What:		/proc/uid_concurrent_active_time
Date:		December 2018
Contact:	Connor O'Brien <connoro@google.com>
Description:
	The /proc/uid_concurrent_active_time file displays aggregated cputime
	numbers for each uid, broken down by the total number of cores that were
	active while the uid's task was running.

What:		/proc/uid_concurrent_policy_time
Date:		December 2018
Contact:	Connor O'Brien <connoro@google.com>
Description:
	The /proc/uid_concurrent_policy_time file displays aggregated cputime
	numbers for each uid, broken down based on the cpufreq policy
	of the core used by the uid's task and the number of cores associated
	with that policy that were active while the uid's task was running.
+4 −0
Original line number Diff line number Diff line
@@ -136,6 +136,10 @@
			dynamic table installation which will install SSDT
			tables to /sys/firmware/acpi/tables/dynamic.

	acpi_no_watchdog	[HW,ACPI,WDT]
			Ignore the ACPI-based watchdog interface (WDAT) and let
			a native driver control the watchdog device instead.

	acpi_rsdp=	[ACPI,EFI,KEXEC]
			Pass the RSDP address to the kernel, mostly used
			on machines running EFI runtime service to boot the
+11 −0
Original line number Diff line number Diff line
@@ -633,6 +633,17 @@ from a passphrase or other low-entropy user credential.
FS_IOC_GET_ENCRYPTION_PWSALT is deprecated.  Instead, prefer to
generate and manage any needed salt(s) in userspace.

Getting a file's encryption nonce
---------------------------------

Since Linux v5.7, the ioctl FS_IOC_GET_ENCRYPTION_NONCE is supported.
On encrypted files and directories it gets the inode's 16-byte nonce.
On unencrypted files and directories, it fails with ENODATA.

This ioctl can be useful for automated tests which verify that the
encryption is being done correctly.  It is not needed for normal use
of fscrypt.

Adding keys
-----------

+8 −0
Original line number Diff line number Diff line
@@ -850,3 +850,11 @@ business doing so.
d_alloc_pseudo() is internal-only; uses outside of alloc_file_pseudo() are
very suspect (and won't work in modules).  Such uses are very likely to
be misspelled d_alloc_anon().

---

**mandatory**

[should've been added in 2016] stale comment in finish_open() nonwithstanding,
failure exits in ->atomic_open() instances should *NOT* fput() the file,
no matter what.  Everything is handled by the caller.
+2 −2
Original line number Diff line number Diff line
@@ -470,9 +470,9 @@ build.

	The syntax of the Module.symvers file is::

	<CRC>       <Symbol>          <Namespace>  <Module>                         <Export Type>
	<CRC>       <Symbol>         <Module>                         <Export Type>     <Namespace>

	0xe1cc2a05  usb_stor_suspend  USB_STORAGE  drivers/usb/storage/usb-storage  EXPORT_SYMBOL_GPL
	0xe1cc2a05  usb_stor_suspend drivers/usb/storage/usb-storage  EXPORT_SYMBOL_GPL USB_STORAGE

	The fields are separated by tabs and values may be empty (e.g.
	if no namespace is defined for an exported symbol).
Loading