Merge branch 'next' into for-linus (c2514106) · Commits · e / devices / android_kernel_oneplus_sm7250

.mailmap

+8 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
		Alan Cox <alan@lxorguk.ukuu.org.uk>
		Alan Cox <root@hraefn.swansea.linux.org.uk>
		Aleksey Gorelov <aleksey_gorelov@phoenix.com>
		Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
		Al Viro <viro@ftp.linux.org.uk>
		Al Viro <viro@zenIV.linux.org.uk>
		Andreas Herrmann <aherrman@de.ibm.com>
		@@ -43,6 +44,7 @@ Corey Minyard <minyard@acm.org>
		Damian Hobson-Garcia <dhobsong@igel.co.jp>
		David Brownell <david-b@pacbell.net>
		David Woodhouse <dwmw2@shinybook.infradead.org>
		Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>
		Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
		Domen Puncer <domen@coderock.org>
		Douglas Gilbert <dougg@torque.net>
		@@ -68,6 +70,8 @@ Jacob Shin <Jacob.Shin@amd.com>
		James Bottomley <jejb@mulgrave.(none)>
		James Bottomley <jejb@titanic.il.steeleye.com>
		James E Wilson <wilson@specifix.com>
		James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
		James Hogan <jhogan@kernel.org> <james@albanarts.com>
		James Ketrenos <jketreno@io.(none)>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		@@ -98,6 +102,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Linas Vepstas <linas@austin.ibm.com>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
		Mark Brown <broonie@sirena.org.uk>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
		@@ -112,9 +117,11 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
		Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
		Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
		Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
		Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
		Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <m@bues.ch>
		Michel Dänzer <michel@tungstengraphics.com>
		Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
		Mitesh shah <mshah@teja.com>
		Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
		Morten Welinder <terra@gnome.org>
		@@ -125,6 +132,7 @@ Mythri P K <mythripk@ti.com>
		Nguyen Anh Quynh <aquynh@gmail.com>
		Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
		Patrick Mochel <mochel@digitalimplant.org>
		Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
		Peter A Jonsson <pj@ludd.ltu.se>
		Peter Oruba <peter@oruba.de>
		Peter Oruba <peter.oruba@amd.com>

CREDITS

+4 −6

Original line number	Diff line number	Diff line
		@@ -2090,7 +2090,7 @@ S: Kuala Lumpur, Malaysia

		N: Mohit Kumar
		D: ST Microelectronics SPEAr13xx PCI host bridge driver
		D: Synopsys Designware PCI host bridge driver
		D: Synopsys DesignWare PCI host bridge driver

		N: Gabor Kuti
		E: seasons@falcon.sch.bme.hu
		@@ -2606,11 +2606,9 @@ E: tmolina@cablespeed.com
		D: bug fixes, documentation, minor hackery

		N: Paul Moore
		E: paul.moore@hp.com
		D: NetLabel author
		S: Hewlett-Packard
		S: 110 Spit Brook Road
		S: Nashua, NH 03062
		E: paul@paul-moore.com
		W: http://www.paul-moore.com
		D: NetLabel, SELinux, audit

		N: James Morris
		E: jmorris@namei.org

Documentation/00-INDEX

+2 −6

Original line number	Diff line number	Diff line
		@@ -24,8 +24,6 @@ DMA-ISA-LPC.txt
		- How to do DMA with ISA (and LPC) devices.
		DMA-attributes.txt
		- listing of the various possible attributes a DMA region can have
		DocBook/
		- directory with DocBook templates etc. for kernel documentation.
		EDID/
		- directory with info on customizing EDID for broken gfx/displays.
		IPMI.txt
		@@ -40,8 +38,6 @@ Intel-IOMMU.txt
		- basic info on the Intel IOMMU virtualization support.
		Makefile
		- It's not of interest for those who aren't touching the build system.
		Makefile.sphinx
		- It's not of interest for those who aren't touching the build system.
		PCI/
		- info related to PCI drivers.
		RCU/
		@@ -246,8 +242,6 @@ kprobes.txt
		- documents the kernel probes debugging feature.
		kref.txt
		- docs on adding reference counters (krefs) to kernel objects.
		kselftest.txt
		- small unittests for (some) individual codepaths in the kernel.
		laptops/
		- directory with laptop related info and laptop driver documentation.
		ldm.txt
		@@ -264,6 +258,8 @@ logo.gif
		- full colour GIF image of Linux logo (penguin - Tux).
		logo.txt
		- info on creator of above logo & site to get additional images from.
		lsm.txt
		- Linux Security Modules: General Security Hooks for Linux
		lzo.txt
		- kernel LZO decompressor input formats
		m68k/

Documentation/ABI/stable/sysfs-bus-nvmem

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/nvmem/devices/.../nvmem
		Date: July 2015
		KernelVersion: 4.2
		Contact: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
		Description:
		This file allows user to read/write the raw NVMEM contents.
		Permissions for write to this file depends on the nvmem
		provider configuration.

		ex:
		hexdump /sys/bus/nvmem/devices/qfprom0/nvmem

		0000000 0000 0000 0000 0000 0000 0000 0000 0000
		*
		00000a0 db10 2240 0000 e000 0c00 0c00 0000 0c00
		0000000 0000 0000 0000 0000 0000 0000 0000 0000
		...
		*
		0001000

Documentation/ABI/stable/sysfs-class-udc

+8 −8

Original line number	Diff line number	Diff line
		@@ -55,14 +55,6 @@ Description:
		Indicates the maximum USB speed supported by this port.
		Users:

		What: /sys/class/udc/<udc>/maximum_speed
		Date: June 2011
		KernelVersion: 3.1
		Contact: Felipe Balbi <balbi@kernel.org>
		Description:
		Indicates the maximum USB speed supported by this port.
		Users:

		What: /sys/class/udc/<udc>/soft_connect
		Date: June 2011
		KernelVersion: 3.1
		@@ -91,3 +83,11 @@ Description:
		'configured', and 'suspended'; however not all USB Device
		Controllers support reporting all states.
		Users:

		What: /sys/class/udc/<udc>/function
		Date: June 2017
		KernelVersion: 4.13
		Contact: Felipe Balbi <balbi@kernel.org>
		Description:
		Prints out name of currently running USB Gadget Driver.
		Users: