Skip to content

Commit 552c69b

Browse files
jrjohansenjrjohansen
committed
Merge tag 'v4.17-rc3' into apparmor-next
Linux v4.17-rc3 Merge in v4.17 for LSM updates Signed-off-by: John Johansen <john.johansen@canonical.com>
2 parents 588558e + 6da6c0d commit 552c69b

File tree

21,256 files changed

+1154504
-1148255
lines changed

Some content is hidden

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

21,256 files changed

+1154504
-1148255
lines changed

‎.clang-format

Lines changed: 428 additions & 0 deletions
Large diffs are not rendered by default.

‎.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#
1212
.*
1313
*.a
14+
*.asn1.[ch]
1415
*.bin
1516
*.bz2
1617
*.c.[012]*.*
@@ -22,6 +23,7 @@
2223
*.gz
2324
*.i
2425
*.ko
26+
*.lex.c
2527
*.ll
2628
*.lst
2729
*.lz4
@@ -37,6 +39,7 @@
3739
*.so.dbg
3840
*.su
3941
*.symtypes
42+
*.tab.[ch]
4043
*.tar
4144
*.xz
4245
Module.symvers
@@ -65,6 +68,11 @@ modules.builtin
6568
#
6669
/debian/
6770

71+
#
72+
# Snap directory (make snap-pkg)
73+
#
74+
/snap/
75+
6876
#
6977
# tar directory (make tar*-pkg)
7078
#
@@ -76,12 +84,14 @@ modules.builtin
7684
!.gitignore
7785
!.mailmap
7886
!.cocciconfig
87+
!.clang-format
7988

