Skip to content

Commit 500050f

Browse files
committed
Merge branch 'fixes-omap3' into fixes
2 parents c0bc969 + 6efac01 commit 500050f

2,506 files changed

Lines changed: 31044 additions & 43571 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.

.mailmap

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
8282
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
8383
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
8484
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
85-
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
85+
Dmitry Baryshkov <dbaryshkov@gmail.com>
86+
Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
87+
Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
88+
Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_eremin@mentor.com>
8689
Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
8790
Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
8891
Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
@@ -287,6 +290,7 @@ Santosh Shilimkar <ssantosh@kernel.org>
287290
Sarangdhar Joshi <spjoshi@codeaurora.org>
288291
Sascha Hauer <s.hauer@pengutronix.de>
289292
S.Çağlar Onur <caglar@pardus.org.tr>
293+
Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>
290294
Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
291295
Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
292296
Sebastian Reichel <sre@kernel.org> <sre@debian.org>
@@ -318,6 +322,8 @@ TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
318322
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
319323
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
320324
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
325+
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
326+
Uwe Kleine-König <ukleinek@strlen.de>
321327
Uwe Kleine-König <ukl@pengutronix.de>
322328
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
323329
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

CREDITS

Lines changed: 50 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ N: Erik Andersen
9898
E: andersen@codepoet.org
9999
W: https://www.codepoet.org/
100100
P: 1024D/30D39057 1BC4 2742 E885 E4DE 9301 0C82 5F9B 643E 30D3 9057
101-
D: Maintainer of ide-cd and Uniform CD-ROM driver,
101+
D: Maintainer of ide-cd and Uniform CD-ROM driver,
102102
D: ATAPI CD-Changer support, Major 2.1.x CD-ROM update.
103103
S: 352 North 525 East
104104
S: Springville, Utah 84663
@@ -263,7 +263,7 @@ N: Paul Barton-Davis
263263
E: pbd@op.net
264264
D: Driver for WaveFront soundcards (Turtle Beach Maui, Tropez, Tropez+)
265265
D: Various bugfixes and changes to sound drivers
266-
S: USA
266+
S: USA
267267

268268
N: Carlos Henrique Bauer
269269
E: chbauer@acm.org
@@ -740,6 +740,11 @@ S: (ask for current address)
740740
S: Portland, Oregon
741741
S: USA
742742

743+
N: Jason Cooper
744+
D: ARM/Marvell SOC co-maintainer
745+
D: irqchip co-maintainer
746+
D: MVEBU PCI DRIVER co-maintainer
747+
743748
N: Robin Cornelius
744749
E: robincornelius@users.sourceforge.net
745750
D: Ralink rt2x00 WLAN driver
@@ -849,6 +854,12 @@ D: trivial hack to add variable address length routing to Rose.
849854
D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO
850855
D: ax25-utils maintainer.
851856

857+
N: Kamil Debski
858+
E: kamil@wypas.org
859+
D: Samsung S5P 2D graphics acceleration and Multi Format Codec drivers
860+
D: Samsung USB2 phy drivers
861+
D: PWM fan driver
862+
852863
N: Helge Deller
853864
E: deller@gmx.de
854865
W: http://www.parisc-linux.org/
@@ -1199,7 +1210,7 @@ N: Daniel J. Frasnelli
11991210
E: dfrasnel@alphalinux.org
12001211
W: http://www.alphalinux.org/
12011212
P: 1024/3EF87611 B9 F1 44 50 D3 E8 C2 80 DA E5 55 AA 56 7C 42 DA
1202-
D: DEC Alpha hacker
1213+
D: DEC Alpha hacker
12031214
D: Miscellaneous bug squisher
12041215

12051216
N: Jim Freeman
@@ -1299,7 +1310,7 @@ S: P.O. Box 76, Epping
12991310
S: New South Wales, 2121
13001311
S: Australia
13011312

1302-
N: Carlos E. Gorges
1313+
N: Carlos E. Gorges
13031314
E: carlos@techlinux.com.br
13041315
D: fix smp support on cmpci driver
13051316
P: 2048G/EA3C4B19 FF31 33A6 0362 4915 B7EB E541 17D0 0379 EA3C 4B19
@@ -1340,7 +1351,7 @@ E: wgreathouse@smva.com
13401351
E: wgreathouse@myfavoritei.com
13411352
D: Current Belkin USB Serial Adapter F5U103 hacker
13421353
D: Kernel hacker, embedded systems
1343-
S: 7802 Fitzwater Road
1354+
S: 7802 Fitzwater Road
13441355
S: Brecksville, OH 44141-1334
13451356
S: USA
13461357

