Skip to content

Commit ca74123

Browse files
rkhuangtaorkhuangtao
committed
Merge tag 'lsk-v4.4-18.05-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
LSK 18.05 v4.4-android * tag 'lsk-v4.4-18.05-android': (605 commits) ANDROID: sdcardfs: Don't d_drop in d_revalidate goldfish: pipe: ANDROID: mark local functions static UPSTREAM: ANDROID: binder: prevent transactions into own process. goldfish: pipe: ANDROID: Add DMA support UPSTREAM: f2fs: clear PageError on writepage - part 2 UPSTREAM: f2fs: avoid fsync() failure caused by EAGAIN in writepage() ANDROID: x86_64_cuttlefish_defconfig: Disable KPTI UPSTREAM: mac80211: ibss: Fix channel type enum in ieee80211_sta_join_ibss() UPSTREAM: mac80211: Fix clang warning about constant operand in logical operation UPSTREAM: nl80211: Fix enum type of variable in nl80211_put_sta_rate() UPSTREAM: sysfs: remove signedness from sysfs_get_dirent UPSTREAM: tracing: Use cpumask_available() to check if cpumask variable may be used BACKPORT: clocksource: Use GENMASK_ULL in definition of CLOCKSOURCE_MASK UPSTREAM: netpoll: Fix device name check in netpoll_setup() FROMLIST: staging: Fix sparse warnings in vsoc driver. FROMLIST: staging: vsoc: Fix a i386-randconfig warning. FROMLIST: staging: vsoc: Create wc kernel mapping for region shm. goldfish: pipe: ANDROID: Replace writel with gf_write_ptr goldfish: pipe: ANDROID: Use dev_ logging instead of pr_ goldfish: pipe: ANDROID: fix checkpatch warnings ... Conflicts: fs/f2fs/node.c scripts/Makefile.lib Change-Id: Ib92d11938a383464249fe6f2dad3ab2a05bc4770
2 parents 90d074f + 1aab1c3 commit ca74123

581 files changed

Lines changed: 11356 additions & 3717 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/ABI/testing/sysfs-fs-f2fs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,14 @@ Date: November 2017
192192
Contact: "Sheng Yong" <shengyong1@huawei.com>
193193
Description:
194194
Controls readahead inode block in readdir.
195+
196+
What: /sys/fs/f2fs/<disk>/extension_list
197+
Date: Feburary 2018
198+
Contact: "Chao Yu" <yuchao0@huawei.com>
199+
Description:
200+
Used to control configure extension list:
201+
- Query: cat /sys/fs/f2fs/<disk>/extension_list
202+
- Add: echo '[h/c]extension' > /sys/fs/f2fs/<disk>/extension_list
203+
- Del: echo '[h/c]!extension' > /sys/fs/f2fs/<disk>/extension_list
204+
- [h] means add/del hot file extension
205+
- [c] means add/del cold file extension

‎Documentation/device-mapper/verity.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,17 @@ fec_start <offset>
109109
This is the offset, in <data_block_size> blocks, from the start of the
110110
FEC device to the beginning of the encoding data.
111111

112+
check_at_most_once
113+
Verify data blocks only the first time they are read from the data device,
114+
rather than every time. This reduces the overhead of dm-verity so that it
115+
can be used on systems that are memory and/or CPU constrained. However, it
116+
provides a reduced level of security because only offline tampering of the
117+
data device's content will be detected, not online tampering.
118+
119+
Hash blocks are still verified each time they are read from the hash device,
120+
since verification of hash blocks is less performance critical than data
121+
blocks, and a hash block will not be verified any more after all the data
122+
blocks it covers have been verified anyway.
112123

113124
Theory of operation
114125
===================

‎Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ Optional properties:
3535
- ti,palmas-enable-dvfs2: Enable DVFS2. Configure pins for DVFS2 mode.
3636
Selection primary or secondary function associated to GPADC_START
3737
and SYSEN2 pin/pad for DVFS2 interface
38+
- ti,palmas-override-powerhold: This is applicable for PMICs for which
39+
GPIO7 is configured in POWERHOLD mode which has higher priority
40+
over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON
41+
bit is turned off. This property enables driver to over ride the
42+
POWERHOLD value to GPIO7 so as to turn off the PMIC in power off
43+
scenarios. So for GPIO7 if ti,palmas-override-powerhold is set
44+
then the GPIO_7 field should never be muxed to anything else.
45+
It should be set to POWERHOLD by default and only in case of
46+
power off scenarios the driver will over ride the mux value.
3847

3948
This binding uses the following generic properties as defined in
4049
pinctrl-bindings.txt:

