diff options
author | Praneeth Bajjuri | 2020-12-28 21:36:46 -0600 |
---|---|---|
committer | Praneeth Bajjuri | 2020-12-28 21:36:46 -0600 |
commit | 18bc4c83e6c35d10cd0c6d97777a11bcf2a10820 (patch) | |
tree | 65da8f6eaa9ca8acd355b8ac3eea165b05d13524 | |
parent | c7b1c81e58cf3c86ea177a0e0925cee38c384044 (diff) | |
parent | d7a3e709e6c8cf90b1856754ab956c764d8c1862 (diff) | |
download | kernel-android-feature-ti-linux-4.19.y.tar.gz kernel-android-feature-ti-linux-4.19.y.tar.xz kernel-android-feature-ti-linux-4.19.y.zip |
Merge branch 'android-4.19-stable' of https://android.googlesource.com/kernel/common into android-feature-ti-linux-4.19.yandroid-feature-ti-linux-4.19.y
* 'android-4.19-stable' of https://android.googlesource.com/kernel/common: (2862 commits)
ANDROID: GKI: Update the ABI xml representation
ANDROID: Incremental fs: Set credentials before reading/writing
ANDROID: Incremental fs: Fix incfs_test use of atol, open
ANDROID: Incremental fs: Change per UID timeouts to microseconds
ANDROID: Incremental fs: Add v2 feature flag
ANDROID: Incremental fs: Add zstd feature flag
Linux 4.19.163
Revert "geneve: pull IP header before ECN decapsulation"
x86/insn-eval: Use new for_each_insn_prefix() macro to loop over prefixes bytes
netfilter: nf_tables: avoid false-postive lockdep splat
Input: i8042 - fix error return code in i8042_setup_aux()
dm writecache: remove BUG() and fail gracefully instead
i2c: qup: Fix error return code in qup_i2c_bam_schedule_desc()
gfs2: check for empty rgrp tree in gfs2_ri_update
tracing: Fix userstacktrace option for instances
spi: bcm2835: Release the DMA channel if probe fails after dma_init
spi: bcm2835: Fix use-after-free on unbind
spi: bcm-qspi: Fix use-after-free on unbind
spi: Introduce device-managed SPI controller allocation
iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs
...
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2398 files changed, 132175 insertions, 74122 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio index 8127a08e366d..d10bcca6c3fb 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio +++ b/Documentation/ABI/testing/sysfs-bus-iio | |||
@@ -1559,7 +1559,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw | |||
1559 | KernelVersion: 4.3 | 1559 | KernelVersion: 4.3 |
1560 | Contact: linux-iio@vger.kernel.org | 1560 | Contact: linux-iio@vger.kernel.org |
1561 | Description: | 1561 | Description: |
1562 | Raw (unscaled no offset etc.) percentage reading of a substance. | 1562 | Raw (unscaled no offset etc.) reading of a substance. Units |
1563 | after application of scale and offset are percents. | ||
1563 | 1564 | ||
1564 | What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw | 1565 | What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw |
1565 | What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw | 1566 | What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw |
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index b2678cf459e4..8a9236c653dd 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt | |||
@@ -490,10 +490,14 @@ | |||
490 | cut the overhead, others just disable the usage. So | 490 | cut the overhead, others just disable the usage. So |
491 | only cgroup_disable=memory is actually worthy} | 491 | only cgroup_disable=memory is actually worthy} |
492 | 492 | ||
493 | cgroup_no_v1= [KNL] Disable one, multiple, all cgroup controllers in v1 | 493 | cgroup_no_v1= [KNL] Disable cgroup controllers and named hierarchies in v1 |
494 | Format: { controller[,controller...] | "all" } | 494 | Format: { { controller | "all" | "named" } |
495 | [,{ controller | "all" | "named" }...] } | ||
495 | Like cgroup_disable, but only applies to cgroup v1; | 496 | Like cgroup_disable, but only applies to cgroup v1; |
496 | the blacklisted controllers remain available in cgroup2. | 497 | the blacklisted controllers remain available in cgroup2. |
498 | "all" blacklists all controllers and "named" disables | ||
499 | named mounts. Specifying both "all" and "named" disables | ||
500 | all v1 hierarchies. | ||
497 | 501 | ||
498 | cgroup.memory= [KNL] Pass options to the cgroup memory controller. | 502 | cgroup.memory= [KNL] Pass options to the cgroup memory controller. |
499 | Format: <string> | 503 | Format: <string> |
@@ -558,7 +562,7 @@ | |||
558 | loops can be debugged more effectively on production | 562 | loops can be debugged more effectively on production |
559 | systems. | 563 | systems. |
560 | 564 | ||
561 | clearcpuid=BITNUM [X86] | 565 | clearcpuid=BITNUM[,BITNUM...] [X86] |
562 | Disable CPUID feature X for the kernel. See | 566 | Disable CPUID feature X for the kernel. See |
563 | arch/x86/include/asm/cpufeatures.h for the valid bit | 567 | arch/x86/include/asm/cpufeatures.h for the valid bit |
564 | numbers. Note the Linux specific bits are not necessarily | 568 | numbers. Note the Linux specific bits are not necessarily |
@@ -2569,6 +2573,8 @@ | |||
2569 | mds=off [X86] | 2573 | mds=off [X86] |
2570 | tsx_async_abort=off [X86] | 2574 | tsx_async_abort=off [X86] |
2571 | kvm.nx_huge_pages=off [X86] | 2575 | kvm.nx_huge_pages=off [X86] |
2576 | no_entry_flush [PPC] | ||
2577 | no_uaccess_flush [PPC] | ||
2572 | 2578 | ||
2573 | Exceptions: | 2579 | Exceptions: |
2574 | This does not have any effect on | 2580 | This does not have any effect on |
@@ -2879,6 +2885,8 @@ | |||
2879 | 2885 | ||
2880 | noefi Disable EFI runtime services support. | 2886 | noefi Disable EFI runtime services support. |
2881 | 2887 | ||
2888 | no_entry_flush [PPC] Don't flush the L1-D cache when entering the kernel. | ||
2889 | |||
2882 | noexec [IA-64] | 2890 | noexec [IA-64] |
2883 | 2891 | ||
2884 | noexec [X86] | 2892 | noexec [X86] |
@@ -2928,6 +2936,9 @@ | |||
2928 | nospec_store_bypass_disable | 2936 | nospec_store_bypass_disable |
2929 | [HW] Disable all mitigations for the Speculative Store Bypass vulnerability | 2937 | [HW] Disable all mitigations for the Speculative Store Bypass vulnerability |
2930 | 2938 | ||
2939 | no_uaccess_flush | ||
2940 | [PPC] Don't flush the L1-D cache after accessing user data. | ||
2941 | |||
2931 | noxsave [BUGS=X86] Disables x86 extended register state save | 2942 | noxsave [BUGS=X86] Disables x86 extended register state save |
2932 | and restore using xsave. The kernel will fallback to | 2943 | and restore using xsave. The kernel will fallback to |
2933 | enabling legacy floating-point and sse state. | 2944 | enabling legacy floating-point and sse state. |
@@ -5291,6 +5302,14 @@ | |||
5291 | with /sys/devices/system/xen_memory/xen_memory0/scrub_pages. | 5302 | with /sys/devices/system/xen_memory/xen_memory0/scrub_pages. |
5292 | Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT. | 5303 | Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT. |
5293 | 5304 | ||