Skip to content

Commit

Permalink
Merge branch 'i2c/for-current' into i2c/for-5.11
Browse files Browse the repository at this point in the history
  • Loading branch information
wsakernel committed Dec 7, 2020
2 parents 5e9a97b + 0477e92 commit 1e04538
Show file tree
Hide file tree
Showing 1,617 changed files with 21,183 additions and 10,905 deletions.
8 changes: 7 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ Dengcheng Zhu <[email protected]> <[email protected]>
Dengcheng Zhu <[email protected]> <[email protected]>
Dengcheng Zhu <[email protected]> <[email protected]>
<[email protected]> <[email protected]>
Dmitry Eremin-Solenikov <[email protected]>
Dmitry Baryshkov <[email protected]>
Dmitry Baryshkov <[email protected]> <[[email protected]]>
Dmitry Baryshkov <[email protected]> <[email protected]>
Dmitry Baryshkov <[email protected]> <[email protected]>
Dmitry Safonov <[email protected]> <[email protected]>
Dmitry Safonov <[email protected]> <[email protected]>
Dmitry Safonov <[email protected]> <[email protected]>
Expand Down Expand Up @@ -287,6 +290,7 @@ Santosh Shilimkar <[email protected]>
Sarangdhar Joshi <[email protected]>
Sascha Hauer <[email protected]>
S.Çağlar Onur <[email protected]>
Sean Christopherson <[email protected]> <[email protected]>
Sean Nyekjaer <[email protected]> <[email protected]>
Sebastian Reichel <[email protected]> <[email protected]>
Sebastian Reichel <[email protected]> <[email protected]>
Expand Down Expand Up @@ -318,6 +322,8 @@ TripleX Chung <[email protected]> <[email protected]>
Tsuneo Yoshioka <[email protected]>
Tycho Andersen <[email protected]> <[email protected]>
Uwe Kleine-König <[email protected]>
Uwe Kleine-König <[email protected]>
Uwe Kleine-König <[email protected]>
Uwe Kleine-König <[email protected]>
Uwe Kleine-König <[email protected]>
Valdis Kletnieks <[email protected]>
Expand Down
67 changes: 41 additions & 26 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ N: Erik Andersen
E: [email protected]
W: https://www.codepoet.org/
P: 1024D/30D39057 1BC4 2742 E885 E4DE 9301 0C82 5F9B 643E 30D3 9057
D: Maintainer of ide-cd and Uniform CD-ROM driver,
D: Maintainer of ide-cd and Uniform CD-ROM driver,
D: ATAPI CD-Changer support, Major 2.1.x CD-ROM update.
S: 352 North 525 East
S: Springville, Utah 84663
Expand Down Expand Up @@ -263,7 +263,7 @@ N: Paul Barton-Davis
E: [email protected]
D: Driver for WaveFront soundcards (Turtle Beach Maui, Tropez, Tropez+)
D: Various bugfixes and changes to sound drivers
S: USA
S: USA

N: Carlos Henrique Bauer
E: [email protected]
Expand Down Expand Up @@ -740,6 +740,11 @@ S: (ask for current address)
S: Portland, Oregon
S: USA

N: Jason Cooper
D: ARM/Marvell SOC co-maintainer
D: irqchip co-maintainer
D: MVEBU PCI DRIVER co-maintainer

N: Robin Cornelius
E: [email protected]
D: Ralink rt2x00 WLAN driver
Expand Down Expand Up @@ -849,6 +854,12 @@ D: trivial hack to add variable address length routing to Rose.
D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO
D: ax25-utils maintainer.

N: Kamil Debski
E: [email protected]
D: Samsung S5P 2D graphics acceleration and Multi Format Codec drivers
D: Samsung USB2 phy drivers
D: PWM fan driver

N: Helge Deller
E: [email protected]
W: http://www.parisc-linux.org/
Expand Down Expand Up @@ -1199,7 +1210,7 @@ N: Daniel J. Frasnelli
E: [email protected]
W: http://www.alphalinux.org/
P: 1024/3EF87611 B9 F1 44 50 D3 E8 C2 80 DA E5 55 AA 56 7C 42 DA
D: DEC Alpha hacker
D: DEC Alpha hacker
D: Miscellaneous bug squisher

N: Jim Freeman
Expand Down Expand Up @@ -1299,7 +1310,7 @@ S: P.O. Box 76, Epping
S: New South Wales, 2121
S: Australia

N: Carlos E. Gorges
N: Carlos E. Gorges
E: [email protected]
D: fix smp support on cmpci driver
P: 2048G/EA3C4B19 FF31 33A6 0362 4915 B7EB E541 17D0 0379 EA3C 4B19
Expand Down Expand Up @@ -1340,7 +1351,7 @@ E: [email protected]
E: [email protected]
D: Current Belkin USB Serial Adapter F5U103 hacker
D: Kernel hacker, embedded systems
S: 7802 Fitzwater Road
S: 7802 Fitzwater Road
S: Brecksville, OH 44141-1334
S: USA