‎Documentation/filesystems/f2fs.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,23 @@ offgrpjquota Turn off group journelled quota.
172172
offprjjquota Turn off project journelled quota.
173173
quota Enable plain user disk quota accounting.
174174
noquota Disable all plain disk quota option.
175+
whint_mode=%s Control which write hints are passed down to block
176+
layer. This supports "off", "user-based", and
177+
"fs-based". In "off" mode (default), f2fs does not pass
178+
down hints. In "user-based" mode, f2fs tries to pass
179+
down hints given by users. And in "fs-based" mode, f2fs
180+
passes down hints with its policy.
181+
alloc_mode=%s Adjust block allocation policy, which supports "reuse"
182+
and "default".
183+
fsync_mode=%s Control the policy of fsync. Currently supports "posix"
184+
and "strict". In "posix" mode, which is default, fsync
185+
will follow POSIX semantics and does a light operation
186+
to improve the filesystem performance. In "strict" mode,
187+
fsync will be heavy and behaves in line with xfs, ext4
188+
and btrfs, where xfstest generic/342 will pass, but the
189+
performance will regress.
190+
test_dummy_encryption Enable dummy encryption, which provides a fake fscrypt
191+
context. The fake fscrypt context is used by xfstests.
175192

176193
================================================================================
177194
DEBUGFS ENTRIES

‎Documentation/filesystems/proc.txt‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -386,32 +386,6 @@ is not associated with a file:
386386

387387
or if empty, the mapping is anonymous.
388388

389-
The /proc/PID/task/TID/maps is a view of the virtual memory from the viewpoint
390-
of the individual tasks of a process. In this file you will see a mapping marked
391-
as [stack] if that task sees it as a stack. Hence, for the example above, the
392-
task-level map, i.e. /proc/PID/task/TID/maps for thread 1001 will look like this:
393-
394-
08048000-08049000 r-xp 00000000 03:00 8312 /opt/test
395-
08049000-0804a000 rw-p 00001000 03:00 8312 /opt/test
396-
0804a000-0806b000 rw-p 00000000 00:00 0 [heap]
397-
a7cb1000-a7cb2000 ---p 00000000 00:00 0
398-
a7cb2000-a7eb2000 rw-p 00000000 00:00 0
399-
a7eb2000-a7eb3000 ---p 00000000 00:00 0
400-
a7eb3000-a7ed5000 rw-p 00000000 00:00 0 [stack]
401-
a7ed5000-a8008000 r-xp 00000000 03:00 4222 /lib/libc.so.6
402-
a8008000-a800a000 r--p 00133000 03:00 4222 /lib/libc.so.6
403-
a800a000-a800b000 rw-p 00135000 03:00 4222 /lib/libc.so.6
404-
a800b000-a800e000 rw-p 00000000 00:00 0
405-
a800e000-a8022000 r-xp 00000000 03:00 14462 /lib/libpthread.so.0
406-
a8022000-a8023000 r--p 00013000 03:00 14462 /lib/libpthread.so.0
407-
a8023000-a8024000 rw-p 00014000 03:00 14462 /lib/libpthread.so.0
408-
a8024000-a8027000 rw-p 00000000 00:00 0
409-
a8027000-a8043000 r-xp 00000000 03:00 8317 /lib/ld-linux.so.2
410-
a8043000-a8044000 r--p 0001b000 03:00 8317 /lib/ld-linux.so.2
411-
a8044000-a8045000 rw-p 0001c000 03:00 8317 /lib/ld-linux.so.2
412-
aff35000-aff4a000 rw-p 00000000 00:00 0
413-
ffffe000-fffff000 r-xp 00000000 00:00 0 [vdso]
414-
415389
The /proc/PID/smaps is an extension based on maps, showing the memory
416390
consumption for each of the process's mappings. For each of mappings there
417391
is a series of lines such as the following:

‎Documentation/kernel-parameters.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2443,6 +2443,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
24432443

24442444
noalign [KNL,ARM]
24452445

2446+
noaltinstr [S390] Disables alternative instructions patching
2447+
(CPU alternatives feature).
2448+
24462449
noapic [SMP,APIC] Tells the kernel to not make use of any
24472450
IOAPICs that may be present in the system.
24482451

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 4
22
PATCHLEVEL = 4
3-
SUBLEVEL = 126
3+
SUBLEVEL = 132
44
EXTRAVERSION =
55
NAME = Blurry Fish Butt
66

‎arch/arm/boot/dts/am335x-pepper.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
&audio_codec {
140140
status = "okay";
141141

142-
reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
142+
gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>;
143143
AVDD-supply = <&ldo3_reg>;
144144
IOVDD-supply = <&ldo3_reg>;
145145
DRVDD-supply = <&ldo3_reg>;

‎arch/arm/boot/dts/am57xx-beagle-x15.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@
411411
interrupt-controller;
412412

413413
ti,system-power-controller;
414+
ti,palmas-override-powerhold;
414415

415416
tps659038_pmic {
416417
compatible = "ti,tps659038-pmic";

‎arch/arm/boot/dts/at91sam9g25.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
atmel,mux-mask = <
2222
/* A B C */
2323
0xffffffff 0xffe0399f 0xc000001c /* pioA */
24-
0x0007ffff 0x8000fe3f 0x00000000 /* pioB */
24+
0x0007ffff 0x00047e3f 0x00000000 /* pioB */
2525
0x80000000 0x07c0ffff 0xb83fffff /* pioC */
2626
0x003fffff 0x003f8000 0x00000000 /* pioD */
2727
>;

0 commit comments

Comments
 (0)