@@ -1381,7 +1392,7 @@ N: Grant Guenther
13811392
E: grant@torque.net
13821393
W: http://www.torque.net/linux-pp.html
13831394
D: original author of ppa driver for parallel port ZIP drive
1384-
D: original architect of the parallel-port sharing scheme
1395+
D: original architect of the parallel-port sharing scheme
13851396
D: PARIDE subsystem: drivers for parallel port IDE & ATAPI devices
13861397
S: 44 St. Joseph Street, Suite 506
13871398
S: Toronto, Ontario, M4Y 2W4
@@ -1523,7 +1534,7 @@ N: Benjamin Herrenschmidt
15231534
E: benh@kernel.crashing.org
15241535
D: Various parts of PPC/PPC64 & PowerMac
15251536
S: 312/107 Canberra Avenue
1526-
S: Griffith, ACT 2603
1537+
S: Griffith, ACT 2603
15271538
S: Australia
15281539

15291540
N: Andreas Herrmann
@@ -1825,7 +1836,7 @@ S: Hungary
18251836
N: Bernhard Kaindl
18261837
E: bkaindl@netway.at
18271838
E: edv@bartelt.via.at
1828-
D: Author of a menu based configuration tool, kmenu, which
1839+
D: Author of a menu based configuration tool, kmenu, which
18291840
D: is the predecessor of 'make menuconfig' and 'make xconfig'.
18301841
D: digiboard driver update(modularisation work and 2.1.x upd)
18311842
S: Tallak 95
@@ -1910,6 +1921,15 @@ S: 660 Harvard Ave. #7
19101921
S: Santa Clara, CA 95051
19111922
S: USA
19121923

1924+
N: Kukjin Kim
1925+
E: kgene@kernel.org
1926+
D: Samsung S3C, S5P and Exynos ARM architectures
1927+
1928+
N: Sangbeom Kim
1929+
E: sbkim73@samsung.com
1930+
D: Samsung SoC Audio (ASoC) drivers
1931+
D: Samsung PMIC (RTC, regulators, MFD) drivers
1932+
19131933
N: Russell King
19141934
E: rmk@arm.linux.org.uk
19151935
D: Linux/arm integrator, maintainer & hacker
@@ -2007,7 +2027,7 @@ W: http://www.xos.nl/
20072027
D: IP transparent proxy support
20082028
S: X/OS Experts in Open Systems BV
20092029
S: Kruislaan 419
2010-
S: 1098 VA Amsterdam
2030+
S: 1098 VA Amsterdam
20112031
S: The Netherlands
20122032

20132033
N: Goran Koruga
@@ -2079,7 +2099,7 @@ S: Germany
20792099

20802100
N: Andrzej M. Krzysztofowicz
20812101
E: ankry@mif.pg.gda.pl
2082-
D: Some 8-bit XT disk driver and devfs hacking
2102+
D: Some 8-bit XT disk driver and devfs hacking
20832103
D: Aladdin 1533/1543(C) chipset IDE
20842104
D: PIIX chipset IDE
20852105
S: ul. Matemblewska 1B/10
@@ -2454,7 +2474,7 @@ E: mge@EZ-Darmstadt.Telekom.de
24542474
D: Logical Volume Manager
24552475
S: Bartningstr. 12
24562476
S: 64289 Darmstadt
2457-
S: Germany
2477+
S: Germany
24582478

24592479
N: Mark W. McClelland
24602480
E: mmcclell@bigfoot.com
@@ -2538,7 +2558,7 @@ E: meskes@debian.org
25382558
P: 1024/04B6E8F5 6C 77 33 CA CC D6 22 03 AB AB 15 A3 AE AD 39 7D
25392559
D: Kernel hacker. PostgreSQL hacker. Software watchdog daemon.
25402560
D: Maintainer of several Debian packages
2541-
S: Th.-Heuss-Str. 61
2561+
S: Th.-Heuss-Str. 61
25422562
S: D-41812 Erkelenz
25432563
S: Germany
25442564