Expand Down Expand Up @@ -1381,7 +1392,7 @@ N: Grant Guenther
E: [email protected]
W: http://www.torque.net/linux-pp.html
D: original author of ppa driver for parallel port ZIP drive
D: original architect of the parallel-port sharing scheme
D: original architect of the parallel-port sharing scheme
D: PARIDE subsystem: drivers for parallel port IDE & ATAPI devices
S: 44 St. Joseph Street, Suite 506
S: Toronto, Ontario, M4Y 2W4
Expand Down Expand Up @@ -1523,7 +1534,7 @@ N: Benjamin Herrenschmidt
E: [email protected]
D: Various parts of PPC/PPC64 & PowerMac
S: 312/107 Canberra Avenue
S: Griffith, ACT 2603
S: Griffith, ACT 2603
S: Australia

N: Andreas Herrmann
Expand Down Expand Up @@ -1825,7 +1836,7 @@ S: Hungary
N: Bernhard Kaindl
E: [email protected]
E: [email protected]
D: Author of a menu based configuration tool, kmenu, which
D: Author of a menu based configuration tool, kmenu, which
D: is the predecessor of 'make menuconfig' and 'make xconfig'.
D: digiboard driver update(modularisation work and 2.1.x upd)
S: Tallak 95
Expand Down Expand Up @@ -2016,7 +2027,7 @@ W: http://www.xos.nl/
D: IP transparent proxy support
S: X/OS Experts in Open Systems BV
S: Kruislaan 419
S: 1098 VA Amsterdam
S: 1098 VA Amsterdam
S: The Netherlands

N: Goran Koruga
Expand Down Expand Up @@ -2088,7 +2099,7 @@ S: Germany

N: Andrzej M. Krzysztofowicz
E: [email protected]
D: Some 8-bit XT disk driver and devfs hacking
D: Some 8-bit XT disk driver and devfs hacking
D: Aladdin 1533/1543(C) chipset IDE
D: PIIX chipset IDE
S: ul. Matemblewska 1B/10
Expand Down Expand Up @@ -2463,7 +2474,7 @@ E: [email protected]
D: Logical Volume Manager
S: Bartningstr. 12
S: 64289 Darmstadt
S: Germany
S: Germany

N: Mark W. McClelland
E: [email protected]
Expand Down Expand Up @@ -2547,7 +2558,7 @@ E: [email protected]
P: 1024/04B6E8F5 6C 77 33 CA CC D6 22 03 AB AB 15 A3 AE AD 39 7D
D: Kernel hacker. PostgreSQL hacker. Software watchdog daemon.
D: Maintainer of several Debian packages
S: Th.-Heuss-Str. 61
S: Th.-Heuss-Str. 61
S: D-41812 Erkelenz
S: Germany

Expand Down Expand Up @@ -2785,7 +2796,7 @@ E: [email protected]
W: http://www.i-Connect.Net/~mike/
D: Developer and maintainer of the EATA-DMA SCSI driver
D: Co-developer EATA-PIO SCSI driver
D: /proc/scsi and assorted other snippets
D: /proc/scsi and assorted other snippets
S: Zum Schiersteiner Grund 2
S: 55127 Mainz
S: Germany
Expand Down Expand Up @@ -2852,6 +2863,10 @@ D: IPX development and support
N: Venkatesh Pallipadi (Venki)
D: x86/HPET

N: Kyungmin Park
E: [email protected]
D: Samsung S5Pv210 and Exynos4210 mobile platforms

N: David Parsons
E: [email protected]
D: improved memory detection code.
Expand Down Expand Up @@ -3019,7 +3034,7 @@ D: Embedded PowerPC 4xx/6xx/7xx/74xx support
S: Chandler, Arizona 85249
S: USA

N: Frederic Potter
N: Frederic Potter
E: [email protected]
D: Some PCI kernel support

Expand Down Expand Up @@ -3452,21 +3467,21 @@ S: Klosterweg 28 / i309
S: 76131 Karlsruhe
S: Germany

N: James Simmons
N: James Simmons
E: [email protected]
E: [email protected]
E: [email protected]
D: Frame buffer device maintainer
D: input layer development
D: tty/console layer
D: various mipsel devices
S: 115 Carmel Avenue
D: various mipsel devices
S: 115 Carmel Avenue
S: El Cerrito CA 94530
S: USA
S: USA

N: Jaspreet Singh
E: [email protected]
W: www.sangoma.com
D: WANPIPE drivers & API Support for Sangoma S508/FT1 cards
D: WANPIPE drivers & API Support for Sangoma S508/FT1 cards
S: Sangoma Technologies Inc.,
S: 1001 Denison Street
S: Suite 101
Expand All @@ -3490,7 +3505,7 @@ N: Craig Small
E: [email protected]
E: [email protected] (packet radio)
D: Gracilis PackeTwin device driver
D: RSPF daemon
D: RSPF daemon
S: 10 Stockalls Place
S: Minto, NSW, 2566
S: Australia
Expand Down Expand Up @@ -3700,7 +3715,7 @@ N: Tsu-Sheng Tsao
E: [email protected]
D: IGMP(Internet Group Management Protocol) version 2
S: 2F 14 ALY 31 LN 166 SEC 1 SHIH-PEI RD
S: Taipei
S: Taipei
S: Taiwan 112
S: Republic of China
S: 24335 Delta Drive
Expand Down Expand Up @@ -3861,15 +3876,15 @@ D: Produced the Slackware distribution, updated the SVGAlib
D: patches for ghostscript, worked on color 'ls', etc.
S: 301 15th Street S.
S: Moorhead, Minnesota 56560
S: USA
S: USA

