Skip to content

Commit 53f071e

Browse files
jnikulajnikula
committed
Merge drm/drm-next into drm-intel-next-queued
Need d224985 ("sched/wait, drivers/drm: Convert wait_on_atomic_t() usage to the new wait_var_event() API") in dinq to be able to fix https://bugs.freedesktop.org/show_bug.cgi?id=106085. Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2 parents 043477b + 0ab3902 commit 53f071e

File tree

13,112 files changed

+527082
-811620
lines changed

Some content is hidden

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

13,112 files changed

+527082
-811620
lines changed

‎.clang-format

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

‎.gitignore

Lines changed: 5 additions & 4 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
@@ -81,12 +84,14 @@ modules.builtin
8184
!.gitignore
8285
!.mailmap
8386
!.cocciconfig
87+
!.clang-format
8488

8589
#
8690
# Generated include files
8791
#
8892
include/config
8993
include/generated
94+
include/ksym
9095
arch/*/include/generated
9196

9297
# stgit generated dirs
@@ -127,7 +132,3 @@ all.config
127132

128133
# Kdevelop4
129134
*.kdev4
130-
131-
#Automatically generated by ASN.1 compiler
132-
net/ipv4/netfilter/nf_nat_snmp_basic-asn1.c
133-
net/ipv4/netfilter/nf_nat_snmp_basic-asn1.h

‎.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 & 10 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
@@ -276,8 +270,6 @@ memory-hotplug.txt
276270
- Hotpluggable memory support, how to use and current status.
277271
men-chameleon-bus.txt
278272
- info on MEN chameleon bus.
279-
metag/
280-
- directory with info about Linux on Meta architecture.
281273
mic/
282274
- Intel Many Integrated Core (MIC) architecture device driver.
283275
mips/
@@ -286,8 +278,6 @@ misc-devices/
286278
- directory with info about devices using the misc dev subsystem
287279
mmc/
288280
- directory with info about the MMC subsystem
289-
mn10300/
290-
- directory with info about the mn10300 architecture port
291281
mtd/
292282
- directory with info about memory technology devices (flash)
293283
namespaces/

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,10 @@ KernelVersion: 4.16
132132
Contact: Stephen Hemminger <sthemmin@microsoft.com>
133133
Description: Monitor bit associated with channel
134134
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)