@@ -2776,7 +2796,7 @@ E: neuffer@goofy.zdv.uni-mainz.de
27762796
W: http://www.i-Connect.Net/~mike/
27772797
D: Developer and maintainer of the EATA-DMA SCSI driver
27782798
D: Co-developer EATA-PIO SCSI driver
2779-
D: /proc/scsi and assorted other snippets
2799+
D: /proc/scsi and assorted other snippets
27802800
S: Zum Schiersteiner Grund 2
27812801
S: 55127 Mainz
27822802
S: Germany
@@ -2843,6 +2863,10 @@ D: IPX development and support
28432863
N: Venkatesh Pallipadi (Venki)
28442864
D: x86/HPET
28452865

2866+
N: Kyungmin Park
2867+
E: kyungmin.park@samsung.com
2868+
D: Samsung S5Pv210 and Exynos4210 mobile platforms
2869+
28462870
N: David Parsons
28472871
E: orc@pell.chi.il.us
28482872
D: improved memory detection code.
@@ -3010,7 +3034,7 @@ D: Embedded PowerPC 4xx/6xx/7xx/74xx support
30103034
S: Chandler, Arizona 85249
30113035
S: USA
30123036

3013-
N: Frederic Potter
3037+
N: Frederic Potter
30143038
E: fpotter@cirpack.com
30153039
D: Some PCI kernel support
30163040

@@ -3443,21 +3467,21 @@ S: Klosterweg 28 / i309
34433467
S: 76131 Karlsruhe
34443468
S: Germany
34453469

3446-
N: James Simmons
3470+
N: James Simmons
34473471
E: jsimmons@infradead.org
3448-
E: jsimmons@users.sf.net
3472+
E: jsimmons@users.sf.net
34493473
D: Frame buffer device maintainer
34503474
D: input layer development
34513475
D: tty/console layer
3452-
D: various mipsel devices
3453-
S: 115 Carmel Avenue
3476+
D: various mipsel devices
3477+
S: 115 Carmel Avenue
34543478
S: El Cerrito CA 94530
3455-
S: USA
3479+
S: USA
34563480

34573481
N: Jaspreet Singh
34583482
E: jaspreet@sangoma.com
34593483
W: www.sangoma.com
3460-
D: WANPIPE drivers & API Support for Sangoma S508/FT1 cards
3484+
D: WANPIPE drivers & API Support for Sangoma S508/FT1 cards
34613485
S: Sangoma Technologies Inc.,
34623486
S: 1001 Denison Street
34633487
S: Suite 101
@@ -3481,7 +3505,7 @@ N: Craig Small
34813505
E: csmall@triode.apana.org.au
34823506
E: vk2xlz@gonzo.vk2xlz.ampr.org (packet radio)
34833507
D: Gracilis PackeTwin device driver
3484-
D: RSPF daemon
3508+
D: RSPF daemon
34853509
S: 10 Stockalls Place
34863510
S: Minto, NSW, 2566
34873511
S: Australia
@@ -3691,7 +3715,7 @@ N: Tsu-Sheng Tsao
36913715
E: tsusheng@scf.usc.edu
36923716
D: IGMP(Internet Group Management Protocol) version 2
36933717
S: 2F 14 ALY 31 LN 166 SEC 1 SHIH-PEI RD
3694-
S: Taipei
3718+
S: Taipei
36953719
S: Taiwan 112
36963720
S: Republic of China
36973721
S: 24335 Delta Drive
@@ -3852,15 +3876,15 @@ D: Produced the Slackware distribution, updated the SVGAlib
38523876
D: patches for ghostscript, worked on color 'ls', etc.
38533877
S: 301 15th Street S.
38543878
S: Moorhead, Minnesota 56560
3855-
S: USA
3879+
S: USA
38563880

38573881
N: Jos Vos
38583882
E: jos@xos.nl
38593883
W: http://www.xos.nl/
38603884
D: Various IP firewall updates, ipfwadm
38613885
S: X/OS Experts in Open Systems BV
38623886
S: Kruislaan 419
3863-
S: 1098 VA Amsterdam
3887+
S: 1098 VA Amsterdam
38643888
S: The Netherlands
38653889

38663890
N: Jeroen Vreeken
@@ -4098,7 +4122,7 @@ S: People's Repulic of China
40984122
N: Victor Yodaiken
40994123
E: yodaiken@fsmlabs.com
41004124
D: RTLinux (RealTime Linux)
4101-
S: POB 1822
4125+
S: POB 1822
41024126
S: Socorro NM, 87801
41034127
S: USA
41044128