N: Jos Vos
E: [email protected]
W: http://www.xos.nl/
D: Various IP firewall updates, ipfwadm
S: X/OS Experts in Open Systems BV
S: Kruislaan 419
S: 1098 VA Amsterdam
S: 1098 VA Amsterdam
S: The Netherlands

N: Jeroen Vreeken
Expand Down Expand Up @@ -4107,7 +4122,7 @@ S: People's Repulic of China
N: Victor Yodaiken
E: [email protected]
D: RTLinux (RealTime Linux)
S: POB 1822
S: POB 1822
S: Socorro NM, 87801
S: USA

Expand Down Expand Up @@ -4205,7 +4220,7 @@ D: EISA/sysfs subsystem
S: France

# Don't add your name here, unless you really _are_ after Marc
# alphabetically. Leonard used to be very proud of being the
# alphabetically. Leonard used to be very proud of being the
# last entry, and he'll get positively pissed if he can't even
# be second-to-last. (and this file really _is_ supposed to be
# in alphabetic order)
10 changes: 5 additions & 5 deletions Documentation/ABI/stable/sysfs-driver-dma-ioatdma
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap
Date: December 3, 2009
KernelVersion: 2.6.32
Contact: [email protected]
Description: Capabilities the DMA supports.Currently there are DMA_PQ, DMA_PQ_VAL,
DMA_XOR,DMA_XOR_VAL,DMA_INTERRUPT.

What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active
Date: December 3, 2009
KernelVersion: 2.6.32
Contact: [email protected]
Description: The number of descriptors active in the ring.

What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size
Date: December 3, 2009
KernelVersion: 2.6.32
Contact: [email protected]
Description: Descriptor ring size, total number of descriptors available.

What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version
Date: December 3, 2009
KernelVersion: 2.6.32
Contact: [email protected]
Description: Version of ioatdma device.

What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce
Date: August 8, 2017
KernelVersion: 4.14
Contact: [email protected]
Expand Down
24 changes: 0 additions & 24 deletions Documentation/ABI/testing/sysfs-bus-iio-timer-stm32
Original file line number Diff line number Diff line change
Expand Up @@ -109,30 +109,6 @@ Description:
When counting down the counter start from preset value
and fire event when reach 0.

What: /sys/bus/iio/devices/iio:deviceX/in_count_quadrature_mode_available
KernelVersion: 4.12
Contact: [email protected]
Description:
Reading returns the list possible quadrature modes.

What: /sys/bus/iio/devices/iio:deviceX/in_count0_quadrature_mode
KernelVersion: 4.12
Contact: [email protected]
Description:
Configure the device counter quadrature modes:

channel_A:
Encoder A input servers as the count input and B as
the UP/DOWN direction control input.

channel_B:
Encoder B input serves as the count input and A as
the UP/DOWN direction control input.

quadrature:
Encoder A and B inputs are mixed to get direction
and count with a scale of 0.25.

What: /sys/bus/iio/devices/iio:deviceX/in_count_enable_mode_available
KernelVersion: 4.12
Contact: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion Documentation/ABI/testing/sysfs-class-net
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Description:
When an interface is under test, it cannot be expected
to pass packets as normal.

What: /sys/clas/net/<iface>/duplex
What: /sys/class/net/<iface>/duplex
Date: October 2009
KernelVersion: 2.6.33
Contact: [email protected]
Expand Down
4 changes: 4 additions & 0 deletions Documentation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ BUILDDIR = $(obj)/output
PDFLATEX = xelatex
LATEXOPTS = -interaction=batchmode

ifeq ($(KBUILD_VERBOSE),0)
SPHINXOPTS += "-q"
endif

# User-friendly check for sphinx-build
HAVE_SPHINX := $(shell if which $(SPHINXBUILD) >/dev/null 2>&1; then echo 1; else echo 0; fi)

Expand Down
2 changes: 1 addition & 1 deletion Documentation/admin-guide/LSM/SafeSetID.rst
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ for a UID/GID will prevent that UID/GID from obtaining auxiliary setid
privileges, such as allowing a user to set up user namespace UID/GID mappings.

Note on GID policies and setgroups()
==================
====================================
In v5.9 we are adding support for limiting CAP_SETGID privileges as was done
previously for CAP_SETUID. However, for compatibility with common sandboxing
related code conventions in userspace, we currently allow arbitrary
Expand Down
Loading

0 comments on commit 1e04538

Please sign in to comment.