8089
#
8190
# Generated include files
8291
#
8392
include/config
8493
include/generated
94+
include/ksym
8595
arch/*/include/generated
8696

8797
# stgit generated dirs

‎.mailmap

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com>
1818
Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
1919
Al Viro <viro@ftp.linux.org.uk>
2020
Al Viro <viro@zenIV.linux.org.uk>
21+
Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
2122
Andreas Herrmann <aherrman@de.ibm.com>
2223
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
2324
Andrew Morton <akpm@linux-foundation.org>
@@ -33,9 +34,9 @@ Axel Lin <axel.lin@gmail.com>
3334
Ben Gardner <bgardner@wabtec.com>
3435
Ben M Cahill <ben.m.cahill@intel.com>
3536
Björn Steinbrink <B.Steinbrink@gmx.de>
36-
Boris Brezillon <boris.brezillon@free-electrons.com>
37-
Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>
38-
Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>
37+
Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@free-electrons.com>
38+
Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon.dev@gmail.com>
39+
Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon@overkiz.com>
3940
Brian Avery <b.avery@hp.com>
4041
Brian King <brking@us.ibm.com>
4142
Christoph Hellwig <hch@lst.de>
@@ -62,6 +63,7 @@ Frank Zago <fzago@systemfabricworks.com>
6263
Greg Kroah-Hartman <greg@echidna.(none)>
6364
Greg Kroah-Hartman <gregkh@suse.de>
6465
Greg Kroah-Hartman <greg@kroah.com>
66+
Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
6567
Henk Vergonet <Henk.Vergonet@gmail.com>
6668
Henrik Kretzschmar <henne@nachtwindheim.de>
6769
Henrik Rydberg <rydberg@bitmath.org>
@@ -100,6 +102,8 @@ Koushik <raghavendra.koushik@neterion.com>
100102
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
101103
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
102104
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
105+
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
106+
Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
103107
Leonid I Ananiev <leonid.i.ananiev@intel.com>
104108
Linas Vepstas <linas@austin.ibm.com>
105109
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
@@ -126,6 +130,7 @@ Mayuresh Janorkar <mayur@ti.com>
126130
Michael Buesch <m@bues.ch>
127131
Michel Dänzer <michel@tungstengraphics.com>
128132
Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
133+
Miquel Raynal <miquel.raynal@bootlin.com> <miquel.raynal@free-electrons.com>
129134
Mitesh shah <mshah@teja.com>
130135
Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
131136
Morten Welinder <terra@gnome.org>

‎COPYING

Lines changed: 10 additions & 348 deletions
Large diffs are not rendered by default.

‎CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,6 +1564,11 @@ W: http://www.carumba.com/
15641564
D: bug toaster (A1 sauce makes all the difference)
15651565
D: Random linux hacker
15661566

1567+
N: James Hogan
1568+
E: jhogan@kernel.org
1569+
D: Metag architecture maintainer
1570+
D: TZ1090 SoC maintainer
1571+
15671572
N: Tim Hockin
15681573
E: thockin@hockin.org
15691574
W: http://www.hockin.org/~thockin

‎Documentation/00-INDEX

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ backlight/
6666
- directory with info on controlling backlights in flat panel displays
6767
bcache.txt
6868
- Block-layer cache on fast SSDs to improve slow (raid) I/O performance.
69-
blackfin/
70-
- directory with documentation for the Blackfin arch.
7169
block/
7270
- info on the Block I/O (BIO) layer.
7371
blockdev/
@@ -114,8 +112,6 @@ cputopology.txt
114112
- documentation on how CPU topology info is exported via sysfs.
115113
crc32.txt
116114
- brief tutorial on CRC computation
117-
cris/
118-
- directory with info about Linux on CRIS architecture.
119115
crypto/
120116
- directory with info on the Crypto API.
121117
dcdbas.txt
@@ -172,8 +168,6 @@ fmc/
172168
- information about the FMC bus abstraction
173169
fpga/
174170
- FPGA Manager Core.
175-
frv/
176-
- Fujitsu FR-V Linux documentation.
177171
futex-requeue-pi.txt
178172
- info on requeueing of tasks from a non-PI futex to a PI futex
179173
gcc-plugins.txt
@@ -228,8 +222,6 @@ isdn/
228222
- directory with info on the Linux ISDN support, and supported cards.
229223
kbuild/
230224
- directory with info about the kernel build process.
231-
kernel-doc-nano-HOWTO.txt
232-
- outdated info about kernel-doc documentation.
233225
kdump/
234226
- directory with mini HowTo on getting the crash dump code to work.
235227
doc-guide/
@@ -278,8 +270,6 @@ memory-hotplug.txt
278270
- Hotpluggable memory support, how to use and current status.
279271
men-chameleon-bus.txt
280272
- info on MEN chameleon bus.
281-
metag/
282-
- directory with info about Linux on Meta architecture.
283273
mic/
284274
- Intel Many Integrated Core (MIC) architecture device driver.
285275
mips/
@@ -288,8 +278,6 @@ misc-devices/
288278
- directory with info about devices using the misc dev subsystem
289279
mmc/
290280
- directory with info about the MMC subsystem
291-
mn10300/
292-
- directory with info about the mn10300 architecture port
293281
mtd/
294282
- directory with info about memory technology devices (flash)
295283
namespaces/
@@ -346,8 +334,6 @@ prctl/
346334
- directory with info on the priveledge control subsystem
347335
preempt-locking.txt
348336
- info on locking under a preemptive kernel.
349-
printk-formats.txt
350-
- how to get printk format specifiers right
351337
process/
352338
- how to work with the mainline kernel development process.
353339
pps/

‎Documentation/ABI/stable/sysfs-bus-vmbus

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,72 +42,100 @@ Contact: K. Y. Srinivasan <kys@microsoft.com>
4242
Description: The 16 bit vendor ID of the device
4343
Users: tools/hv/lsvmbus and user level RDMA libraries
4444

45-
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/cpu
45+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN
46+
Date: September. 2017
47+
KernelVersion: 4.14
48+
Contact: Stephen Hemminger <sthemmin@microsoft.com>
49+
Description: Directory for per-channel information
50+
NN is the VMBUS relid associtated with the channel.
51+
52+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/cpu
4653
Date: September. 2017
4754
KernelVersion: 4.14
4855
Contact: Stephen Hemminger <sthemmin@microsoft.com>
4956
Description: VCPU (sub)channel is affinitized to
50-
Users: tools/hv/lsvmbus and other debuggig tools
57+
Users: tools/hv/lsvmbus and other debugging tools
5158

52-
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/cpu
59+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/cpu
5360
Date: September. 2017
5461
KernelVersion: 4.14
5562
Contact: Stephen Hemminger <sthemmin@microsoft.com>
5663
Description: VCPU (sub)channel is affinitized to
57-
Users: tools/hv/lsvmbus and other debuggig tools
64+
Users: tools/hv/lsvmbus and other debugging tools
5865

59-
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/in_mask
66+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/in_mask
6067
Date: September. 2017
6168
KernelVersion: 4.14
6269
Contact: Stephen Hemminger <sthemmin@microsoft.com>
63-
Description: Inbound channel signaling state
70+
Description: Host to guest channel interrupt mask
6471
Users: Debugging tools
6572

66-
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/latency
73+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/latency
6774
Date: September. 2017
6875
KernelVersion: 4.14
6976
Contact: Stephen Hemminger <sthemmin@microsoft.com>
7077
Description: Channel signaling latency
7178
Users: Debugging tools
7279

73-
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/out_mask
80+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/out_mask
7481
Date: September. 2017
7582
KernelVersion: 4.14
7683
Contact: Stephen Hemminger <sthemmin@microsoft.com>
77-
Description: Outbound channel signaling state
84+
Description: Guest to host channel interrupt mask
7885
Users: Debugging tools
7986

80-
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/pending
87+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/pending
8188
Date: September. 2017
8289
KernelVersion: 4.14
8390
Contact: Stephen Hemminger <sthemmin@microsoft.com>
8491
Description: Channel interrupt pending state
8592
Users: Debugging tools
8693

87-
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/read_avail
94+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/read_avail
8895
Date: September. 2017
8996
KernelVersion: 4.14
9097
Contact: Stephen Hemminger <sthemmin@microsoft.com>
91-
Description: Bytes availabble to read
98+
Description: Bytes available to read
9299
Users: Debugging tools
93100

94-
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/write_avail
101+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/write_avail
95102
Date: September. 2017
96103
KernelVersion: 4.14
97104
Contact: Stephen Hemminger <sthemmin@microsoft.com>
98-
Description: Bytes availabble to write
105+
Description: Bytes available to write
99106
Users: Debugging tools
100107

101-
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/events
108+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/events
102109
Date: September. 2017
103110
KernelVersion: 4.14
104111
Contact: Stephen Hemminger <sthemmin@microsoft.com>
105112
Description: Number of times we have signaled the host
106113
Users: Debugging tools
107114

108-
What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/interrupts
115+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/interrupts
109116
Date: September. 2017
110117
KernelVersion: 4.14
111118
Contact: Stephen Hemminger <sthemmin@microsoft.com>
112119
Description: Number of times we have taken an interrupt (incoming)
113120
Users: Debugging tools
121+
122+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/subchannel_id
123+
Date: January. 2018
124+
KernelVersion: 4.16
125+
Contact: Stephen Hemminger <sthemmin@microsoft.com>
126+
Description: Subchannel ID associated with VMBUS channel
127+
Users: Debugging tools and userspace drivers
128+
129+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/monitor_id
130+
Date: January. 2018
131+
KernelVersion: 4.16
132+
Contact: Stephen Hemminger <sthemmin@microsoft.com>
133+
Description: Monitor bit associated with channel
134+
Users: Debugging tools and userspace drivers
135+
136+
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/ring
137+
Date: January. 2018
138+
KernelVersion: 4.16
139+
Contact: Stephen Hemminger <sthemmin@microsoft.com>
140+
Description: Binary file created by uio_hv_generic for ring buffer
141+
Users: Userspace drivers

0 commit comments

Comments
 (0)