@@ -4196,7 +4220,7 @@ D: EISA/sysfs subsystem
41964220
S: France
41974221

41984222
# Don't add your name here, unless you really _are_ after Marc
4199-
# alphabetically. Leonard used to be very proud of being the
4223+
# alphabetically. Leonard used to be very proud of being the
42004224
# last entry, and he'll get positively pissed if he can't even
42014225
# be second-to-last. (and this file really _is_ supposed to be
42024226
# in alphabetic order)

Documentation/ABI/README

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The different levels of stability are:
3232
layout of the files below for details on how to do this.)
3333

3434
obsolete/
35-
This directory documents interfaces that are still remaining in
35+
This directory documents interfaces that are still remaining in
3636
the kernel, but are marked to be removed at some later point in
3737
time. The description of the interface will document the reason
3838
why it is obsolete and when it can be expected to be removed.
@@ -58,6 +58,14 @@ Users: All users of this interface who wish to be notified when
5858
be changed further.
5959

6060

61+
Note:
62+
The fields should be use a simple notation, compatible with ReST markup.
63+
Also, the file **should not** have a top-level index, like::
64+
65+
===
66+
foo
67+
===
68+
6169
How things move between levels:
6270

6371
Interfaces in stable may move to obsolete, as long as the proper

Documentation/ABI/obsolete/sysfs-class-dax

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ Description: Device DAX is the device-centric analogue of Filesystem
88
system. Device DAX is strict, precise and predictable.
99
Specifically this interface:
1010

11-
1/ Guarantees fault granularity with respect to a given
12-
page size (pte, pmd, or pud) set at configuration time.
11+
1. Guarantees fault granularity with respect to a given
12+
page size (pte, pmd, or pud) set at configuration time.
1313

14-
2/ Enforces deterministic behavior by being strict about
15-
what fault scenarios are supported.
14+
2. Enforces deterministic behavior by being strict about
15+
what fault scenarios are supported.
1616

1717
The /sys/class/dax/ interface enumerates all the
1818
device-dax instances in the system. The ABI is

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ Description: It is possible to switch the cpi setting of the mouse with the
77
setting reported by the mouse. This number has to be further
88
processed to receive the real dpi value:
99

10+
===== ====
1011
VALUE DPI
12+
===== ====
1113
1 400
1214
2 800
1315
4 1600
16+
===== ====
1417

1518
This file is readonly.
1619
Has never been used. If bookkeeping is done, it's done in userland tools.

Documentation/ABI/obsolete/sysfs-gpio

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Description:
1313
GPIOs are identified as they are inside the kernel, using integers in
1414
the range 0..INT_MAX. See Documentation/admin-guide/gpio for more information.
1515

16+
::
17+
1618
/sys/class/gpio
1719
/export ... asks the kernel to export a GPIO to userspace
1820
/unexport ... to return a GPIO to the kernel

Documentation/ABI/removed/devfs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Description:
55
devfs has been unmaintained for a number of years, has unfixable
66
races, contains a naming policy within the kernel that is
77
against the LSB, and can be replaced by using udev.
8+
89
The files fs/devfs/*, include/linux/devfs_fs*.h were removed,
910
along with the assorted devfs function calls throughout the
1011
kernel tree.

Documentation/ABI/removed/raw1394

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Description:
77
to implement sensible device security policies, and its low level
88
of abstraction that required userspace clients to duplicate much
99
of the kernel's ieee1394 core functionality.
10+
1011
Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
1112
firewire-core.
1213

Documentation/ABI/removed/sysfs-class-rfkill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ Description: This file was deprecated because there no longer was a way to
1010
claim just control over a single rfkill instance.
1111
This file was scheduled to be removed in 2012, and was removed
1212
in 2016.
13-
Values: 0: Kernel handles events
13+
Values: 0: Kernel handles events

Documentation/ABI/removed/video1394

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Description:
88
performance issues in its first generation. Any video1394 user had
99
to use raw1394 + libraw1394 too because video1394 did not provide
1010
asynchronous I/O for device discovery and configuration.
11+
1112
Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
1213
firewire-core.
1314

0 commit comments

Comments
 (0)