Merge pull request #960 from pranith/rpi-4.0.y

vchiq: Fix wrong condition check
2025-12-06 10:00:17 +00:00 · 2015-05-08 17:12:42 +01:00 · 2015-05-07 17:48:27 -04:00 · 2015-05-05 23:06:57 +01:00 · 2015-05-05 23:03:28 +01:00 · 2015-05-05 23:01:44 +01:00
38706 changed files with 2291508 additions and 5373986 deletions
--- a/.cocciconfig
+++ b/.cocciconfig
@@ -1,3 +0,0 @@
-[spatch]
-	options = --timeout 200
-	options = --use-gitgrep
--- a/.get_maintainer.ignore
+++ b/.get_maintainer.ignore
@@ -1 +0,0 @@
-Christoph Hellwig <hch@lst.de>
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +0,0 @@
-*.c   diff=cpp
-*.h   diff=cpp
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@
 *.order
 *.elf
 *.bin
-*.tar
 *.gz
 *.bz2
 *.lzma
@@ -36,8 +35,6 @@
 modules.builtin
 Module.symvers
 *.dwo
-*.su
-*.c.[012]*.*

 #
 # Top-level generic files
@@ -46,7 +43,6 @@ Module.symvers
 /TAGS
 /linux
 /vmlinux
-/vmlinux.32
 /vmlinux-gdb.py
 /vmlinuz
 /System.map
@@ -63,11 +59,10 @@ Module.symvers
 /tar-install/

 #
-# git files that we don't want to ignore even if they are dot-files
+# git files that we don't want to ignore even it they are dot-files
 #
 !.gitignore
 !.mailmap
-!.cocciconfig

 #
 # Generated include files
@@ -93,9 +88,6 @@ GRTAGS
 GSYMS
 GTAGS

-# id-utils files
-ID
-
 *.orig
 *~
 \#*#
@@ -104,7 +96,6 @@ ID
 # Leavings from module signing
 #
 extra_certificates
-signing_key.pem
 signing_key.priv
 signing_key.x509
 x509.genkey
--- a/.mailmap
+++ b/.mailmap
@@ -11,19 +11,15 @@ Aaron Durbin <adurbin@google.com>
 Adam Oldham <oldhamca@gmail.com>
 Adam Radford <aradford@gmail.com>
 Adrian Bunk <bunk@stusta.de>
-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>
 Al Viro <viro@ftp.linux.org.uk>
 Al Viro <viro@zenIV.linux.org.uk>
 Andreas Herrmann <aherrman@de.ibm.com>
-Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
 Andrew Morton <akpm@linux-foundation.org>
 Andrew Vasquez <andrew.vasquez@qlogic.com>
 Andy Adamson <andros@citi.umich.edu>
-Antoine Tenart <antoine.tenart@free-electrons.com>
-Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
 Archit Taneja <archit@ti.com>
 Arnaud Patard <arnaud.patard@rtp-net.org>
 Arnd Bergmann <arnd@arndb.de>
@@ -32,13 +28,9 @@ Axel Lin <axel.lin@gmail.com>
 Ben Gardner <bgardner@wabtec.com>
 Ben M Cahill <ben.m.cahill@intel.com>
 Björn Steinbrink <B.Steinbrink@gmx.de>
-Boris Brezillon <boris.brezillon@free-electrons.com>
-Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>
-Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>
 Brian Avery <b.avery@hp.com>
 Brian King <brking@us.ibm.com>
 Christoph Hellwig <hch@lst.de>
-Christophe Ricard <christophe.ricard@gmail.com>
 Corey Minyard <minyard@acm.org>
 Damian Hobson-Garcia <dhobsong@igel.co.jp>
 David Brownell <david-b@pacbell.net>
@@ -53,9 +45,6 @@ Felix Kuhling <fxkuehl@gmx.de>
 Felix Moeller <felix@derklecks.de>
 Filipe Lautert <filipe@icewall.org>
 Franck Bui-Huu <vagabon.xyz@gmail.com>
-Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
-Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
-Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
 Frank Zago <fzago@systemfabricworks.com>
 Greg Kroah-Hartman <greg@echidna.(none)>
 Greg Kroah-Hartman <gregkh@suse.de>
@@ -69,15 +58,10 @@ James Bottomley <jejb@mulgrave.(none)>
 James Bottomley <jejb@titanic.il.steeleye.com>
 James E Wilson <wilson@specifix.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>
 Jean Tourrilhes <jt@hpl.hp.com>
 Jeff Garzik <jgarzik@pretzel.yyz.us>
 Jens Axboe <axboe@suse.de>
 Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
-Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
-Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
-John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
 John Stultz <johnstul@us.ibm.com>
 <josh@joshtriplett.org> <josh@freedesktop.org>
 <josh@joshtriplett.org> <josh@kernel.org>
@@ -91,29 +75,15 @@ Kay Sievers <kay.sievers@vrfy.org>
 Kenneth W Chen <kenneth.w.chen@intel.com>
 Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
 Koushik <raghavendra.koushik@neterion.com>
-Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
-Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
 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>
 Mark Brown <broonie@sirena.org.uk>
 Matthieu CASTET <castet.matthieu@free.fr>
-Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
-Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
-Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org>
-Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
-Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
-Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
-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>
 Mayuresh Janorkar <mayur@ti.com>
 Michael Buesch <m@bues.ch>
 Michel Dänzer <michel@tungstengraphics.com>
 Mitesh shah <mshah@teja.com>
-Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
 Morten Welinder <terra@gnome.org>
 Morten Welinder <welinder@anemone.rentec.com>
 Morten Welinder <welinder@darter.rentec.com>
@@ -125,15 +95,11 @@ Patrick Mochel <mochel@digitalimplant.org>
 Peter A Jonsson <pj@ludd.ltu.se>
 Peter Oruba <peter@oruba.de>
 Peter Oruba <peter.oruba@amd.com>
-Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
 Praveen BP <praveenbp@ti.com>
-Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
 Rajesh Shah <rajesh.shah@intel.com>
 Ralf Baechle <ralf@linux-mips.org>
 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
 Rémi Denis-Courmont <rdenis@simphalempin.com>
-Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
 Rudolf Marek <R.Marek@sh.cvut.cz>
 Rui Saraiva <rmps@joel.ist.utl.pt>
 Sachin P Sant <ssant@in.ibm.com>
@@ -143,14 +109,9 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
 Sascha Hauer <s.hauer@pengutronix.de>
 S.Çağlar Onur <caglar@pardus.org.tr>
 Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
-Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
-Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
-Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
-Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
 Simon Kelley <simon@thekelleys.org.uk>
 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
 Stephen Hemminger <shemminger@osdl.org>
-Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
 Sumit Semwal <sumit.semwal@ti.com>
 Tejun Heo <htejun@gmail.com>
 Thomas Graf <tgraf@suug.ch>
@@ -160,12 +121,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Uwe Kleine-König <ukl@pengutronix.de>
 Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
-Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
-Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
-Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
-Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
-Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
-Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
+Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>
 Takashi YOSHII <takashi.yoshii.zj@renesas.com>
 Yusuke Goda <goda.yusuke@renesas.com>
 Gustavo Padovan <gustavo@las.ic.unicamp.br>
--- a/112
+++ b/112
@@ -9,7 +9,7 @@
 			Linus
 ----------

-N: Matt Mackal
+M: Matt Mackal
 E: mpm@selenic.com
 D: SLOB slab allocator

@@ -20,10 +20,6 @@ D: One of assisting postmasters for vger.kernel.org's lists
 S: (ask for current address)
 S: Finland

-N: Thomas Abraham
-E: thomas.ab@samsung.com
-D: Samsung pin controller driver
-
 N: Dragos Acostachioaie
 E: dragos@iname.com
 W: http://www.arbornet.org/~dragos
@@ -191,10 +187,6 @@ N: Krishna Balasubramanian
 E: balasub@cis.ohio-state.edu
 D: Wrote SYS V IPC (part of standard kernel since 0.99.10)

-N: Chris Ball
-E: chris@printf.net
-D: Former maintainer of the MMC/SD/SDIO subsystem.
-
 N: Dario Ballabio
 E: ballabio_dario@emc.com
 E: dario.ballabio@tiscalinet.it
@@ -512,10 +504,6 @@ E: paul@paulbristow.net
 W: http://paulbristow.net/linux/idefloppy.html
 D: Maintainer of IDE/ATAPI floppy driver

-N: Stefano Brivio
-E: stefano.brivio@polimi.it
-D: Broadcom B43 driver
-
 N: Dominik Brodowski
 E: linux@brodo.de
 W: http://www.brodo.de/
@@ -534,7 +522,6 @@ N: NeilBrown
 E: neil@brown.name
 P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F  497A 39EC 9EDD 5662 81B9
 D: NFSD Maintainer 2000-2007
-D: MD Maintainer 2001-2016

 N: Zach Brown
 E: zab@zabbo.net
@@ -649,7 +636,6 @@ D: Configure, Menuconfig, xconfig

 N: Mauro Carvalho Chehab
 E: m.chehab@samsung.org
-E: mchehab@osg.samsung.com
 E: mchehab@infradead.org
 D: Media subsystem (V4L/DVB) drivers and core
 D: EDAC drivers and EDAC 3.0 core rework
@@ -769,7 +755,6 @@ D: Z85230 driver
 D: Former security contact point (please use vendor-sec@lst.de)
 D: ex 2.2 maintainer
 D: 2.1.x modular sound
-D: Assigned major/minor numbers maintainer at lanana.org
 S: c/o Red Hat UK Ltd
 S: Alexandra House
 S: Alexandra Terrace
@@ -1090,10 +1075,6 @@ S: 6350 Stoneridge Mall Road
 S: Pleasanton, CA 94588
 S: USA

-N: Dmitry Eremin-Solenikov
-E: dbaryshkov@gmail.com
-D: Power Supply Maintainer from v3.14 - v3.15
-
 N: Doug Evans
 E: dje@cygnus.com
 D: Wrote Xenix FS (part of standard kernel since 0.99.15)
@@ -1514,14 +1495,6 @@ S: 312/107 Canberra Avenue
 S: Griffith, ACT 2603 
 S: Australia

-N: Andreas Herrmann
-E: herrmann.der.user@gmail.com
-E: herrmann.der.user@googlemail.com
-D: Key developer of x86/AMD64
-D: Author of AMD family 15h processor power monitoring driver
-D: Maintainer of AMD Athlon 64 and Opteron processor frequency driver
-S: Germany
-
 N: Sebastian Hetze
 E: she@lunetix.de
 D: German Linux Documentation,
@@ -1862,17 +1835,6 @@ S: Korte Heul 95
 S: 1403 ND  BUSSUM
 S: The Netherlands

-N: Martin Kepplinger
-E: martink@posteo.de
-E: martin.kepplinger@ginzinger.com
-W: http://www.martinkepplinger.com
-D: mma8452 accelerators iio driver
-D: pegasus_notetaker input driver
-D: Kernel fixes and cleanups
-S: Garnisonstraße 26
-S: 4020 Linz
-S: Austria
-
 N: Karl Keyte
 E: karl@koft.com
 D: Disk usage statistics and modifications to line printer driver
@@ -1910,7 +1872,7 @@ S: Ra'annana, Israel

 N: Andi Kleen
 E: andi@firstfloor.org
-W: http://www.halobates.de
+U: http://www.halobates.de
 D: network, x86, NUMA, various hacks
 S: Schwalbenstr. 96
 S: 85551 Ottobrunn
@@ -1949,11 +1911,6 @@ E: kraxel@bytesex.org
 E: kraxel@suse.de
 D: video4linux, bttv, vesafb, some scsi, misc fixes

-N: Hans J. Koch
-D: USERSPACE I/O, MAX6650
-D: Hans passed away in June 2016, and will be greatly missed.
-W: https://lwn.net/Articles/691000/
-
 N: Harald Koenig
 E: koenig@tat.physik.uni-tuebingen.de
 D: XFree86 (S3), DCF77, some kernel hacks and fixes
@@ -2084,13 +2041,9 @@ D: pirq addr, CS5535 alsa audio driver
 S: Gurgaon, India
 S: Kuala Lumpur, Malaysia

-N: Mohit Kumar
-D: ST Microelectronics SPEAr13xx PCI host bridge driver
-D: Synopsys Designware PCI host bridge driver
-
 N: Gabor Kuti
-E: seasons@falcon.sch.bme.hu
-E: seasons@makosteszta.sote.hu
+M: seasons@falcon.sch.bme.hu
+M: seasons@makosteszta.sote.hu
 D: Original author of software suspend

 N: Jaroslav Kysela
@@ -2297,11 +2250,11 @@ D: Initial implementation of VC's, pty's and select()

 N: Pavel Machek
 E: pavel@ucw.cz
-P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585  B8C7 C060 2241 92DF CE96
-D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,
+D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd
 D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
-D: work on suspend-to-ram/disk, killing duplicates from ioctl32,
-D: Altera SoCFPGA and Nokia N900 support.
+D: work on suspend-to-ram/disk, killing duplicates from ioctl32
+S: Volkova 1131
+S: 198 00 Praha 9
 S: Czech Republic

 N: Paul Mackerras
@@ -2775,10 +2728,6 @@ S: C/ Mieses 20, 9-B
 S: Valladolid 47009
 S: Spain

-N: Jens Osterkamp
-E: jens@de.ibm.com
-D: Maintainer of Spidernet network driver for Cell
-
 N: Gadi Oxman
 E: gadio@netvision.net.il
 D: Original author and maintainer of IDE/ATAPI floppy/tape drivers
@@ -3023,10 +2972,6 @@ S: 2200 Mission College Blvd
 S: Santa Clara, CA 95052
 S: USA

-N: Anil Ravindranath
-E: anil_ravindranath@pmc-sierra.com
-D: PMC-Sierra MaxRAID driver
-
 N: Eric S. Raymond
 E: esr@thyrsus.com
 W: http://www.tuxedo.org/~esr/
@@ -3059,20 +3004,6 @@ W: http://www.qsl.net/dl1bke/
 D: Generic Z8530 driver, AX.25 DAMA slave implementation
 D: Several AX.25 hacks

-N: Ricardo Ribalda Delgado
-E: ricardo.ribalda@gmail.com
-W: http://ribalda.com
-D: PLX USB338x driver
-D: PCA9634 driver
-D: Option GTM671WFS
-D: Fintek F81216A
-D: AD5761 iio driver
-D: Various kernel hacks
-S: Qtechnology A/S
-S: Valby Langgade 142
-S: 2500 Valby
-S: Denmark
-
 N: Francois-Rene Rideau
 E: fare@tunes.org
 W: http://www.tunes.org/~fare
@@ -3259,15 +3190,15 @@ S: 69 rue Dunois
 S: 75013 Paris
 S: France

-N: Aleksa Sarai
-E: cyphar@cyphar.com
-W: https://www.cyphar.com/
-D: `pids` cgroup subsystem
-
 N: Dipankar Sarma
 E: dipankar@in.ibm.com
 D: RCU

+N: Yoshinori Sato
+E: ysato@users.sourceforge.jp
+D: uClinux for Renesas H8/300 (H8300)
+D: http://uclinux-h8.sourceforge.jp/
+
 N: Hannu Savolainen
 E: hannu@opensound.com
 D: Maintainer of the sound drivers until 2.1.x days.
@@ -3528,10 +3459,6 @@ S: 145 Howard St.
 S: Northborough, MA 01532
 S: USA

-N: Doug Thompson
-E: dougthompson@xmission.com
-D: EDAC
-
 N: Tommy Thorn
 E: Tommy.Thorn@irisa.fr
 W: http://www.irisa.fr/prive/thorn/index.html
@@ -3668,10 +3595,6 @@ S: Obere Heerbergstrasse 17
 S: 97078 Wuerzburg
 S: Germany

-N: Jason Uhlenkott
-E: juhlenko@akamai.com
-D: I3000 EDAC driver
-
 N: Greg Ungerer
 E: gerg@snapgear.com
 D: uClinux kernel hacker
@@ -3709,7 +3632,7 @@ S: Germany
 N: Geert Uytterhoeven
 E: geert@linux-m68k.org
 W: http://users.telenet.be/geertu/
-P: 4096R/4804B4BC3F55EEFB 750D 82B0 A781 5431 5E25  925B 4804 B4BC 3F55 EEFB
+P: 1024/862678A6 C51D 361C 0BD1 4C90 B275  C553 6EEA 11BA 8626 78A6
 D: m68k/Amiga and PPC/CHRP Longtrail coordinator
 D: Frame buffer device and XF68_FBDev maintainer
 D: m68k IDE maintainer
@@ -3761,13 +3684,6 @@ N: Dirk Verworner
 D: Co-author of German book ``Linux-Kernel-Programmierung''
 D: Co-founder of Berlin Linux User Group

-N: Andrew Victor
-E: linux@maxim.org.za
-W: http://maxim.org.za/at91_26.html
-D: First maintainer of Atmel ARM-based SoC, aka AT91
-D: Introduced support for at91rm9200, the first chip of AT91 family
-S: South Africa
-
 N: Riku Voipio
 E: riku.voipio@iki.fi
 D: Author of PCA9532 LED and Fintek f75375s hwmon driver
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -1,2 +0,0 @@
-output
-*.pyc
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -46,8 +46,7 @@ IRQ.txt
 Intel-IOMMU.txt
 	- basic info on the Intel IOMMU virtualization support.
 Makefile
-	- This file does nothing. Removing it breaks make htmldocs and
-	  make distclean.
+	- some files in Documentation dir are actually sample code to build
 ManagementStyle
 	- how to (attempt to) manage kernel hackers.
 RCU/
@@ -256,10 +255,10 @@ kbuild/
 	- directory with info about the kernel build process.
 kdump/
 	- directory with mini HowTo on getting the crash dump code to work.
+kernel-doc-nano-HOWTO.txt
+	- mini HowTo on generation and location of kernel documentation files.
 kernel-docs.txt
 	- listing of various WWW + books that document kernel internals.
-kernel-documentation.rst
-	- how to write and format reStructuredText kernel documentation
 kernel-parameters.txt
 	- summary listing of command line / boot prompt args for the kernel.
 kernel-per-CPU-kthreads.txt
--- a/Documentation/80211/cfg80211.rst
+++ b/Documentation/80211/cfg80211.rst
@@ -1,345 +0,0 @@
-==================
-cfg80211 subsystem
-==================
-
-Device registration
-===================
-
-.. kernel-doc:: include/net/cfg80211.h
-   :doc: Device registration
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_channel_flags
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_channel
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_rate_flags
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_rate
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_sta_ht_cap
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_supported_band
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_signal_type
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_params_flags
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_flags
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wireless_dev
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_new
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_register
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_unregister
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_free
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_name
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_dev
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_priv
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: priv_to_wiphy
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: set_wiphy_dev
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wdev_priv
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_iface_limit
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_iface_combination
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_check_combinations
-
-Actions and configuration
-=========================
-
-.. kernel-doc:: include/net/cfg80211.h
-   :doc: Actions and configuration
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_ops
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: vif_params
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: key_params
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: survey_info_flags
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: survey_info
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_beacon_data
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_ap_settings
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: station_parameters
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: rate_info_flags
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: rate_info
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: station_info
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: monitor_flags
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: mpath_info_flags
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: mpath_info
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: bss_parameters
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_txq_params
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_crypto_settings
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_auth_request
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_assoc_request
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_deauth_request
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_disassoc_request
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_ibss_params
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_connect_params
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_pmksa
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_rx_mlme_mgmt
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_auth_timeout
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_rx_assoc_resp
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_assoc_timeout
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_tx_mlme_mgmt
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_ibss_joined
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_connect_result
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_connect_bss
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_connect_timeout
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_roamed
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_disconnected
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_ready_on_channel
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_remain_on_channel_expired
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_new_sta
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_rx_mgmt
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_mgmt_tx_status
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_cqm_rssi_notify
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_cqm_pktloss_notify
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_michael_mic_failure
-
-Scanning and BSS list handling
-==============================
-
-.. kernel-doc:: include/net/cfg80211.h
-   :doc: Scanning and BSS list handling
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_ssid
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_scan_request
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_scan_done
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_bss
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_inform_bss
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_inform_bss_frame_data
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_inform_bss_data
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_unlink_bss
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_find_ie
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_bss_get_ie
-
-Utility functions
-=================
-
-.. kernel-doc:: include/net/cfg80211.h
-   :doc: Utility functions
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_channel_to_frequency
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_frequency_to_channel
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_get_channel
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_get_response_rate
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_hdrlen
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_get_hdrlen_from_skb
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_radiotap_iterator
-
-Data path helpers
-=================
-
-.. kernel-doc:: include/net/cfg80211.h
-   :doc: Data path helpers
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_data_to_8023
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_data_from_8023
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: ieee80211_amsdu_to_8023s
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_classify8021d
-
-Regulatory enforcement infrastructure
-=====================================
-
-.. kernel-doc:: include/net/cfg80211.h
-   :doc: Regulatory enforcement infrastructure
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: regulatory_hint
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_apply_custom_regulatory
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: freq_reg_info
-
-RFkill integration
-==================
-
-.. kernel-doc:: include/net/cfg80211.h
-   :doc: RFkill integration
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_rfkill_set_hw_state
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_rfkill_start_polling
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: wiphy_rfkill_stop_polling
-
-Test mode
-=========
-
-.. kernel-doc:: include/net/cfg80211.h
-   :doc: Test mode
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_testmode_alloc_reply_skb
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_testmode_reply
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_testmode_alloc_event_skb
-
-.. kernel-doc:: include/net/cfg80211.h
-   :functions: cfg80211_testmode_event
--- a/Documentation/80211/conf.py
+++ b/Documentation/80211/conf.py
@@ -1,5 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-
-project = "Linux 802.11 Driver Developer's Guide"
-
-tags.add("subproject")
--- a/Documentation/80211/index.rst
+++ b/Documentation/80211/index.rst
@@ -1,17 +0,0 @@
-=====================================
-Linux 802.11 Driver Developer's Guide
-=====================================
-
-.. toctree::
-
-   introduction
-   cfg80211
-   mac80211
-   mac80211-advanced
-
-.. only::  subproject
-
-   Indices
-   =======
-
-   * :ref:`genindex`
--- a/Documentation/80211/introduction.rst
+++ b/Documentation/80211/introduction.rst
@@ -1,17 +0,0 @@
-============
-Introduction
-============
-
-Explaining wireless 802.11 networking in the Linux kernel
-
-Copyright 2007-2009 Johannes Berg
-
-These books attempt to give a description of the various subsystems
-that play a role in 802.11 wireless networking in Linux. Since these
-books are for kernel developers they attempts to document the
-structures and functions used in the kernel as well as giving a
-higher-level overview.
-
-The reader is expected to be familiar with the 802.11 standard as
-published by the IEEE in 802.11-2007 (or possibly later versions).
-References to this standard will be given as "802.11-2007 8.1.5".
--- a/Documentation/80211/mac80211-advanced.rst
+++ b/Documentation/80211/mac80211-advanced.rst
@@ -1,295 +0,0 @@
-=============================
-mac80211 subsystem (advanced)
-=============================
-
-Information contained within this part of the book is of interest only
-for advanced interaction of mac80211 with drivers to exploit more
-hardware capabilities and improve performance.
-
-LED support
-===========
-
-Mac80211 supports various ways of blinking LEDs. Wherever possible,
-device LEDs should be exposed as LED class devices and hooked up to the
-appropriate trigger, which will then be triggered appropriately by
-mac80211.
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_get_tx_led_name
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_get_rx_led_name
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_get_assoc_led_name
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_get_radio_led_name
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_tpt_blink
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_tpt_led_trigger_flags
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_create_tpt_led_trigger
-
-Hardware crypto acceleration
-============================
-
-.. kernel-doc:: include/net/mac80211.h
-   :doc: Hardware crypto acceleration
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: set_key_cmd
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_key_conf
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_key_flags
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_get_tkip_p1k
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_get_tkip_p1k_iv
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_get_tkip_p2k
-
-Powersave support
-=================
-
-.. kernel-doc:: include/net/mac80211.h
-   :doc: Powersave support
-
-Beacon filter support
-=====================
-
-.. kernel-doc:: include/net/mac80211.h
-   :doc: Beacon filter support
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_beacon_loss
-
-Multiple queues and QoS support
-===============================
-
-TBD
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_tx_queue_params
-
-Access point mode support
-=========================
-
-TBD
-
-Some parts of the if_conf should be discussed here instead
-
-Insert notes about VLAN interfaces with hw crypto here or in the hw
-crypto chapter.
-
-support for powersaving clients
-------------------------------
-
-.. kernel-doc:: include/net/mac80211.h
-   :doc: AP support for powersaving clients
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_get_buffered_bc
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_beacon_get
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_sta_eosp
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_frame_release_type
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_sta_ps_transition
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_sta_ps_transition_ni
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_sta_set_buffered
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_sta_block_awake
-
-Supporting multiple virtual interfaces
-======================================
-
-TBD
-
-Note: WDS with identical MAC address should almost always be OK
-
-Insert notes about having multiple virtual interfaces with different MAC
-addresses here, note which configurations are supported by mac80211, add
-notes about supporting hw crypto with it.
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_iterate_active_interfaces
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_iterate_active_interfaces_atomic
-
-Station handling
-================
-
-TODO
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_sta
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: sta_notify_cmd
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_find_sta
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_find_sta_by_ifaddr
-
-Hardware scan offload
-=====================
-
-TBD
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_scan_completed
-
-Aggregation
-===========
-
-TX A-MPDU aggregation
---------------------
-
-.. kernel-doc:: net/mac80211/agg-tx.c
-   :doc: TX A-MPDU aggregation
-
-.. WARNING: DOCPROC directive not supported: !Cnet/mac80211/agg-tx.c
-
-RX A-MPDU aggregation
---------------------
-
-.. kernel-doc:: net/mac80211/agg-rx.c
-   :doc: RX A-MPDU aggregation
-
-.. WARNING: DOCPROC directive not supported: !Cnet/mac80211/agg-rx.c
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_ampdu_mlme_action
-
-Spatial Multiplexing Powersave (SMPS)
-=====================================
-
-.. kernel-doc:: include/net/mac80211.h
-   :doc: Spatial multiplexing power save
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_request_smps
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_smps_mode
-
-TBD
-
-This part of the book describes the rate control algorithm interface and
-how it relates to mac80211 and drivers.
-
-Rate Control API
-================
-
-TBD
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_start_tx_ba_session
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_start_tx_ba_cb_irqsafe
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_stop_tx_ba_session
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_stop_tx_ba_cb_irqsafe
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_rate_control_changed
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_tx_rate_control
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: rate_control_send_low
-
-TBD
-
-This part of the book describes mac80211 internals.
-
-Key handling
-============
-
-Key handling basics
-------------------
-
-.. kernel-doc:: net/mac80211/key.c
-   :doc: Key handling basics
-
-MORE TBD
--------
-
-TBD
-
-Receive processing
-==================
-
-TBD
-
-Transmit processing
-===================
-
-TBD
-
-Station info handling
-=====================
-
-Programming information
-----------------------
-
-.. kernel-doc:: net/mac80211/sta_info.h
-   :functions: sta_info
-
-.. kernel-doc:: net/mac80211/sta_info.h
-   :functions: ieee80211_sta_info_flags
-
-STA information lifetime rules
------------------------------
-
-.. kernel-doc:: net/mac80211/sta_info.c
-   :doc: STA information lifetime rules
-
-Aggregation
-===========
-
-.. kernel-doc:: net/mac80211/sta_info.h
-   :functions: sta_ampdu_mlme
-
-.. kernel-doc:: net/mac80211/sta_info.h
-   :functions: tid_ampdu_tx
-
-.. kernel-doc:: net/mac80211/sta_info.h
-   :functions: tid_ampdu_rx
-
-Synchronisation
-===============
-
-TBD
-
-Locking, lots of RCU
--- a/Documentation/80211/mac80211.rst
+++ b/Documentation/80211/mac80211.rst
@@ -1,216 +0,0 @@
-===========================
-mac80211 subsystem (basics)
-===========================
-
-You should read and understand the information contained within this
-part of the book while implementing a mac80211 driver. In some chapters,
-advanced usage is noted, those may be skipped if this isn't needed.
-
-This part of the book only covers station and monitor mode
-functionality, additional information required to implement the other
-modes is covered in the second part of the book.
-
-Basic hardware handling
-=======================
-
-TBD
-
-This chapter shall contain information on getting a hw struct allocated
-and registered with mac80211.
-
-Since it is required to allocate rates/modes before registering a hw
-struct, this chapter shall also contain information on setting up the
-rate/mode structs.
-
-Additionally, some discussion about the callbacks and the general
-programming model should be in here, including the definition of
-ieee80211_ops which will be referred to a lot.
-
-Finally, a discussion of hardware capabilities should be done with
-references to other parts of the book.
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_hw
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_hw_flags
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: SET_IEEE80211_DEV
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: SET_IEEE80211_PERM_ADDR
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_ops
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_alloc_hw
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_register_hw
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_unregister_hw
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_free_hw
-
-PHY configuration
-=================
-
-TBD
-
-This chapter should describe PHY handling including start/stop callbacks
-and the various structures used.
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_conf
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_conf_flags
-
-Virtual interfaces
-==================
-
-TBD
-
-This chapter should describe virtual interface basics that are relevant
-to the driver (VLANs, MGMT etc are not.) It should explain the use of
-the add_iface/remove_iface callbacks as well as the interface
-configuration callbacks.
-
-Things related to AP mode should be discussed there.
-
-Things related to supporting multiple interfaces should be in the
-appropriate chapter, a BIG FAT note should be here about this though and
-the recommendation to allow only a single interface in STA mode at
-first!
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_vif
-
-Receive and transmit processing
-===============================
-
-what should be here
-------------------
-
-TBD
-
-This should describe the receive and transmit paths in mac80211/the
-drivers as well as transmit status handling.
-
-Frame format
------------
-
-.. kernel-doc:: include/net/mac80211.h
-   :doc: Frame format
-
-Packet alignment
----------------
-
-.. kernel-doc:: net/mac80211/rx.c
-   :doc: Packet alignment
-
-Calling into mac80211 from interrupts
-------------------------------------
-
-.. kernel-doc:: include/net/mac80211.h
-   :doc: Calling mac80211 from interrupts
-
-functions/definitions
---------------------
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_rx_status
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: mac80211_rx_flags
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: mac80211_tx_info_flags
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: mac80211_tx_control_flags
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: mac80211_rate_control_flags
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_tx_rate
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_tx_info
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_tx_info_clear_status
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_rx
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_rx_ni
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_rx_irqsafe
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_tx_status
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_tx_status_ni
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_tx_status_irqsafe
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_rts_get
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_rts_duration
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_ctstoself_get
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_ctstoself_duration
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_generic_frame_duration
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_wake_queue
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_stop_queue
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_wake_queues
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_stop_queues
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_queue_stopped
-
-Frame filtering
-===============
-
-.. kernel-doc:: include/net/mac80211.h
-   :doc: Frame filtering
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_filter_flags
-
-The mac80211 workqueue
-======================
-
-.. kernel-doc:: include/net/mac80211.h
-   :doc: mac80211 workqueue
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_queue_work
-
-.. kernel-doc:: include/net/mac80211.h
-   :functions: ieee80211_queue_delayed_work
--- a/Documentation/ABI/obsolete/sysfs-block-zram
+++ b/Documentation/ABI/obsolete/sysfs-block-zram
@@ -1,119 +0,0 @@
-What:		/sys/block/zram<id>/num_reads
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The num_reads file is read-only and specifies the number of
-		reads (failed or successful) done on this device.
-		Now accessible via zram<id>/stat node.
-
-What:		/sys/block/zram<id>/num_writes
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The num_writes file is read-only and specifies the number of
-		writes (failed or successful) done on this device.
-		Now accessible via zram<id>/stat node.
-
-What:		/sys/block/zram<id>/invalid_io
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The invalid_io file is read-only and specifies the number of
-		non-page-size-aligned I/O requests issued to this device.
-		Now accessible via zram<id>/io_stat node.
-
-What:		/sys/block/zram<id>/failed_reads
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The failed_reads file is read-only and specifies the number of
-		failed reads happened on this device.
-		Now accessible via zram<id>/io_stat node.
-
-What:		/sys/block/zram<id>/failed_writes
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The failed_writes file is read-only and specifies the number of
-		failed writes happened on this device.
-		Now accessible via zram<id>/io_stat node.
-
-What:		/sys/block/zram<id>/notify_free
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The notify_free file is read-only. Depending on device usage
-		scenario it may account a) the number of pages freed because
-		of swap slot free notifications or b) the number of pages freed
-		because of REQ_DISCARD requests sent by bio. The former ones
-		are sent to a swap block device when a swap slot is freed, which
-		implies that this disk is being used as a swap disk. The latter
-		ones are sent by filesystem mounted with discard option,
-		whenever some data blocks are getting discarded.
-		Now accessible via zram<id>/io_stat node.
-
-What:		/sys/block/zram<id>/zero_pages
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The zero_pages file is read-only and specifies number of zero
-		filled pages written to this disk. No memory is allocated for
-		such pages.
-		Now accessible via zram<id>/mm_stat node.
-
-What:		/sys/block/zram<id>/orig_data_size
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The orig_data_size file is read-only and specifies uncompressed
-		size of data stored in this disk. This excludes zero-filled
-		pages (zero_pages) since no memory is allocated for them.
-		Unit: bytes
-		Now accessible via zram<id>/mm_stat node.
-
-What:		/sys/block/zram<id>/compr_data_size
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The compr_data_size file is read-only and specifies compressed
-		size of data stored in this disk. So, compression ratio can be
-		calculated using orig_data_size and this statistic.
-		Unit: bytes
-		Now accessible via zram<id>/mm_stat node.
-
-What:		/sys/block/zram<id>/mem_used_total
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The mem_used_total file is read-only and specifies the amount
-		of memory, including allocator fragmentation and metadata
-		overhead, allocated for this disk. So, allocator space
-		efficiency can be calculated using compr_data_size and this
-		statistic.
-		Unit: bytes
-		Now accessible via zram<id>/mm_stat node.
-
-What:		/sys/block/zram<id>/mem_used_max
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The mem_used_max file is read/write and specifies the amount
-		of maximum memory zram have consumed to store compressed data.
-		For resetting the value, you should write "0". Otherwise,
-		you could see -EINVAL.
-		Unit: bytes
-		Downgraded to write-only node: so it's possible to set new
-		value only; its current value is stored in zram<id>/mm_stat
-		node.
-
-What:		/sys/block/zram<id>/mem_limit
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The mem_limit file is read/write and specifies the maximum
-		amount of memory ZRAM can use to store the compressed data.
-		The limit could be changed in run time and "0" means disable
-		the limit.  No limit is the initial state.  Unit: bytes
-		Downgraded to write-only node: so it's possible to set new
-		value only; its current value is stored in zram<id>/mm_stat
-		node.
--- a/Documentation/ABI/obsolete/sysfs-class-rfkill
+++ b/Documentation/ABI/obsolete/sysfs-class-rfkill
@@ -0,0 +1,29 @@
+rfkill - radio frequency (RF) connector kill switch support
+
+For details to this subsystem look at Documentation/rfkill.txt.
+
+What:		/sys/class/rfkill/rfkill[0-9]+/state
+Date:		09-Jul-2007
+KernelVersion	v2.6.22
+Contact:	linux-wireless@vger.kernel.org
+Description: 	Current state of the transmitter.
+		This file is deprecated and scheduled to be removed in 2014,
+		because its not possible to express the 'soft and hard block'
+		state of the rfkill driver.
+Values: 	A numeric value.
+		0: RFKILL_STATE_SOFT_BLOCKED
+			transmitter is turned off by software
+		1: RFKILL_STATE_UNBLOCKED
+			transmitter is (potentially) active
+		2: RFKILL_STATE_HARD_BLOCKED
+			transmitter is forced off by something outside of
+			the driver's control.
+
+What:		/sys/class/rfkill/rfkill[0-9]+/claim
+Date:		09-Jul-2007
+KernelVersion	v2.6.22
+Contact:	linux-wireless@vger.kernel.org
+Description:	This file is deprecated because there no longer is a way to
+		claim just control over a single rfkill instance.
+		This file is scheduled to be removed in 2012.
+Values: 	0: Kernel handles events
--- a/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus
+++ b/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus
@@ -1,14 +1,3 @@
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/actual_profile
-Date:		October 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	The integer value of this attribute ranges from 0-4.
-                When read, this attribute returns the number of the actual
-                profile. This value is persistent, so its equivalent to the
-                profile that's active when the mouse is powered on next time.
-		When written, this file sets the number of the startup profile
-		and the mouse activates this profile immediately.
-Users:		http://roccat.sourceforge.net
-
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/startup_profile
 Date:		October 2010
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
@@ -33,40 +22,6 @@ Description:	When read, this file returns the raw integer version number of the
 		Please read binary attribute info which contains firmware version.
 Users:		http://roccat.sourceforge.net

-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/info
-Date:		November 2012
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	When read, this file returns general data like firmware version.
-		When written, the device can be reset.
-		The data is 8 bytes long.
-Users:		http://roccat.sourceforge.net
-
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/macro
-Date:		October 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	The mouse can store a macro with max 500 key/button strokes
-		internally.
-		When written, this file lets one set the sequence for a specific
-		button for a specific profile. Button and profile numbers are
-		included in written data. The data has to be 2082 bytes long.
-		This file is writeonly.
-Users:		http://roccat.sourceforge.net
-
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/profile_buttons
-Date:		August 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	The mouse can store 5 profiles which can be switched by the
-		press of a button. A profile is split in settings and buttons.
-		profile_buttons holds information about button layout.
-		When written, this file lets one write the respective profile
-		buttons back to the mouse. The data has to be 77 bytes long.
-		The mouse will reject invalid data.
-		Which profile to write is determined by the profile number
-		contained in the data.
-		Before reading this file, control has to be written to select
-		which profile to read.
-Users:		http://roccat.sourceforge.net
-
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/profile[1-5]_buttons
 Date:		August 2010
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
@@ -79,22 +34,6 @@ Description:	The mouse can store 5 profiles which can be switched by the
 		Write control to select profile and read profile_buttons instead.
 Users:		http://roccat.sourceforge.net

-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/profile_settings
-Date:		October 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	The mouse can store 5 profiles which can be switched by the
-		press of a button. A profile is split in settings and buttons.
-		profile_settings holds information like resolution, sensitivity
-		and light effects.
-		When written, this file lets one write the respective profile
-		settings back to the mouse. The data has to be 43 bytes long.
-		The mouse will reject invalid data.
-		Which profile to write is determined by the profile number
-		contained in the data.
-		Before reading this file, control has to be written to select
-		which profile to read.
-Users:		http://roccat.sourceforge.net
-
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/profile[1-5]_settings
 Date:		August 2010
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
@@ -106,40 +45,4 @@ Description:	The mouse can store 5 profiles which can be switched by the
 		The returned data is 43 bytes in size.
 		This file is readonly.
 		Write control to select profile and read profile_settings instead.
-Users:		http://roccat.sourceforge.net
-
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/sensor
-Date:		October 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	The mouse has a tracking- and a distance-control-unit. These
-		can be activated/deactivated and the lift-off distance can be
-		set. The data has to be 6 bytes long.
-		This file is writeonly.
-Users:		http://roccat.sourceforge.net
-
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/talk
-Date:		May 2011
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	Used to active some easy* functions of the mouse from outside.
-		The data has to be 16 bytes long.
-		This file is writeonly.
-Users:		http://roccat.sourceforge.net
-
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/tcu
-Date:		October 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	When written a calibration process for the tracking control unit
-		can be initiated/cancelled. Also lets one read/write sensor
-		registers.
-		The data has to be 4 bytes long.
-Users:		http://roccat.sourceforge.net
-
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/tcu_image
-Date:		October 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	When read the mouse returns a 30x30 pixel image of the
-		sampled underground. This works only in the course of a
-		calibration process initiated with tcu.
-		The returned data is 1028 bytes in size.
-		This file is readonly.
-Users:		http://roccat.sourceforge.net
+Users:		http://roccat.sourceforge.net
--- a/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-kovaplus
+++ b/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-kovaplus
@@ -8,17 +8,6 @@ Description:	The integer value of this attribute ranges from 1-4.
 		Has never been used. If bookkeeping is done, it's done in userland tools.
 Users:		http://roccat.sourceforge.net

-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kovaplus/roccatkovaplus<minor>/actual_profile
-Date:		January 2011
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	The integer value of this attribute ranges from 0-4.
-		When read, this attribute returns the number of the active
-		profile.
-		When written, the mouse activates this profile immediately.
-		The profile that's active when powered down is the same that's
-		active when the mouse is powered on.
-Users:		http://roccat.sourceforge.net
-
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kovaplus/roccatkovaplus<minor>/actual_sensitivity_x
 Date:		January 2011
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
@@ -51,29 +40,6 @@ Description:	When read, this file returns the raw integer version number of the
 		Obsoleted by binary sysfs attribute "info".
 Users:		http://roccat.sourceforge.net

-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kovaplus/roccatkovaplus<minor>/info
-Date:		November 2012
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	When read, this file returns general data like firmware version.
-		When written, the device can be reset.
-		The data is 6 bytes long.
-Users:		http://roccat.sourceforge.net
-
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kovaplus/roccatkovaplus<minor>/profile_buttons
-Date:		January 2011
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	The mouse can store 5 profiles which can be switched by the
-		press of a button. A profile is split in settings and buttons.
-		profile_buttons holds information about button layout.
-		When written, this file lets one write the respective profile
-		buttons back to the mouse. The data has to be 23 bytes long.
-		The mouse will reject invalid data.
-		Which profile to write is determined by the profile number
-		contained in the data.
-		Before reading this file, control has to be written to select
-		which profile to read.
-Users:		http://roccat.sourceforge.net
-
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kovaplus/roccatkovaplus<minor>/profile[1-5]_buttons
 Date:		January 2011
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
@@ -86,22 +52,6 @@ Description:	The mouse can store 5 profiles which can be switched by the
 		Write control to select profile and read profile_buttons instead.
 Users:		http://roccat.sourceforge.net

-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kovaplus/roccatkovaplus<minor>/profile_settings
-Date:		January 2011
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	The mouse can store 5 profiles which can be switched by the
-		press of a button. A profile is split in settings and buttons.
-		profile_settings holds information like resolution, sensitivity
-		and light effects.
-		When written, this file lets one write the respective profile
-		settings back to the mouse. The data has to be 16 bytes long.
-		The mouse will reject invalid data.
-		Which profile to write is determined by the profile number
-		contained in the data.
-		Before reading this file, control has to be written to select
-		which profile to read.
-Users:		http://roccat.sourceforge.net
-
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kovaplus/roccatkovaplus<minor>/profile[1-5]_settings
 Date:		January 2011
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
--- a/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra
+++ b/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra
@@ -37,29 +37,6 @@ Description:	When read, this file returns the raw integer version number of the
 		Please use binary attribute "info" which provides this information.
 Users:		http://roccat.sourceforge.net

-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/pyra/roccatpyra<minor>/info
-Date:		November 2012
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	When read, this file returns general data like firmware version.
-		When written, the device can be reset.
-		The data is 6 bytes long.
-Users:		http://roccat.sourceforge.net
-
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/pyra/roccatpyra<minor>/profile_buttons
-Date:		August 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	The mouse can store 5 profiles which can be switched by the
-		press of a button. A profile is split in settings and buttons.
-		profile_buttons holds information about button layout.
-		When written, this file lets one write the respective profile
-		buttons back to the mouse. The data has to be 19 bytes long.
-		The mouse will reject invalid data.
-		Which profile to write is determined by the profile number
-		contained in the data.
-		Before reading this file, control has to be written to select
-		which profile to read.
-Users:		http://roccat.sourceforge.net
-
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/pyra/roccatpyra<minor>/profile[1-5]_buttons
 Date:		August 2010
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
@@ -72,22 +49,6 @@ Description:	The mouse can store 5 profiles which can be switched by the
 		Write control to select profile and read profile_buttons instead.
 Users:		http://roccat.sourceforge.net

-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/pyra/roccatpyra<minor>/profile_settings
-Date:		August 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	The mouse can store 5 profiles which can be switched by the
-		press of a button. A profile is split in settings and buttons.
-		profile_settings holds information like resolution, sensitivity
-		and light effects.
-		When written, this file lets one write the respective profile
-		settings back to the mouse. The data has to be 13 bytes long.
-		The mouse will reject invalid data.
-		Which profile to write is determined by the profile number
-		contained in the data.
-		Before reading this file, control has to be written to select
-		which profile to read.
-Users:		http://roccat.sourceforge.net
-
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/pyra/roccatpyra<minor>/profile[1-5]_settings
 Date:		August 2010
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
@@ -101,17 +62,6 @@ Description:	The mouse can store 5 profiles which can be switched by the
 		Write control to select profile and read profile_settings instead.
 Users:		http://roccat.sourceforge.net

-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/pyra/roccatpyra<minor>/settings
-Date:		August 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	When read, this file returns the settings stored in the mouse.
-		The size of the data is 3 bytes and holds information on the
-		startup_profile.
-		When written, this file lets write settings back to the mouse.
-		The data has to be 3 bytes long. The mouse will reject invalid
-		data.
-Users:		http://roccat.sourceforge.net
-
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/pyra/roccatpyra<minor>/startup_profile
 Date:		August 2010
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
--- a/Documentation/ABI/removed/sysfs-class-rfkill
+++ b/Documentation/ABI/removed/sysfs-class-rfkill
@@ -1,13 +0,0 @@
-rfkill - radio frequency (RF) connector kill switch support
-
-For details to this subsystem look at Documentation/rfkill.txt.
-
-What:		/sys/class/rfkill/rfkill[0-9]+/claim
-Date:		09-Jul-2007
-KernelVersion	v2.6.22
-Contact:	linux-wireless@vger.kernel.org
-Description:	This file was deprecated because there no longer was a way to
-		claim just control over a single rfkill instance.
-		This file was scheduled to be removed in 2012, and was removed
-		in 2016.
-Values: 	0: Kernel handles events
--- a/Documentation/ABI/stable/firewire-cdev
+++ b/Documentation/ABI/stable/firewire-cdev
@@ -100,5 +100,4 @@ Description:

 Users:		libraw1394
 		libdc1394
-		libhinawa
-		tools like linux-firewire-utils, fwhack, ...
+		tools like jujuutils, fwhack, ...
--- a/Documentation/ABI/stable/sysfs-bus-vmbus
+++ b/Documentation/ABI/stable/sysfs-bus-vmbus
@@ -1,43 +0,0 @@
-What:		/sys/bus/vmbus/devices/vmbus_*/id
-Date:		Jul 2009
-KernelVersion:	2.6.31
-Contact:	K. Y. Srinivasan <kys@microsoft.com>
-Description:	The VMBus child_relid of the device's primary channel
-Users:		tools/hv/lsvmbus
-
-What:		/sys/bus/vmbus/devices/vmbus_*/class_id
-Date:		Jul 2009
-KernelVersion:	2.6.31
-Contact:	K. Y. Srinivasan <kys@microsoft.com>
-Description:	The VMBus interface type GUID of the device
-Users:		tools/hv/lsvmbus
-
-What:		/sys/bus/vmbus/devices/vmbus_*/device_id
-Date:		Jul 2009
-KernelVersion:	2.6.31
-Contact:	K. Y. Srinivasan <kys@microsoft.com>
-Description:	The VMBus interface instance GUID of the device
-Users:		tools/hv/lsvmbus
-
-What:		/sys/bus/vmbus/devices/vmbus_*/channel_vp_mapping
-Date:		Jul 2015
-KernelVersion:	4.2.0
-Contact:	K. Y. Srinivasan <kys@microsoft.com>
-Description:	The mapping of which primary/sub channels are bound to which
-		Virtual Processors.
-		Format: <channel's child_relid:the bound cpu's number>
-Users:		tools/hv/lsvmbus
-
-What:		/sys/bus/vmbus/devices/vmbus_*/device
-Date:		Dec. 2015
-KernelVersion:	4.5
-Contact:	K. Y. Srinivasan <kys@microsoft.com>
-Description:	The 16 bit device ID of the device
-Users:		tools/hv/lsvmbus and user level RDMA libraries
-
-What:		/sys/bus/vmbus/devices/vmbus_*/vendor
-Date:		Dec. 2015
-KernelVersion:	4.5
-Contact:	K. Y. Srinivasan <kys@microsoft.com>
-Description:	The 16 bit vendor ID of the device
-Users:		tools/hv/lsvmbus and user level RDMA libraries
--- a/Documentation/ABI/stable/sysfs-bus-w1
+++ b/Documentation/ABI/stable/sysfs-bus-w1
@@ -1,11 +0,0 @@
-What:		/sys/bus/w1/devices/.../w1_master_timeout_us
-Date:		April 2015
-Contact:	Dmitry Khromov <dk@icelogic.net>
-Description:	Bus scanning interval, microseconds component.
-		Some of 1-Wire devices commonly associated with physical access
-		control systems are attached/generate presence for as short as
-		100 ms - hence the tens-to-hundreds milliseconds scan intervals
-		are required.
-		see Documentation/w1/w1.generic for detailed information.
-Users:		any user space application which wants to know bus scanning
-		interval
--- a/Documentation/ABI/stable/sysfs-class-rfkill
+++ b/Documentation/ABI/stable/sysfs-class-rfkill
@@ -2,8 +2,9 @@ rfkill - radio frequency (RF) connector kill switch support

 For details to this subsystem look at Documentation/rfkill.txt.

-For the deprecated /sys/class/rfkill/*/claim knobs of this interface look in
-Documentation/ABI/removed/sysfs-class-rfkill.
+For the deprecated /sys/class/rfkill/*/state and
+/sys/class/rfkill/*/claim knobs of this interface look in
+Documentation/ABI/obsolete/sysfs-class-rfkill.

 What: 		/sys/class/rfkill
 Date:		09-Jul-2007
@@ -41,28 +42,6 @@ Values: 	A numeric value.
 		1: true


-What:		/sys/class/rfkill/rfkill[0-9]+/state
-Date:		09-Jul-2007
-KernelVersion	v2.6.22
-Contact:	linux-wireless@vger.kernel.org
-Description: 	Current state of the transmitter.
-		This file was scheduled to be removed in 2014, but due to its
-		large number of users it will be sticking around for a bit
-		longer. Despite it being marked as stabe, the newer "hard" and
-		"soft" interfaces should be preffered, since it is not possible
-		to express the 'soft and hard block' state of the rfkill driver
-		through this interface. There will likely be another attempt to
-		remove it in the future.
-Values: 	A numeric value.
-		0: RFKILL_STATE_SOFT_BLOCKED
-			transmitter is turned off by software
-		1: RFKILL_STATE_UNBLOCKED
-			transmitter is (potentially) active
-		2: RFKILL_STATE_HARD_BLOCKED
-			transmitter is forced off by something outside of
-			the driver's control.
-
-
 What:		/sys/class/rfkill/rfkill[0-9]+/hard
 Date:		12-March-2010
 KernelVersion	v2.6.34
--- a/Documentation/ABI/stable/sysfs-class-tpm
+++ b/Documentation/ABI/stable/sysfs-class-tpm
@@ -116,7 +116,7 @@ Description:	The "pubek" property will return the TPM's public endorsement
 		owner's authorization. Since the TPM driver doesn't store any
 		secrets, it can't authorize its own request for the pubek,
 		making it unaccessible. The public endorsement key is gener-
-		ated at TPM manufacture time and exists for the life of the
+		ated at TPM menufacture time and exists for the life of the
 		chip.

 		Example output:
@@ -163,7 +163,7 @@ Date:		April 2006
 KernelVersion:	2.6.17
 Contact:	tpmdd-devel@lists.sf.net
 Description:	The "temp_deactivated" property returns a '1' if the chip has
-		been temporarily deactivated, usually until the next power
+		been temporarily dectivated, usually until the next power
 		cycle. Whether a warm boot (reboot) will clear a TPM chip
 		from a temp_deactivated state is platform specific.

--- a/Documentation/ABI/stable/sysfs-class-ubi
+++ b/Documentation/ABI/stable/sysfs-class-ubi
@@ -107,15 +107,6 @@ Contact:	Artem Bityutskiy <dedekind@infradead.org>
 Description:
 		Number of physical eraseblocks reserved for bad block handling.

-What:		/sys/class/ubi/ubiX/ro_mode
-Date:		April 2016
-KernelVersion:	4.7
-Contact:	linux-mtd@lists.infradead.org
-Description:
-		Contains ASCII "1\n" if the read-only flag is set on this
-		device, and "0\n" if it is cleared. UBI devices mark themselves
-		as read-only when they detect an unrecoverable error.
-
 What:		/sys/class/ubi/ubiX/total_eraseblocks
 Date:		July 2006
 KernelVersion:	2.6.22
--- a/Documentation/ABI/stable/sysfs-devices
+++ b/Documentation/ABI/stable/sysfs-devices
@@ -1,10 +0,0 @@
-# Note: This documents additional properties of any device beyond what
-# is documented in Documentation/sysfs-rules.txt
-
-What:		/sys/devices/*/of_node
-Date:		February 2015
-Contact:	Device Tree mailing list <devicetree@vger.kernel.org>
-Description:
-		Any device associated with a device-tree node will have
-		an of_path symlink pointing to the corresponding device
-		node in /sys/firmware/devicetree/
--- a/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00
+++ b/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00
@@ -1,6 +0,0 @@
-What:		/sys/bus/w1/devices/.../w1_seq
-Date:		Apr 2015
-Contact:	Matt Campbell <mattrcampbell@gmail.com>
-Description:	Support for the DS28EA00 chain sequence function
-		see Documentation/w1/slaves/w1_therm for detailed information
-Users:		any user space application which wants to communicate with DS28EA00
--- a/Documentation/ABI/stable/sysfs-firmware-opal-elog
+++ b/Documentation/ABI/stable/sysfs-firmware-opal-elog
@@ -57,4 +57,4 @@ Description:
 				Shortly after acknowledging it, the log
 				entry will be removed from sysfs.
 				Reading this file will list the supported
-				operations (currently just acknowledge).
+				operations (curently just acknowledge).
--- a/Documentation/ABI/stable/sysfs-fs-orangefs
+++ b/Documentation/ABI/stable/sysfs-fs-orangefs
@@ -1,87 +0,0 @@
-What:			/sys/fs/orangefs/perf_counters/*
-Date:			Jun 2015
-Contact:		Mike Marshall <hubcap@omnibond.com>
-Description:
-			Counters and settings for various caches.
-			Read only.
-
-
-What:			/sys/fs/orangefs/perf_counter_reset
-Date:			June 2015
-Contact:		Mike Marshall <hubcap@omnibond.com>
-Description:
-			echo a 0 or a 1 into perf_counter_reset to
-			reset all the counters in
-			/sys/fs/orangefs/perf_counters
-			except ones with PINT_PERF_PRESERVE set.
-
-
-What:			/sys/fs/orangefs/perf_time_interval_secs
-Date:			Jun 2015
-Contact:		Mike Marshall <hubcap@omnibond.com>
-Description:
-			Length of perf counter intervals in
-			seconds.
-
-
-What:			/sys/fs/orangefs/perf_history_size
-Date:			Jun 2015
-Contact:		Mike Marshall <hubcap@omnibond.com>
-Description:
-			The perf_counters cache statistics have N, or
-			perf_history_size, samples. The default is
-			one.
-
-			Every perf_time_interval_secs the (first)
-			samples are reset.
-
-			If N is greater than one, the "current" set
-			of samples is reset, and the samples from the
-			other N-1 intervals remain available.
-
-
-What:			/sys/fs/orangefs/op_timeout_secs
-Date:			Jun 2015
-Contact:		Mike Marshall <hubcap@omnibond.com>
-Description:
-			Service operation timeout in seconds.
-
-
-What:			/sys/fs/orangefs/slot_timeout_secs
-Date:			Jun 2015
-Contact:		Mike Marshall <hubcap@omnibond.com>
-Description:
-			"Slot" timeout in seconds. A "slot"
-			is an indexed buffer in the shared
-			memory segment used for communication
-			between the kernel module and userspace.
-			Slots are requested and waited for,
-			the wait times out after slot_timeout_secs.
-
-
-What:			/sys/fs/orangefs/acache/*
-Date:			Jun 2015
-Contact:		Mike Marshall <hubcap@omnibond.com>
-Description:
-			Attribute cache configurable settings.
-
-
-What:			/sys/fs/orangefs/ncache/*
-Date:			Jun 2015
-Contact:		Mike Marshall <hubcap@omnibond.com>
-Description:
-			Name cache configurable settings.
-
-
-What:			/sys/fs/orangefs/capcache/*
-Date:			Jun 2015
-Contact:		Mike Marshall <hubcap@omnibond.com>
-Description:
-			Capability cache configurable settings.
-
-
-What:			/sys/fs/orangefs/ccache/*
-Date:			Jun 2015
-Contact:		Mike Marshall <hubcap@omnibond.com>
-Description:
-			Credential cache configurable settings.
--- a/Documentation/ABI/testing/configfs-acpi
+++ b/Documentation/ABI/testing/configfs-acpi
@@ -1,36 +0,0 @@
-What:		/config/acpi
-Date:		July 2016
-KernelVersion:	4.8
-Contact:	linux-acpi@vger.kernel.org
-Description:
-		This represents the ACPI subsystem entry point directory. It
-		contains sub-groups corresponding to ACPI configurable options.
-
-What:		/config/acpi/table
-Date:		July 2016
-KernelVersion:	4.8
-Description:
-
-		This group contains the configuration for user defined ACPI
-		tables. The attributes of a user define table are:
-
-		aml 		- a binary attribute that the user can use to
-				fill in the ACPI aml definitions. Once the aml
-				data is written to this file and the file is
-				closed the table will be loaded and ACPI devices
-				will be enumerated. To check if the operation is
-				successful the user must check the error code
-				for close(). If the operation is successful,
-				subsequent writes to this attribute will fail.
-
-		The rest of the attributes are read-only and are valid only
-		after the table has been loaded by filling the aml entry:
-
-		signature 	- ASCII table signature
-		length 		- length of table in bytes, including the header
-		revision 	- ACPI Specification minor version number
-		oem_id 		- ASCII OEM identification
-		oem_table_id 	- ASCII OEM table identification
-		oem_revision 	- OEM revision number
-		asl_compiler_id - ASCII ASL compiler vendor ID
-		asl_compiler_revision - ASL compiler version
--- a/Documentation/ABI/testing/configfs-iio
+++ b/Documentation/ABI/testing/configfs-iio
@@ -1,34 +0,0 @@
-What:		/config/iio
-Date:		October 2015
-KernelVersion:	4.4
-Contact:	linux-iio@vger.kernel.org
-Description:
-		This represents Industrial IO configuration entry point
-		directory. It contains sub-groups corresponding to IIO
-		objects.
-
-What:		/config/iio/triggers
-Date:		October 2015
-KernelVersion:	4.4
-Description:
-		Industrial IO software triggers directory.
-
-What:		/config/iio/triggers/hrtimers
-Date:		October 2015
-KernelVersion:	4.4
-Description:
-		High resolution timers directory. Creating a directory here
-		will result in creating a hrtimer trigger in the IIO subsystem.
-
-What:		/config/iio/devices
-Date:		April 2016
-KernelVersion:	4.7
-Description:
-		Industrial IO software devices directory.
-
-What:		/config/iio/devices/dummy
-Date:		April 2016
-KernelVersion:	4.7
-Description:
-		Dummy IIO devices directory. Creating a directory here will result
-		in creating a dummy IIO device in the IIO subystem.
--- a/Documentation/ABI/testing/configfs-rdma_cm
+++ b/Documentation/ABI/testing/configfs-rdma_cm
@@ -1,22 +0,0 @@
-What: 		/config/rdma_cm
-Date: 		November 29, 2015
-KernelVersion:  4.4.0
-Description: 	Interface is used to configure RDMA-cable HCAs in respect to
-		RDMA-CM attributes.
-
-		Attributes are visible only when configfs is mounted. To mount
-		configfs in /config directory use:
-		# mount -t configfs none /config/
-
-		In order to set parameters related to a specific HCA, a directory
-		for this HCA has to be created:
-		mkdir -p /config/rdma_cm/<hca>
-
-
-What: 		/config/rdma_cm/<hca>/ports/<port-num>/default_roce_mode
-Date: 		November 29, 2015
-KernelVersion:  4.4.0
-Description: 	RDMA-CM based connections from HCA <hca> at port <port-num>
-		will be initiated with this RoCE type as default.
-		The possible RoCE types are either "IB/RoCE v1" or "RoCE v2".
-		This parameter has RW access.
--- a/Documentation/ABI/testing/configfs-spear-pcie-gadget
+++ b/Documentation/ABI/testing/configfs-spear-pcie-gadget
@@ -1,7 +1,7 @@
 What:		/config/pcie-gadget
 Date:		Feb 2011
 KernelVersion:	2.6.37
-Contact:	Pratyush Anand <pratyush.anand@gmail.com>
+Contact:	Pratyush Anand <pratyush.anand@st.com>
 Description:

 	Interface is used to configure selected dual mode PCIe controller
--- a/Documentation/ABI/testing/configfs-stp-policy
+++ b/Documentation/ABI/testing/configfs-stp-policy
@@ -1,48 +0,0 @@
-What:		/config/stp-policy
-Date:		June 2015
-KernelVersion:	4.3
-Description:
-		This group contains policies mandating Master/Channel allocation
-		for software sources wishing to send trace data over an STM
-		device.
-
-What:		/config/stp-policy/<device>.<policy>
-Date:		June 2015
-KernelVersion:	4.3
-Description:
-		This group is the root of a policy; its name is a concatenation
-		of an stm device name to which this policy applies and an
-		arbitrary string. If <device> part doesn't match an existing
-		stm device, mkdir will fail with ENODEV; if that device already
-		has a policy assigned to it, mkdir will fail with EBUSY.
-
-What:		/config/stp-policy/<device>.<policy>/device
-Date:		June 2015
-KernelVersion:	4.3
-Description:
-		STM device to which this policy applies, read only. Same as the
-		<device> component of its parent directory.
-
-What:		/config/stp-policy/<device>.<policy>/<node>
-Date:		June 2015
-KernelVersion:	4.3
-Description:
-		Policy node is a string identifier that software clients will
-		use to request a master/channel to be allocated and assigned to
-		them.
-
-What:		/config/stp-policy/<device>.<policy>/<node>/masters
-Date:		June 2015
-KernelVersion:	4.3
-Description:
-		Range of masters from which to allocate for users of this node.
-		Write two numbers: the first master and the last master number.
-
-What:		/config/stp-policy/<device>.<policy>/<node>/channels
-Date:		June 2015
-KernelVersion:	4.3
-Description:
-		Range of channels from which to allocate for users of this node.
-		Write two numbers: the first channel and the last channel
-		number.
-
--- a/Documentation/ABI/testing/configfs-usb-gadget-loopback
+++ b/Documentation/ABI/testing/configfs-usb-gadget-loopback
@@ -5,4 +5,4 @@ Description:
 		The attributes:

 		qlen		- depth of loopback queue
-		buflen		- buffer length
+		bulk_buflen	- buffer length
--- a/Documentation/ABI/testing/configfs-usb-gadget-printer
+++ b/Documentation/ABI/testing/configfs-usb-gadget-printer
@@ -1,9 +0,0 @@
-What:		/config/usb-gadget/gadget/functions/printer.name
-Date:		Apr 2015
-KernelVersion:	4.1
-Description:
-		The attributes:
-
-		pnp_string	- Data to be passed to the host in pnp string
-		q_len		- Number of requests per endpoint
-
--- a/Documentation/ABI/testing/configfs-usb-gadget-sourcesink
+++ b/Documentation/ABI/testing/configfs-usb-gadget-sourcesink
@@ -9,6 +9,4 @@ Description:
 		isoc_maxpacket	- 0 - 1023 (fs), 0 - 1024 (hs/ss)
 		isoc_mult	- 0..2 (hs/ss only)
 		isoc_maxburst	- 0..15 (ss only)
-		buflen		- buffer length
-		bulk_qlen	- depth of queue for bulk
-		iso_qlen	- depth of queue for iso
+		qlen		- buffer length
--- a/Documentation/ABI/testing/configfs-usb-gadget-tcm
+++ b/Documentation/ABI/testing/configfs-usb-gadget-tcm
@@ -1,6 +0,0 @@
-What:		/config/usb-gadget/gadget/functions/tcm.name
-Date:		Dec 2015
-KernelVersion:	4.5
-Description:
-		There are no attributes because all the configuration
-		is performed in the "target" subsystem of configfs.
--- a/Documentation/ABI/testing/configfs-usb-gadget-uvc
+++ b/Documentation/ABI/testing/configfs-usb-gadget-uvc
@@ -1,6 +1,6 @@
 What:		/config/usb-gadget/gadget/functions/uvc.name
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	UVC function directory

 		streaming_maxburst	- 0..15 (ss only)
@@ -9,37 +9,37 @@ Description:	UVC function directory

 What:		/config/usb-gadget/gadget/functions/uvc.name/control
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Control descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/class
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Class descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/class/ss
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Super speed control class descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/class/fs
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Full speed control class descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Terminal descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/output
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Output terminal descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/output/default
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Default output terminal descriptors

 		All attributes read only:
@@ -53,12 +53,12 @@ Description:	Default output terminal descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Camera terminal descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera/default
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Default camera terminal descriptors

 		All attributes read only:
@@ -75,12 +75,12 @@ Description:	Default camera terminal descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/processing
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Processing unit descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/processing/default
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Default processing unit descriptors

 		All attributes read only:
@@ -94,49 +94,49 @@ Description:	Default processing unit descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/header
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Control header descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/header/name
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Specific control header descriptors

 dwClockFrequency
 bcdUVC
 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Streaming descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Streaming class descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Super speed streaming class descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	High speed streaming class descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Full speed streaming class descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Color matching descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/default
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Default color matching descriptors

 		All attributes read only:
@@ -150,12 +150,12 @@ Description:	Default color matching descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	MJPEG format descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Specific MJPEG format descriptors

 		All attributes read only,
@@ -174,7 +174,7 @@ Description:	Specific MJPEG format descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Specific MJPEG frame descriptors

 		dwFrameInterval		- indicates how frame interval can be
@@ -196,12 +196,12 @@ Description:	Specific MJPEG frame descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Uncompressed format descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Specific uncompressed format descriptors

 		bmaControls		- this format's data for bmaControls in
@@ -221,7 +221,7 @@ Description:	Specific uncompressed format descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Specific uncompressed frame descriptors

 		dwFrameInterval		- indicates how frame interval can be
@@ -243,12 +243,12 @@ Description:	Specific uncompressed frame descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Streaming header descriptors

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header/name
 Date:		Dec 2014
-KernelVersion:	4.0
+KernelVersion:	3.20
 Description:	Specific streaming header descriptors

 		All attributes read only:
--- a/Documentation/ABI/testing/dev-kmsg
+++ b/Documentation/ABI/testing/dev-kmsg
@@ -98,13 +98,4 @@ Description:	The /dev/kmsg character device node provides userspace access
 		logic is used internally when messages are printed to the
 		console, /proc/kmsg or the syslog() syscall.

-		By default, kernel tries to avoid fragments by concatenating
-		when it can and fragments are rare; however, when extended
-		console support is enabled, the in-kernel concatenation is
-		disabled and /dev/kmsg output will contain more fragments. If
-		the log consumer performs concatenation, the end result
-		should be the same. In the future, the in-kernel concatenation
-		may be removed entirely and /dev/kmsg users are recommended to
-		implement fragment handling.
-
 Users:		dmesg(1), userspace kernel log consumers
--- a/Documentation/ABI/testing/gpio-cdev
+++ b/Documentation/ABI/testing/gpio-cdev
@@ -1,26 +0,0 @@
-What:		/dev/gpiochip[0-9]+
-Date:		November 2015
-KernelVersion:	4.4
-Contact:	linux-gpio@vger.kernel.org
-Description:
-		The character device files /dev/gpiochip* are the interface
-		between GPIO chips and userspace.
-
-		The ioctl(2)-based ABI is defined and documented in
-		[include/uapi]<linux/gpio.h>.
-
-		The following file operations are supported:
-
-		open(2)
-		Currently the only useful flags are O_RDWR.
-
-		ioctl(2)
-		Initiate various actions.
-		See the inline documentation in [include/uapi]<linux/gpio.h>
-		for descriptions of all ioctls.
-
-		close(2)
-		Stops and free up the I/O contexts that was associated
-		with the file descriptor.
-
-Users:		TBD
--- a/Documentation/ABI/testing/ima_policy
+++ b/Documentation/ABI/testing/ima_policy
@@ -20,20 +20,17 @@ Description:
 		action: measure | dont_measure | appraise | dont_appraise | audit
 		condition:= base | lsm  [option]
 			base:	[[func=] [mask=] [fsmagic=] [fsuuid=] [uid=]
-				[euid=] [fowner=]]
+				 [fowner]]
 			lsm:	[[subj_user=] [subj_role=] [subj_type=]
 				 [obj_user=] [obj_role=] [obj_type=]]
 			option:	[[appraise_type=]] [permit_directio]

 		base: 	func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]
 				[FIRMWARE_CHECK]
-				[KEXEC_KERNEL_CHECK] [KEXEC_INITRAMFS_CHECK]
-			mask:= [[^]MAY_READ] [[^]MAY_WRITE] [[^]MAY_APPEND]
-			       [[^]MAY_EXEC]
+			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
 			fsmagic:= hex value
 			fsuuid:= file system UUID (e.g 8bcbe394-4f13-4144-be8e-5aa9ea2ce2f6)
 			uid:= decimal value
-			euid:= decimal value
 			fowner:=decimal value
 		lsm:  	are LSM specific
 		option:	appraise_type:= [imasig]
@@ -52,25 +49,11 @@ Description:
 			dont_measure fsmagic=0x01021994
 			dont_appraise fsmagic=0x01021994
 			# RAMFS_MAGIC
+			dont_measure fsmagic=0x858458f6
 			dont_appraise fsmagic=0x858458f6
-			# DEVPTS_SUPER_MAGIC
-			dont_measure fsmagic=0x1cd1
-			dont_appraise fsmagic=0x1cd1
-			# BINFMTFS_MAGIC
-			dont_measure fsmagic=0x42494e4d
-			dont_appraise fsmagic=0x42494e4d
 			# SECURITYFS_MAGIC
 			dont_measure fsmagic=0x73636673
 			dont_appraise fsmagic=0x73636673
-			# SELINUX_MAGIC
-			dont_measure fsmagic=0xf97cff8c
-			dont_appraise fsmagic=0xf97cff8c
-			# CGROUP_SUPER_MAGIC
-			dont_measure fsmagic=0x27e0eb
-			dont_appraise fsmagic=0x27e0eb
-			# NSFS_MAGIC
-			dont_measure fsmagic=0x6e736673
-			dont_appraise fsmagic=0x6e736673

 			measure func=BPRM_CHECK
 			measure func=FILE_MMAP mask=MAY_EXEC
@@ -87,6 +70,10 @@ Description:
 		Examples of LSM specific definitions:

 		SELinux:
+			# SELINUX_MAGIC
+			dont_measure fsmagic=0xf97cff8c
+			dont_appraise fsmagic=0xf97cff8c
+
 			dont_measure obj_type=var_log_t
 			dont_appraise obj_type=var_log_t
 			dont_measure obj_type=auditd_log_t
--- a/Documentation/ABI/testing/sysfs-ata
+++ b/Documentation/ABI/testing/sysfs-ata
@@ -90,17 +90,6 @@ gscr
 	130:	SATA_PMP_GSCR_SII_GPIO
 	Only valid if the device is a PM.

-trim
-
-	Shows the DSM TRIM mode currently used by the device. Valid
-	values are:
-	unsupported:		Drive does not support DSM TRIM
-	unqueued:		Drive supports unqueued DSM TRIM only
-	queued:			Drive supports queued DSM TRIM
-	forced_unqueued:	Drive's queued DSM support is known to be
-				buggy and only unqueued TRIM commands
-				are sent
-
 spdn_cnt

 	Number of time libata decided to lower the speed of link due to errors.
--- a/Documentation/ABI/testing/sysfs-block
+++ b/Documentation/ABI/testing/sysfs-block
@@ -60,13 +60,6 @@ Description:
 		Indicates whether a storage device is capable of storing
 		integrity metadata. Set if the device is T10 PI-capable.

-What:		/sys/block/<disk>/integrity/protection_interval_bytes
-Date:		July 2015
-Contact:	Martin K. Petersen <martin.petersen@oracle.com>
-Description:
-		Describes the number of data bytes which are protected
-		by one integrity tuple. Typically the device's logical
-		block size.

 What:		/sys/block/<disk>/integrity/write_generate
 Date:		June 2008
--- a/Documentation/ABI/testing/sysfs-block-dm
+++ b/Documentation/ABI/testing/sysfs-block-dm
@@ -23,25 +23,3 @@ Description:	Device-mapper device suspend state.
 		Contains the value 1 while the device is suspended.
 		Otherwise it contains 0. Read-only attribute.
 Users:		util-linux, device-mapper udev rules
-
-What:		/sys/block/dm-<num>/dm/rq_based_seq_io_merge_deadline
-Date:		March 2015
-KernelVersion:	4.1
-Contact:	dm-devel@redhat.com
-Description:	Allow control over how long a request that is a
-		reasonable merge candidate can be queued on the request
-		queue.  The resolution of this deadline is in
-		microseconds (ranging from 1 to 100000 usecs).
-		Setting this attribute to 0 (the default) will disable
-		request-based DM's merge heuristic and associated extra
-		accounting.  This attribute is not applicable to
-		bio-based DM devices so it will only ever report 0 for
-		them.
-
-What:		/sys/block/dm-<num>/dm/use_blk_mq
-Date:		March 2015
-KernelVersion:	4.1
-Contact:	dm-devel@redhat.com
-Description:	Request-based Device-mapper blk-mq I/O path mode.
-		Contains the value 1 if the device is using blk-mq.
-		Otherwise it contains 0. Read-only attribute.
--- a/Documentation/ABI/testing/sysfs-block-zram
+++ b/Documentation/ABI/testing/sysfs-block-zram
@@ -141,37 +141,3 @@ Description:
 		amount of memory ZRAM can use to store the compressed data.  The
 		limit could be changed in run time and "0" means disable the
 		limit.  No limit is the initial state.  Unit: bytes
-
-What:		/sys/block/zram<id>/compact
-Date:		August 2015
-Contact:	Minchan Kim <minchan@kernel.org>
-Description:
-		The compact file is write-only and trigger compaction for
-		allocator zrm uses. The allocator moves some objects so that
-		it could free fragment space.
-
-What:		/sys/block/zram<id>/io_stat
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The io_stat file is read-only and accumulates device's I/O
-		statistics not accounted by block layer. For example,
-		failed_reads, failed_writes, etc. File format is similar to
-		block layer statistics file format.
-
-What:		/sys/block/zram<id>/mm_stat
-Date:		August 2015
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The mm_stat file is read-only and represents device's mm
-		statistics (orig_data_size, compr_data_size, etc.) in a format
-		similar to block layer statistics file format.
-
-What:		/sys/block/zram<id>/debug_stat
-Date:		July 2016
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The debug_stat file is read-only and represents various
-		device's debugging info useful for kernel developers. Its
-		format is not documented intentionally and may change
-		anytime without any notice.
--- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-etb10
+++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etb10
@@ -6,6 +6,13 @@ Description:	(RW) Add/remove a sink from a trace path.  There can be multiple
 		source for a single sink.
 		ex: echo 1 > /sys/bus/coresight/devices/20010000.etb/enable_sink

+What:		/sys/bus/coresight/devices/<memory_map>.etb/status
+Date:		November 2014
+KernelVersion:	3.19
+Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
+Description:	(R) List various control and status registers.  The specific
+		layout and content is driver specific.
+
 What:		/sys/bus/coresight/devices/<memory_map>.etb/trigger_cntr
 Date:		November 2014
 KernelVersion:	3.19
@@ -15,65 +22,3 @@ Description:	(RW) Disables write access to the Trace RAM by stopping the
 		following the trigger event. The number of 32-bit words written
 		into the Trace RAM following the trigger event is equal to the
 		value stored in this register+1 (from ARM ETB-TRM).
-
-What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/rdp
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Defines the depth, in words, of the trace RAM in powers of
-		2.  The value is read directly from HW register RDP, 0x004.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/sts
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the ETB status register.  The value
-		is read directly from HW register STS, 0x00C.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/rrp
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the ETB RAM Read Pointer register
-		that is used to read entries from the Trace RAM over the APB
-		interface.  The value is read directly from HW register RRP,
-		0x014.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/rwp
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the ETB RAM Write Pointer register
-		that is used to sets the write pointer to write entries from
-		the CoreSight bus into the Trace RAM. The value is read directly
-		from HW register RWP, 0x018.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/trg
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Similar to "trigger_cntr" above except that this value is
-		read directly from HW register TRG, 0x01C.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/ctl
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the ETB Control register. The value
-		is read directly from HW register CTL, 0x020.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/ffsr
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the ETB Formatter and Flush Status
-		register.  The value is read directly from HW register FFSR,
-		0x300.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/ffcr
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the ETB Formatter and Flush Control
-		register.  The value is read directly from HW register FFCR,
-		0x304.
--- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x
+++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x
@@ -8,6 +8,13 @@ Description:	(RW) Enable/disable tracing on this specific trace entiry.
 		of coresight components linking the source to the sink is
 		configured and managed automatically by the coresight framework.

+What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/status
+Date:		November 2014
+KernelVersion:	3.19
+Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
+Description:	(R) List various control and status registers.  The specific
+		layout and content is driver specific.
+
 What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/addr_idx
 Date:		November 2014
 KernelVersion:	3.19
@@ -105,7 +112,7 @@ KernelVersion:	3.19
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Mask to apply to all the context ID comparator.

-What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/ctxid_pid
+What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/ctxid_val
 Date:		November 2014
 KernelVersion:	3.19
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
@@ -244,79 +251,3 @@ Date:		November 2014
 KernelVersion:	3.19
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Define the event that controls the trigger.
-
-What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/cpu
-Date:		October 2015
-KernelVersion:	4.4
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RO) Holds the cpu number this tracer is affined to.
-
-What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/mgmt/etmccr
-Date:		September 2015
-KernelVersion:	4.4
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RO) Print the content of the ETM Configuration Code register
-		(0x004).  The value is read directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/mgmt/etmccer
-Date:		September 2015
-KernelVersion:	4.4
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RO) Print the content of the ETM Configuration Code Extension
-		register (0x1e8).  The value is read directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/mgmt/etmscr
-Date:		September 2015
-KernelVersion:	4.4
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RO) Print the content of the ETM System Configuration
-		register (0x014).  The value is read directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/mgmt/etmidr
-Date:		September 2015
-KernelVersion:	4.4
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RO) Print the content of the ETM ID register (0x1e4).  The
-		value is read directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/mgmt/etmcr
-Date:		September 2015
-KernelVersion:	4.4
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RO) Print the content of the ETM Main Control register (0x000).
-		The value is read directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/mgmt/etmtraceidr
-Date:		September 2015
-KernelVersion:	4.4
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RO) Print the content of the ETM Trace ID register (0x200).
-		The value is read directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/mgmt/etmteevr
-Date:		September 2015
-KernelVersion:	4.4
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RO) Print the content of the ETM Trace Enable Event register
-		(0x020). The value is read directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/mgmt/etmtsscr
-Date:		September 2015
-KernelVersion:	4.4
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RO) Print the content of the ETM Trace Start/Stop Conrol
-		register (0x018). The value is read directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/mgmt/etmtecr1
-Date:		September 2015
-KernelVersion:	4.4
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RO) Print the content of the ETM Enable Conrol #1
-		register (0x024). The value is read directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/mgmt/etmtecr2
-Date:		September 2015
-KernelVersion:	4.4
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RO) Print the content of the ETM Enable Conrol #2
-		register (0x01c). The value is read directly from the HW.
--- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x
+++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x
@@ -1,463 +0,0 @@
-What:		/sys/bus/coresight/devices/<memory_map>.etm/enable_source
-Date:		April 2015
-KernelVersion:  4.01
-Contact:        Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Enable/disable tracing on this specific trace entiry.
-		Enabling a source implies the source has been configured
-		properly and a sink has been identidifed for it.  The path
-		of coresight components linking the source to the sink is
-		configured and managed automatically by the coresight framework.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/cpu
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) The CPU this tracing entity is associated with.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_pe_cmp
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Indicates the number of PE comparator inputs that are
-		available for tracing.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_addr_cmp
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Indicates the number of address comparator pairs that are
-		available for tracing.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_cntr
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Indicates the number of counters that are available for
-		tracing.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_ext_inp
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Indicates how many external inputs are implemented.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/numcidc
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Indicates the number of Context ID comparators that are
-		available for tracing.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/numvmidc
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Indicates the number of VMID comparators that are available
-		for tracing.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/nrseqstate
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Indicates the number of sequencer states that are
-		implemented.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_resource
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Indicates the number of resource selection pairs that are
-		available for tracing.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_ss_cmp
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Indicates the number of single-shot comparator controls that
-		are available for tracing.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/reset
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(W) Cancels all configuration on a trace unit and set it back
-		to its boot configuration.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mode
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Controls various modes supported by this ETM, for example
-		P0 instruction tracing, branch broadcast, cycle counting and
-		context ID tracing.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/pe
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Controls which PE to trace.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/event
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Controls the tracing of arbitrary events from bank 0 to 3.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/event_instren
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Controls the behavior of the events in bank 0 to 3.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/event_ts
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Controls the insertion of global timestamps in the trace
-		streams.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/syncfreq
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Controls how often trace synchronization requests occur.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/cyc_threshold
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Sets the threshold value for cycle counting.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/bb_ctrl
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Controls which regions in the memory map are enabled to
-		use branch broadcasting.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/event_vinst
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Controls instruction trace filtering.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/s_exlevel_vinst
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) In Secure state, each bit controls whether instruction
-		tracing is enabled for the corresponding exception level.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/ns_exlevel_vinst
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) In non-secure state, each bit controls whether instruction
-		tracing is enabled for the corresponding exception level.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/addr_idx
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Select which address comparator or pair (of comparators) to
-		work with.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/addr_instdatatype
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Controls what type of comparison the trace unit performs.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/addr_single
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Used to setup single address comparator values.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/addr_range
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Used to setup address range comparator values.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/seq_idx
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Select which sequensor.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/seq_state
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Use this to set, or read, the sequencer state.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/seq_event
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Moves the sequencer state to a specific state.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/seq_reset_event
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Moves the sequencer to state 0 when a programmed event
-		occurs.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/cntr_idx
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Select which counter unit to work with.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/cntrldvr
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) This sets or returns the reload count value of the
-		specific counter.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/cntr_val
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) This sets or returns the current count value of the
-                specific counter.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/cntr_ctrl
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Controls the operation of the selected counter.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/res_idx
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Select which resource selection unit to work with.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/res_ctrl
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(RW) Controls the selection of the resources in the trace unit.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/ctxid_idx
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Select which context ID comparator to work with.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/ctxid_pid
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Get/Set the context ID comparator value to trigger on.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/ctxid_masks
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Mask for all 8 context ID comparator value
-		registers (if implemented).
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/vmid_idx
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Select which virtual machine ID comparator to work with.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/vmid_val
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Get/Set the virtual machine ID comparator value to
-		trigger on.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/vmid_masks
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Mask for all 8 virtual machine ID comparator value
-		registers (if implemented).
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcoslsr
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the OS Lock Status Register (0x304).
-		The value it taken directly  from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpdcr
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the Power Down Control Register
-		(0x310).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpdsr
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the Power Down Status Register
-		(0x314).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trclsr
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the SW Lock Status Register
-		(0xFB4).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcauthstatus
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the Authentication Status Register
-		(0xFB8).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcdevid
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the Device ID Register
-		(0xFC8).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcdevtype
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the Device Type Register
-		(0xFCC).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpidr0
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the Peripheral ID0 Register
-		(0xFE0).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpidr1
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the Peripheral ID1 Register
-		(0xFE4).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpidr2
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the Peripheral ID2 Register
-		(0xFE8).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpidr3
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the Peripheral ID3 Register
-		(0xFEC).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcconfig
-Date:		February 2016
-KernelVersion:	4.07
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the trace configuration register
-		(0x010) as currently set by SW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trctraceid
-Date:		February 2016
-KernelVersion:	4.07
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Print the content of the trace ID register (0x040).
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr0
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Returns the tracing capabilities of the trace unit (0x1E0).
-		The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr1
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Returns the tracing capabilities of the trace unit (0x1E4).
-		The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr2
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Returns the maximum size of the data value, data address,
-		VMID, context ID and instuction address in the trace unit
-		(0x1E8).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr3
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Returns the value associated with various resources
-		available to the trace unit.  See the Trace Macrocell
-		architecture specification for more details (0x1E8).
-		The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr4
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Returns how many resources the trace unit supports (0x1F0).
-		The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr5
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Returns how many resources the trace unit supports (0x1F4).
-		The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr8
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Returns the maximum speculation depth of the instruction
-		trace stream. (0x180).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr9
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Returns the number of P0 right-hand keys that the trace unit
-		can use (0x184).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr10
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Returns the number of P1 right-hand keys that the trace unit
-		can use (0x188).  The value is taken directly from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr11
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Returns the number of special P1 right-hand keys that the
-		trace unit can use (0x18C).  The value is taken directly from
-		the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr12
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Returns the number of conditional P1 right-hand keys that
-		the trace unit can use (0x190).  The value is taken directly
-		from the HW.
-
-What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr13
-Date:		April 2015
-KernelVersion:	4.01
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Returns the number of special conditional P1 right-hand keys
-		that the trace unit can use (0x194).  The value is taken
-		directly from the HW.
--- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-stm
+++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-stm
@@ -1,53 +0,0 @@
-What:		/sys/bus/coresight/devices/<memory_map>.stm/enable_source
-Date:		April 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Enable/disable tracing on this specific trace macrocell.
-		Enabling the trace macrocell implies it has been configured
-		properly and a sink has been identified for it.  The path
-		of coresight components linking the source to the sink is
-		configured and managed automatically by the coresight framework.
-
-What:		/sys/bus/coresight/devices/<memory_map>.stm/hwevent_enable
-Date:		April 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Provides access to the HW event enable register, used in
-		conjunction with HW event bank select register.
-
-What:		/sys/bus/coresight/devices/<memory_map>.stm/hwevent_select
-Date:		April 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Gives access to the HW event block select register
-		(STMHEBSR) in order to configure up to 256 channels.  Used in
-		conjunction with "hwevent_enable" register as described above.
-
-What:		/sys/bus/coresight/devices/<memory_map>.stm/port_enable
-Date:		April 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Provides access to the stimulus port enable register
-		(STMSPER).  Used in conjunction with "port_select" described
-		below.
-
-What:		/sys/bus/coresight/devices/<memory_map>.stm/port_select
-Date:		April 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Used to determine which bank of stimulus port bit in
-		register STMSPER (see above) apply to.
-
-What:		/sys/bus/coresight/devices/<memory_map>.stm/status
-Date:		April 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) List various control and status registers.  The specific
-		layout and content is driver specific.
-
-What:		/sys/bus/coresight/devices/<memory_map>.stm/traceid
-Date:		April 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Holds the trace ID that will appear in the trace stream
-		coming from this trace entity.
--- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-tmc
+++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-tmc
@@ -6,80 +6,3 @@ Description:	(RW) Disables write access to the Trace RAM by stopping the
 		formatter after a defined number of words have been stored
 		following the trigger event. Additional interface for this
 		driver are expected to be added as it matures.
-
-What:           /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/rsz
-Date:           March 2016
-KernelVersion:  4.7
-Contact:        Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:    (R) Defines the size, in 32-bit words, of the local RAM buffer.
-                The value is read directly from HW register RSZ, 0x004.
-
-What:           /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/sts
-Date:           March 2016
-KernelVersion:  4.7
-Contact:        Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the TMC status register.  The value
-                is read directly from HW register STS, 0x00C.
-
-What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/rrp
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the TMC RAM Read Pointer register
-		that is used to read entries from the Trace RAM over the APB
-		interface.  The value is read directly from HW register RRP,
-		0x014.
-
-What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/rwp
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the TMC RAM Write Pointer register
-		that is used to sets the write pointer to write entries from
-		the CoreSight bus into the Trace RAM. The value is read directly
-		from HW register RWP, 0x018.
-
-What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/trg
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Similar to "trigger_cntr" above except that this value is
-		read directly from HW register TRG, 0x01C.
-
-What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/ctl
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the TMC Control register. The value
-		is read directly from HW register CTL, 0x020.
-
-What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/ffsr
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the TMC Formatter and Flush Status
-		register.  The value is read directly from HW register FFSR,
-		0x300.
-
-What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/ffcr
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the TMC Formatter and Flush Control
-		register.  The value is read directly from HW register FFCR,
-		0x304.
-
-What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/mode
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Shows the value held by the TMC Mode register, which
-		indicate the mode the device has been configured to enact.  The
-		The value is read directly from the MODE register, 0x028.
-
-What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/devid
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(R) Indicates the capabilities of the Coresight TMC.
-		The value is read directly from the DEVID register, 0xFC8,
--- a/Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7
+++ b/Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7
@@ -4,7 +4,7 @@ Contact:	Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
 Description:
 		Provides access to the binary "24x7 catalog" provided by the
 		hypervisor on POWER7 and 8 systems. This catalog lists events
-		available from the powerpc "hv_24x7" pmu. Its format is
+		avaliable from the powerpc "hv_24x7" pmu. Its format is
 		documented here:
 		https://raw.githubusercontent.com/jmesmon/catalog-24x7/master/hv-24x7-catalog.h

--- a/Documentation/ABI/testing/sysfs-bus-fcoe
+++ b/Documentation/ABI/testing/sysfs-bus-fcoe
@@ -32,7 +32,7 @@ Description:	'FCoE Controller' instances on the fcoe bus.

 Attributes:

-	fcf_dev_loss_tmo: Device loss timeout period (see below). Changing
+	fcf_dev_loss_tmo: Device loss timeout peroid (see below). Changing
 			  this value will change the dev_loss_tmo for all
 			  FCFs discovered by this controller.

@@ -61,7 +61,7 @@ Attributes:
 	lesb/err_block:   Link Error Status Block (LESB) block error count.

 	lesb/fcs_error:   Link Error Status Block (LESB) Fibre Channel
-			  Services error count.
+			  Serivces error count.

 Notes: ctlr_X (global increment starting at 0)

@@ -85,7 +85,7 @@ Attributes:
 		     fabric.

 	selected:    1 indicates that the switch has been selected for use;
-		     0 indicates that the switch will not be used.
+		     0 indicates that the swich will not be used.

 	fc_map:      The Fibre Channel MAP

@@ -93,7 +93,7 @@ Attributes:

 	mac:         The FCF's MAC address

-	fka_period:  The FIP Keep-Alive period
+	fka_peroid:  The FIP Keep-Alive peroid

 	fabric_state: The internal kernel state
 		      "Unknown" - Initialization value
@@ -101,9 +101,9 @@ Attributes:
 		      "Connected" - Host is connected to the FCF
 		      "Deleted" - FCF is being removed from the system

-	dev_loss_tmo: The device loss timeout period for this FCF.
+	dev_loss_tmo: The device loss timeout peroid for this FCF.

-Notes: A device loss infrastructure similar to the FC Transport's
+Notes: A device loss infrastructre similar to the FC Transport's
       is present in fcoe_sysfs. It is nice to have so that a
       link flapping adapter doesn't continually advance the count
       used to identify the discovered FCF. FCFs will exist in a
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -32,13 +32,6 @@ Description:
 		Description of the physical chip / device for device X.
 		Typically a part number.

-What:		/sys/bus/iio/devices/iio:deviceX/timestamp_clock
-KernelVersion:	4.5
-Contact:	linux-iio@vger.kernel.org
-Description:
-		String identifying current posix clock used to timestamp
-		buffered samples and events for device X.
-
 What:		/sys/bus/iio/devices/iio:deviceX/sampling_frequency
 What:		/sys/bus/iio/devices/iio:deviceX/buffer/sampling_frequency
 What:		/sys/bus/iio/devices/triggerX/sampling_frequency
@@ -78,8 +71,6 @@ Description:

 What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_raw
 What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_raw
-What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_i_raw
-What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_q_raw
 KernelVersion:	2.6.35
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -90,11 +81,6 @@ Description:
 		unique to allow association with event codes. Units after
 		application of scale and offset are millivolts.

-		Channels with 'i' and 'q' modifiers always exist in pairs and both
-		channels refer to the same signal. The 'i' channel contains the in-phase
-		component of the signal while the 'q' channel contains the quadrature
-		component.
-
 What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY-voltageZ_raw
 KernelVersion:	2.6.35
 Contact:	linux-iio@vger.kernel.org
@@ -260,23 +246,13 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_accel_y_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_accel_z_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_offset
-What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_i_offset
-What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_q_offset
-What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_q_offset
-What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_i_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_currentY_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_current_offset
-What:		/sys/bus/iio/devices/iio:deviceX/in_currentY_i_offset
-What:		/sys/bus/iio/devices/iio:deviceX/in_currentY_q_offset
-What:		/sys/bus/iio/devices/iio:deviceX/in_current_q_offset
-What:		/sys/bus/iio/devices/iio:deviceX/in_current_i_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_tempY_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_temp_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_offset
 What:		/sys/bus/iio/devices/iio:deviceX/in_humidityrelative_offset
-What:		/sys/bus/iio/devices/iio:deviceX/in_magn_offset
-What:		/sys/bus/iio/devices/iio:deviceX/in_rot_offset
 KernelVersion:	2.6.35
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -295,22 +271,14 @@ Description:
 		to the _raw output.

 What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_scale
-What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_i_scale
-What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_q_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_scale
-What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_i_scale
-What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_q_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_voltage-voltage_scale
 What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_scale
 What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_currentY_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_currentY_supply_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_current_scale
-What:		/sys/bus/iio/devices/iio:deviceX/in_currentY_i_scale
-What:		/sys/bus/iio/devices/iio:deviceX/in_currentY_q_scale
-What:		/sys/bus/iio/devices/iio:deviceX/in_current_i_scale
-What:		/sys/bus/iio/devices/iio:deviceX/in_current_q_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_accel_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
@@ -328,7 +296,6 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_humidityrelative_scale
 What:		/sys/bus/iio/devices/iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_scale
-What:		/sys/bus/iio/devices/iio:deviceX/in_illuminance_scale
 KernelVersion:	2.6.35
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -358,10 +325,6 @@ Description:

 What		/sys/bus/iio/devices/iio:deviceX/in_voltageY_calibscale
 What		/sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_calibscale
-What		/sys/bus/iio/devices/iio:deviceX/in_voltageY_i_calibscale
-What		/sys/bus/iio/devices/iio:deviceX/in_voltageY_q_calibscale
-What		/sys/bus/iio/devices/iio:deviceX/in_voltage_i_calibscale
-What		/sys/bus/iio/devices/iio:deviceX/in_voltage_q_calibscale
 What		/sys/bus/iio/devices/iio:deviceX/in_voltage_calibscale
 What		/sys/bus/iio/devices/iio:deviceX/in_accel_x_calibscale
 What		/sys/bus/iio/devices/iio:deviceX/in_accel_y_calibscale
@@ -373,7 +336,6 @@ what		/sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibscale
 what		/sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale
 What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_calibscale
 What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_calibscale
-What:		/sys/bus/iio/devices/iio:deviceX/in_illuminance_calibscale
 KernelVersion:	2.6.35
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -385,7 +347,7 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_activity_calibgender
 What:		/sys/bus/iio/devices/iio:deviceX/in_energy_calibgender
 What:		/sys/bus/iio/devices/iio:deviceX/in_distance_calibgender
 What:		/sys/bus/iio/devices/iio:deviceX/in_velocity_calibgender
-KernelVersion:	4.0
+KernelVersion:	3.20
 Contact:	linux-iio@vger.kernel.org
 Description:
 		Gender of the user (e.g.: male, female) used by some pedometers
@@ -396,7 +358,7 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_activity_calibgender_available
 What:		/sys/bus/iio/devices/iio:deviceX/in_energy_calibgender_available
 What:		/sys/bus/iio/devices/iio:deviceX/in_distance_calibgender_available
 What:		/sys/bus/iio/devices/iio:deviceX/in_velocity_calibgender_available
-KernelVersion:	4.0
+KernelVersion:	3.20
 Contact:	linux-iio@vger.kernel.org
 Description:
 		Lists all available gender values (e.g.: male, female).
@@ -413,18 +375,13 @@ Description:
 		type.

 What:		/sys/bus/iio/devices/iio:deviceX/in_energy_calibweight
-KernelVersion:	4.0
+KernelVersion:	3.20
 Contact:	linux-iio@vger.kernel.org
 Description:
 		Weight of the user (in kg). It is needed by some pedometers
 		to compute the calories burnt by the user.

 What:		/sys/bus/iio/devices/iio:deviceX/in_accel_scale_available
-What:		/sys/.../iio:deviceX/in_anglvel_scale_available
-What:		/sys/.../iio:deviceX/in_magn_scale_available
-What:		/sys/.../iio:deviceX/in_illuminance_scale_available
-What:		/sys/.../iio:deviceX/in_intensity_scale_available
-What:		/sys/.../iio:deviceX/in_proximity_scale_available
 What:		/sys/.../iio:deviceX/in_voltageX_scale_available
 What:		/sys/.../iio:deviceX/in_voltage-voltage_scale_available
 What:		/sys/.../iio:deviceX/out_voltageX_scale_available
@@ -459,16 +416,6 @@ Description:
 		to the underlying data channel, then this parameter
 		gives the 3dB frequency of the filter in Hz.

-What:		/sys/.../in_accel_filter_high_pass_3db_frequency
-What:		/sys/.../in_anglvel_filter_high_pass_3db_frequency
-What:		/sys/.../in_magn_filter_high_pass_3db_frequency
-KernelVersion:	4.2
-Contact:	linux-iio@vger.kernel.org
-Description:
-		If a known or controllable high pass filter is applied
-		to the underlying data channel, then this parameter
-		gives the 3dB frequency of the filter in Hz.
-
 What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_raw
 What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_raw
 KernelVersion:	2.6.37
@@ -500,22 +447,19 @@ Contact:	linux-iio@vger.kernel.org
 Description:
 		Specifies the output powerdown mode.
 		DAC output stage is disconnected from the amplifier and
-		1kohm_to_gnd: connected to ground via an 1kOhm resistor,
+		1kohm_to_gnd: connected	to ground via an 1kOhm resistor,
 		6kohm_to_gnd: connected to ground via a 6kOhm resistor,
 		20kohm_to_gnd: connected to ground via a 20kOhm resistor,
-		90kohm_to_gnd: connected to ground via a 90kOhm resistor,
 		100kohm_to_gnd: connected to ground via an 100kOhm resistor,
-		125kohm_to_gnd: connected to ground via an 125kOhm resistor,
 		500kohm_to_gnd: connected to ground via a 500kOhm resistor,
-		640kohm_to_gnd: connected to ground via a 640kOhm resistor,
 		three_state: left floating.
 		For a list of available output power down options read
 		outX_powerdown_mode_available. If Y is not present the
 		mode is shared across all outputs.

-What:		/sys/.../iio:deviceX/out_voltageY_powerdown_mode_available
+What:		/sys/.../iio:deviceX/out_votlageY_powerdown_mode_available
 What:		/sys/.../iio:deviceX/out_voltage_powerdown_mode_available
-What:		/sys/.../iio:deviceX/out_altvoltageY_powerdown_mode_available
+What:		/sys/.../iio:deviceX/out_altvotlageY_powerdown_mode_available
 What:		/sys/.../iio:deviceX/out_altvoltage_powerdown_mode_available
 KernelVersion:	2.6.38
 Contact:	linux-iio@vger.kernel.org
@@ -591,7 +535,6 @@ What:		/sys/.../iio:deviceX/events/in_voltageY_supply_thresh_rising_en
 What:		/sys/.../iio:deviceX/events/in_voltageY_supply_thresh_falling_en
 What:		/sys/.../iio:deviceX/events/in_voltageY_thresh_rising_en
 What:		/sys/.../iio:deviceX/events/in_voltageY_thresh_falling_en
-What:		/sys/.../iio:deviceX/events/in_voltageY_thresh_either_en
 What:		/sys/.../iio:deviceX/events/in_tempY_thresh_rising_en
 What:		/sys/.../iio:deviceX/events/in_tempY_thresh_falling_en
 KernelVersion:	2.6.37
@@ -669,8 +612,6 @@ Description:
 		a given event type is enabled a future point (and not those for
 		whatever event was previously enabled).

-What:		/sys/.../events/in_accel_thresh_rising_value
-What:		/sys/.../events/in_accel_thresh_falling_value
 What:		/sys/.../events/in_accel_x_raw_thresh_rising_value
 What:		/sys/.../events/in_accel_x_raw_thresh_falling_value
 What:		/sys/.../events/in_accel_y_raw_thresh_rising_value
@@ -720,24 +661,6 @@ Description:
 		value is in raw device units or in processed units (as _raw
 		and _input do on sysfs direct channel read attributes).

-What:		/sys/.../events/in_accel_scale
-What:		/sys/.../events/in_accel_peak_scale
-What:		/sys/.../events/in_anglvel_scale
-What:		/sys/.../events/in_magn_scale
-What:		/sys/.../events/in_rot_from_north_magnetic_scale
-What:		/sys/.../events/in_rot_from_north_true_scale
-What:		/sys/.../events/in_voltage_scale
-What:		/sys/.../events/in_voltage_supply_scale
-What:		/sys/.../events/in_temp_scale
-What:		/sys/.../events/in_illuminance_scale
-What:		/sys/.../events/in_proximity_scale
-KernelVersion:	3.21
-Contact:	linux-iio@vger.kernel.org
-Description:
-                Specifies the conversion factor from the standard units
-                to device specific units used to set the event trigger
-                threshold.
-
 What:		/sys/.../events/in_accel_x_thresh_rising_hysteresis
 What:		/sys/.../events/in_accel_x_thresh_falling_hysteresis
 What:		/sys/.../events/in_accel_x_thresh_either_hysteresis
@@ -853,7 +776,7 @@ Description:

 What:		/sys/.../events/in_accel_x_thresh_rising_period
 What:		/sys/.../events/in_accel_x_thresh_falling_period
-What:		/sys/.../events/in_accel_x_roc_rising_period
+hat:		/sys/.../events/in_accel_x_roc_rising_period
 What:		/sys/.../events/in_accel_x_roc_falling_period
 What:		/sys/.../events/in_accel_y_thresh_rising_period
 What:		/sys/.../events/in_accel_y_thresh_falling_period
@@ -933,26 +856,6 @@ Description:
 		met before an event is generated. If direction is not
 		specified then this period applies to both directions.

-What:		/sys/.../events/in_accel_thresh_rising_low_pass_filter_3db
-What:		/sys/.../events/in_anglvel_thresh_rising_low_pass_filter_3db
-What:		/sys/.../events/in_magn_thresh_rising_low_pass_filter_3db
-KernelVersion:	4.2
-Contact:	linux-iio@vger.kernel.org
-Description:
-		If a low pass filter can be applied to the event generation
-		this property gives its 3db frequency in Hz.
-		A value of zero disables the filter.
-
-What:		/sys/.../events/in_accel_thresh_rising_high_pass_filter_3db
-What:		/sys/.../events/in_anglvel_thresh_rising_high_pass_filter_3db
-What:		/sys/.../events/in_magn_thresh_rising_high_pass_filter_3db
-KernelVersion:	4.2
-Contact:	linux-iio@vger.kernel.org
-Description:
-		If a high pass filter can be applied to the event generation
-		this property gives its 3db frequency in Hz.
-		A value of zero disables the filter.
-
 What:		/sys/.../events/in_activity_still_thresh_rising_en
 What:		/sys/.../events/in_activity_still_thresh_falling_en
 What:		/sys/.../events/in_activity_walking_thresh_rising_en
@@ -1020,7 +923,7 @@ Description:
 		this type.

 What:		/sys/.../events/in_steps_change_en
-KernelVersion:	4.0
+KernelVersion:	3.20
 Contact:	linux-iio@vger.kernel.org
 Description:
 		Event generated when channel passes a threshold on the absolute
@@ -1029,7 +932,7 @@ Description:
 		in_steps_change_value.

 What:		/sys/.../events/in_steps_change_value
-KernelVersion:	4.0
+KernelVersion:	3.20
 Contact:	linux-iio@vger.kernel.org
 Description:
 		Specifies the value of change threshold that the
@@ -1051,6 +954,13 @@ Contact:	linux-iio@vger.kernel.org
 Description:
 		Number of scans contained by the buffer.

+What:		/sys/bus/iio/devices/iio:deviceX/buffer/bytes_per_datum
+KernelVersion:	2.6.37
+Contact:	linux-iio@vger.kernel.org
+Description:
+		Bytes per scan.  Due to alignment fun, the scan may be larger
+		than implied directly by the scan_element parameters.
+
 What:		/sys/bus/iio/devices/iio:deviceX/buffer/enable
 KernelVersion:	2.6.35
 Contact:	linux-iio@vger.kernel.org
@@ -1082,16 +992,11 @@ What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_en
 What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en
 What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_en
 What:		/sys/.../iio:deviceX/scan_elements/in_voltageY-voltageZ_en
-What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_i_en
-What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_q_en
-What:		/sys/.../iio:deviceX/scan_elements/in_voltage_i_en
-What:		/sys/.../iio:deviceX/scan_elements/in_voltage_q_en
 What:		/sys/.../iio:deviceX/scan_elements/in_incli_x_en
 What:		/sys/.../iio:deviceX/scan_elements/in_incli_y_en
 What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_en
 What:		/sys/.../iio:deviceX/scan_elements/in_pressure_en
 What:		/sys/.../iio:deviceX/scan_elements/in_rot_quaternion_en
-What:		/sys/.../iio:deviceX/scan_elements/in_proximity_en
 KernelVersion:	2.6.37
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -1104,15 +1009,10 @@ What:		/sys/.../iio:deviceX/scan_elements/in_incli_type
 What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_type
 What:		/sys/.../iio:deviceX/scan_elements/in_voltage_type
 What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_supply_type
-What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_i_type
-What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_q_type
-What:		/sys/.../iio:deviceX/scan_elements/in_voltage_i_type
-What:		/sys/.../iio:deviceX/scan_elements/in_voltage_q_type
 What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_type
 What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_type
 What:		/sys/.../iio:deviceX/scan_elements/in_pressure_type
 What:		/sys/.../iio:deviceX/scan_elements/in_rot_quaternion_type
-What:		/sys/.../iio:deviceX/scan_elements/in_proximity_type
 KernelVersion:	2.6.37
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -1145,10 +1045,6 @@ Description:

 What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_index
 What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_supply_index
-What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_i_index
-What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_q_index
-What:		/sys/.../iio:deviceX/scan_elements/in_voltage_i_index
-What:		/sys/.../iio:deviceX/scan_elements/in_voltage_q_index
 What:		/sys/.../iio:deviceX/scan_elements/in_accel_x_index
 What:		/sys/.../iio:deviceX/scan_elements/in_accel_y_index
 What:		/sys/.../iio:deviceX/scan_elements/in_accel_z_index
@@ -1168,7 +1064,6 @@ What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_index
 What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_index
 What:		/sys/.../iio:deviceX/scan_elements/in_pressure_index
 What:		/sys/.../iio:deviceX/scan_elements/in_rot_quaternion_index
-What:		/sys/.../iio:deviceX/scan_elements/in_proximity_index
 KernelVersion:	2.6.37
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -1209,7 +1104,7 @@ Description:

 What:		/sys/.../iio:deviceX/in_energy_input
 What:		/sys/.../iio:deviceX/in_energy_raw
-KernelVersion:	4.0
+KernelVersion:	3.20
 Contact:	linux-iio@vger.kernel.org
 Description:
 		This attribute is used to read the energy value reported by the
@@ -1218,7 +1113,7 @@ Description:

 What:		/sys/.../iio:deviceX/in_distance_input
 What:		/sys/.../iio:deviceX/in_distance_raw
-KernelVersion:	4.0
+KernelVersion:	3.20
 Contact:	linux-iio@vger.kernel.org
 Description:
 		This attribute is used to read the distance covered by the user
@@ -1240,19 +1135,17 @@ KernelVersion:	3.4
 Contact:	linux-iio@vger.kernel.org
 Description:
 		Proximity measurement indicating that some
-		object is near the sensor, usually by observing
+		object is near the sensor, usually be observing
 		reflectivity of infrared or ultrasound emitted.
 		Often these sensors are unit less and as such conversion
-		to SI units is not possible. Higher proximity measurements
-		indicate closer objects, and vice versa.
+		to SI units is not possible.  Where it is, the units should
+		be meters.  If such a conversion is not possible, the reported
+		values should behave in the same way as a distance, i.e. lower
+		values indicate something is closer to the sensor.

-What:		/sys/.../iio:deviceX/in_illuminance_input
-What:		/sys/.../iio:deviceX/in_illuminance_raw
 What:		/sys/.../iio:deviceX/in_illuminanceY_input
 What:		/sys/.../iio:deviceX/in_illuminanceY_raw
 What:		/sys/.../iio:deviceX/in_illuminanceY_mean_raw
-What:		/sys/.../iio:deviceX/in_illuminance_ir_raw
-What:		/sys/.../iio:deviceX/in_illuminance_clear_raw
 KernelVersion:	3.4
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -1262,23 +1155,12 @@ Description:
 What:		/sys/.../iio:deviceX/in_intensityY_raw
 What:		/sys/.../iio:deviceX/in_intensityY_ir_raw
 What:		/sys/.../iio:deviceX/in_intensityY_both_raw
-What:		/sys/.../iio:deviceX/in_intensityY_uv_raw
 KernelVersion:	3.4
 Contact:	linux-iio@vger.kernel.org
 Description:
 		Unit-less light intensity. Modifiers both and ir indicate
 		that measurements contains visible and infrared light
-		components or just infrared light, respectively. Modifier uv indicates
-		that measurements contain ultraviolet light components.
-
-What:		/sys/.../iio:deviceX/in_uvindex_input
-KernelVersion:	4.6
-Contact:	linux-iio@vger.kernel.org
-Description:
-		UV light intensity index measuring the human skin's response to
-		different wavelength of sunlight weighted according to the
-		standardised CIE Erythemal Action Spectrum. UV index values range
-		from 0 (low) to >=11 (extreme).
+		components or just infrared light, respectively.

 What:		/sys/.../iio:deviceX/in_intensity_red_integration_time
 What:		/sys/.../iio:deviceX/in_intensity_green_integration_time
@@ -1292,7 +1174,7 @@ Description:
 		seconds.

 What:		/sys/.../iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_integration_time
-KernelVersion:	4.0
+KernelVersion:	3.20
 Contact:	linux-iio@vger.kernel.org
 Description:
 		Number of seconds in which to compute speed.
@@ -1317,8 +1199,6 @@ Description:
 		or without compensation from tilt sensors.

 What:		/sys/bus/iio/devices/iio:deviceX/in_currentX_raw
-What:		/sys/bus/iio/devices/iio:deviceX/in_currentX_i_raw
-What:		/sys/bus/iio/devices/iio:deviceX/in_currentX_q_raw
 KernelVersion:	3.18
 Contact:	linux-iio@vger.kernel.org
 Description:
@@ -1327,11 +1207,6 @@ Description:
 		present, output should be considered as processed with the
 		unit in milliamps.

-		Channels with 'i' and 'q' modifiers always exist in pairs and both
-		channels refer to the same signal. The 'i' channel contains the in-phase
-		component of the signal while the 'q' channel contains the quadrature
-		component.
-
 What:		/sys/.../iio:deviceX/in_energy_en
 What:		/sys/.../iio:deviceX/in_distance_en
 What:		/sys/.../iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_en
@@ -1361,7 +1236,7 @@ Description:
 		Units after application of scale are m/s.

 What:		/sys/.../iio:deviceX/in_steps_debounce_count
-KernelVersion:	4.0
+KernelVersion:	3.20
 Contact:	linux-iio@vger.kernel.org
 Description:
 		Specifies the number of steps that must occur within
@@ -1369,213 +1244,8 @@ Description:
 		consumer is making steps.

 What:		/sys/.../iio:deviceX/in_steps_debounce_time
-KernelVersion:	4.0
+KernelVersion:	3.20
 Contact:	linux-iio@vger.kernel.org
 Description:
 		Specifies number of seconds in which we compute the steps
 		that occur in order to decide if the consumer is making steps.
-
-What:		/sys/bus/iio/devices/iio:deviceX/buffer/watermark
-KernelVersion:	4.2
-Contact:	linux-iio@vger.kernel.org
-Description:
-		A single positive integer specifying the maximum number of scan
-		elements to wait for.
-		Poll will block until the watermark is reached.
-		Blocking read will wait until the minimum between the requested
-		read amount or the low water mark is available.
-		Non-blocking read will retrieve the available samples from the
-		buffer even if there are less samples then watermark level. This
-		allows the application to block on poll with a timeout and read
-		the available samples after the timeout expires and thus have a
-		maximum delay guarantee.
-
-What:		/sys/bus/iio/devices/iio:deviceX/buffer/hwfifo_enabled
-KernelVersion: 4.2
-Contact:	linux-iio@vger.kernel.org
-Description:
-		A read-only boolean value that indicates if the hardware fifo is
-		currently enabled or disabled. If the device does not have a
-		hardware fifo this entry is not present.
-		The hardware fifo is enabled when the buffer is enabled if the
-		current hardware fifo watermark level is set and other current
-		device settings allows it (e.g. if a trigger is set that samples
-		data differently that the hardware fifo does then hardware fifo
-		will not enabled).
-		If the hardware fifo is enabled and the level of the hardware
-		fifo reaches the hardware fifo watermark level the device will
-		flush its hardware fifo to the device buffer. Doing a non
-		blocking read on the device when no samples are present in the
-		device buffer will also force a flush.
-		When the hardware fifo is enabled there is no need to use a
-		trigger to use buffer mode since the watermark settings
-		guarantees that the hardware fifo is flushed to the device
-		buffer.
-
-What:		/sys/bus/iio/devices/iio:deviceX/buffer/hwfifo_watermark
-KernelVersion: 4.2
-Contact:	linux-iio@vger.kernel.org
-Description:
-		Read-only entry that contains a single integer specifying the
-		current watermark level for the hardware fifo. If the device
-		does not have a hardware fifo this entry is not present.
-		The watermark level for the hardware fifo is set by the driver
-		based on the value set by the user in buffer/watermark but
-		taking into account hardware limitations (e.g. most hardware
-		buffers are limited to 32-64 samples, some hardware buffers
-		watermarks are fixed or have minimum levels).  A value of 0
-		means that the hardware watermark is unset.
-
-What:		/sys/bus/iio/devices/iio:deviceX/buffer/hwfifo_watermark_min
-KernelVersion: 4.2
-Contact:       linux-iio@vger.kernel.org
-Description:
-		A single positive integer specifying the minimum watermark level
-		for the hardware fifo of this device. If the device does not
-		have a hardware fifo this entry is not present.
-		If the user sets buffer/watermark to a value less than this one,
-		then the hardware watermark will remain unset.
-
-What:	       /sys/bus/iio/devices/iio:deviceX/buffer/hwfifo_watermark_max
-KernelVersion: 4.2
-Contact:       linux-iio@vger.kernel.org
-Description:
-		A single positive integer specifying the maximum watermark level
-		for the hardware fifo of this device. If the device does not
-		have a hardware fifo this entry is not present.
-		If the user sets buffer/watermark to a value greater than this
-		one, then the hardware watermark will be capped at this value.
-
-What:	       /sys/bus/iio/devices/iio:deviceX/buffer/hwfifo_watermark_available
-KernelVersion: 4.2
-Contact:       linux-iio@vger.kernel.org
-Description:
-		A list of positive integers specifying the available watermark
-		levels for the hardware fifo. This entry is optional and if it
-		is not present it means that all the values between
-		hwfifo_watermark_min and hwfifo_watermark_max are supported.
-		If the user sets buffer/watermark to a value greater than
-		hwfifo_watermak_min but not equal to any of the values in this
-		list, the driver will chose an appropriate value for the
-		hardware fifo watermark level.
-
-What:		/sys/bus/iio/devices/iio:deviceX/in_temp_calibemissivity
-What:		/sys/bus/iio/devices/iio:deviceX/in_tempX_calibemissivity
-What:		/sys/bus/iio/devices/iio:deviceX/in_temp_object_calibemissivity
-What:		/sys/bus/iio/devices/iio:deviceX/in_tempX_object_calibemissivity
-KernelVersion:	4.1
-Contact:	linux-iio@vger.kernel.org
-Description:
-		The emissivity ratio of the surface in the field of view of the
-		contactless temperature sensor.  Emissivity varies from 0 to 1,
-		with 1 being the emissivity of a black body.
-
-What:		/sys/bus/iio/devices/iio:deviceX/in_magn_x_oversampling_ratio
-What:		/sys/bus/iio/devices/iio:deviceX/in_magn_y_oversampling_ratio
-What:		/sys/bus/iio/devices/iio:deviceX/in_magn_z_oversampling_ratio
-KernelVersion:	4.2
-Contact:	linux-iio@vger.kernel.org
-Description:
-		Hardware applied number of measurements for acquiring one
-		data point. The HW will do <type>[_name]_oversampling_ratio
-		measurements and return the average value as output data. Each
-		value resulted from <type>[_name]_oversampling_ratio measurements
-		is considered as one sample for <type>[_name]_sampling_frequency.
-
-What:		/sys/bus/iio/devices/iio:deviceX/in_concentration_raw
-What:		/sys/bus/iio/devices/iio:deviceX/in_concentrationX_raw
-What:		/sys/bus/iio/devices/iio:deviceX/in_concentration_co2_raw
-What:		/sys/bus/iio/devices/iio:deviceX/in_concentrationX_co2_raw
-What:		/sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw
-What:		/sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
-KernelVersion:	4.3
-Contact:	linux-iio@vger.kernel.org
-Description:
-		Raw (unscaled no offset etc.) percentage reading of a substance.
-
-What:		/sys/bus/iio/devices/iio:deviceX/in_resistance_raw
-What:		/sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw
-What:		/sys/bus/iio/devices/iio:deviceX/out_resistance_raw
-What:		/sys/bus/iio/devices/iio:deviceX/out_resistanceX_raw
-KernelVersion:	4.3
-Contact:	linux-iio@vger.kernel.org
-Description:
-		Raw (unscaled no offset etc.) resistance reading that can be processed
-		into an ohm value.
-
-What:		/sys/bus/iio/devices/iio:deviceX/heater_enable
-KernelVersion:	4.1.0
-Contact:	linux-iio@vger.kernel.org
-Description:
-		'1' (enable) or '0' (disable) specifying the enable
-		of heater function. Same reading values apply
-		This ABI is especially applicable for humidity sensors
-		to heatup the device and get rid of any condensation
-		in some humidity environment
-
-What:		/sys/bus/iio/devices/iio:deviceX/in_ph_raw
-KernelVersion:	4.5
-Contact:	linux-iio@vger.kernel.org
-Description:
-		Raw (unscaled no offset etc.) pH reading of a substance as a negative
-		base-10 logarithm of hydrodium ions in a litre of water.
-
-What:           /sys/bus/iio/devices/iio:deviceX/mount_matrix
-What:           /sys/bus/iio/devices/iio:deviceX/in_mount_matrix
-What:           /sys/bus/iio/devices/iio:deviceX/out_mount_matrix
-What:           /sys/bus/iio/devices/iio:deviceX/in_anglvel_mount_matrix
-What:           /sys/bus/iio/devices/iio:deviceX/in_accel_mount_matrix
-KernelVersion:  4.6
-Contact:        linux-iio@vger.kernel.org
-Description:
-		Mounting matrix for IIO sensors. This is a rotation matrix which
-		informs userspace about sensor chip's placement relative to the
-		main hardware it is mounted on.
-		Main hardware placement is defined according to the local
-		reference frame related to the physical quantity the sensor
-		measures.
-		Given that the rotation matrix is defined in a board specific
-		way (platform data and / or device-tree), the main hardware
-		reference frame definition is left to the implementor's choice
-		(see below for a magnetometer example).
-		Applications should apply this rotation matrix to samples so
-		that when main hardware reference frame is aligned onto local
-		reference frame, then sensor chip reference frame is also
-		perfectly aligned with it.
-		Matrix is a 3x3 unitary matrix and typically looks like
-		[0, 1, 0; 1, 0, 0; 0, 0, -1]. Identity matrix
-		[1, 0, 0; 0, 1, 0; 0, 0, 1] means sensor chip and main hardware
-		are perfectly aligned with each other.
-
-		For example, a mounting matrix for a magnetometer sensor informs
-		userspace about sensor chip's ORIENTATION relative to the main
-		hardware.
-		More specifically, main hardware orientation is defined with
-		respect to the LOCAL EARTH GEOMAGNETIC REFERENCE FRAME where :
-		* Y is in the ground plane and positive towards magnetic North ;
-		* X is in the ground plane, perpendicular to the North axis and
-		  positive towards the East ;
-		* Z is perpendicular to the ground plane and positive upwards.
-
-		An implementor might consider that for a hand-held device, a
-		'natural' orientation would be 'front facing camera at the top'.
-		The main hardware reference frame could then be described as :
-		* Y is in the plane of the screen and is positive towards the
-		  top of the screen ;
-		* X is in the plane of the screen, perpendicular to Y axis, and
-		  positive towards the right hand side of the screen ;
-		* Z is perpendicular to the screen plane and positive out of the
-		  screen.
-		Another example for a quadrotor UAV might be :
-		* Y is in the plane of the propellers and positive towards the
-		  front-view camera;
-		* X is in the plane of the propellers, perpendicular to Y axis,
-		  and positive towards the starboard side of the UAV ;
-		* Z is perpendicular to propellers plane and positive upwards.
-
-What:		/sys/bus/iio/devices/iio:deviceX/in_electricalconductivity_raw
-KernelVersion:	4.8
-Contact:	linux-iio@vger.kernel.org
-Description:
-		Raw (unscaled no offset etc.) electric conductivity reading that
-		can be processed to siemens per meter.
--- a/Documentation/ABI/testing/sysfs-bus-iio-adc-hi8435
+++ b/Documentation/ABI/testing/sysfs-bus-iio-adc-hi8435
@@ -1,43 +0,0 @@
-What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_sensing_mode
-Date:		August 2015
-KernelVersion:	4.2.0
-Contact:	source@cogentembedded.com
-Description:
-		Program sensor type for threshold detector inputs.
-		Could be either "GND-Open" or "Supply-Open" mode. Y is a
-		threshold detector input channel. Channels 0..7, 8..15, 16..23
-		and 24..31 has common sensor types.
-
-What:		/sys/bus/iio/devices/iio:deviceX/events/in_voltageY_thresh_falling_value
-Date:		August 2015
-KernelVersion:	4.2.0
-Contact:	source@cogentembedded.com
-Description:
-		Channel Y low voltage threshold. If sensor input voltage goes lower then
-		this value then the threshold falling event is pushed.
-		Depending on in_voltageY_sensing_mode the low voltage threshold
-		is separately set for "GND-Open" and "Supply-Open" modes.
-		Channels 0..31 have common low threshold values, but could have different
-		sensing_modes.
-		The low voltage threshold range is between 2..21V.
-		Hysteresis between low and high thresholds can not be lower then 2 and
-		can not be odd.
-		If falling threshold results hysteresis to odd value then rising
-		threshold is automatically subtracted by one.
-
-What:		/sys/bus/iio/devices/iio:deviceX/events/in_voltageY_thresh_rising_value
-Date:		August 2015
-KernelVersion:	4.2.0
-Contact:	source@cogentembedded.com
-Description:
-		Channel Y high voltage threshold. If sensor input voltage goes higher then
-		this value then the threshold rising event is pushed.
-		Depending on in_voltageY_sensing_mode the high voltage threshold
-		is separately set for "GND-Open" and "Supply-Open" modes.
-		Channels 0..31 have common high threshold values, but could have different
-		sensing_modes.
-		The high voltage threshold range is between 3..22V.
-		Hysteresis between low and high thresholds can not be lower then 2 and
-		can not be odd.
-		If rising threshold results hysteresis to odd value then falling
-		threshold is automatically appended by one.
--- a/Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x
+++ b/Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x
@@ -1,7 +0,0 @@
-What:		/sys/bus/iio/devices/iio:deviceX/in_concentration_VOC_short_raw
-Date:		September 2015
-KernelVersion:	4.3
-Contact:	Matt Ranostay <mranostay@gmail.com>
-Description:
-		Get the raw calibration VOC value from the sensor.
-		This value has little application outside of calibration.
--- a/Documentation/ABI/testing/sysfs-bus-iio-health-afe440x
+++ b/Documentation/ABI/testing/sysfs-bus-iio-health-afe440x
@@ -1,41 +0,0 @@
-What:		/sys/bus/iio/devices/iio:deviceX/in_intensityY_raw
-Date:		May 2016
-KernelVersion:
-Contact:	Andrew F. Davis <afd@ti.com>
-Description:
-		Get measured values from the ADC for these stages. Y is the
-		specific stage number corresponding to datasheet stage names
-		as follows:
-		1 -> LED2
-		2 -> ALED2/LED3
-		3 -> LED1
-		4 -> ALED1/LED4
-		Note that channels 5 and 6 represent LED2-ALED2 and LED1-ALED1
-		respectively which simply helper channels containing the
-		calculated difference in the value of stage 1 - 2 and 3 - 4.
-		The values are expressed in 24-bit twos complement.
-
-What:		/sys/bus/iio/devices/iio:deviceX/in_intensityY_offset
-Date:		May 2016
-KernelVersion:
-Contact:	Andrew F. Davis <afd@ti.com>
-Description:
-		Get and set the offset cancellation DAC setting for these
-		stages. The values are expressed in 5-bit sign-magnitude.
-
-What:		/sys/bus/iio/devices/iio:deviceX/in_intensityY_resistance
-What:		/sys/bus/iio/devices/iio:deviceX/in_intensityY_capacitance
-Date:		May 2016
-KernelVersion:
-Contact:	Andrew F. Davis <afd@ti.com>
-Description:
-		Get and set the resistance and the capacitance settings for the
-		Transimpedance Amplifier during the associated stage.
-
-What:		/sys/bus/iio/devices/iio:deviceX/out_currentY_raw
-Date:		May 2016
-KernelVersion:
-Contact:	Andrew F. Davis <afd@ti.com>
-Description:
-		Get and set the LED current for the specified LED active during
-		this stage. Y is the specific stage number.
--- a/Documentation/ABI/testing/sysfs-bus-iio-humidity-hdc100x
+++ b/Documentation/ABI/testing/sysfs-bus-iio-humidity-hdc100x
@@ -1,9 +0,0 @@
-What:		/sys/bus/iio/devices/iio:deviceX/out_current_heater_raw
-What:		/sys/bus/iio/devices/iio:deviceX/out_current_heater_raw_available
-KernelVersion:	4.3
-Contact:	linux-iio@vger.kernel.org
-Description:
-		Controls the heater device within the humidity sensor to get
-		rid of excess condensation.
-
-		Valid control values are 0 = OFF, and 1 = ON.
--- a/Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc
+++ b/Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc
@@ -1,24 +0,0 @@
-What:		/sys/bus/iio/devices/iio:deviceX/in_allow_async_readout
-Date:		December 2015
-KernelVersion:	4.4
-Contact:	linux-iio@vger.kernel.org
-Description:
-		By default (value '0'), the capture thread checks for the Conversion
-		Ready Flag to being set prior to committing a new value to the sample
-		buffer. This synchronizes the in-chip conversion rate with the
-		in-driver readout rate at the cost of an additional register read.
-
-		Writing '1' will remove the polling for the Conversion Ready Flags to
-		save the additional i2c transaction, which will improve the bandwidth
-		available for reading data. However, samples can be occasionally skipped
-		or repeated, depending on the beat between the capture and conversion
-		rates.
-
-What:		/sys/bus/iio/devices/iio:deviceX/in_shunt_resistor
-Date:		December 2015
-KernelVersion:	4.4
-Contact:	linux-iio@vger.kernel.org
-Description:
-		The value of the shunt resistor may be known only at runtime fom an
-		eeprom content read by a client application. This attribute allows to
-		set its value in ohms.
--- a/Documentation/ABI/testing/sysfs-bus-iio-magnetometer-hmc5843
+++ b/Documentation/ABI/testing/sysfs-bus-iio-magnetometer-hmc5843
@@ -1,15 +0,0 @@
-What:           /sys/bus/iio/devices/iio:deviceX/meas_conf
-What:           /sys/bus/iio/devices/iio:deviceX/meas_conf_available
-KernelVersion:  4.5
-Contact:        linux-iio@vger.kernel.org
-Description:
-                Current configuration and available configurations
-		for the bias current.
-		normal		- Normal measurement configurations (default)
-		positivebias	- Positive bias configuration
-		negativebias	- Negative bias configuration
-		disabled	- Only available on HMC5983. Disables magnetic
-				  sensor and enables temperature sensor.
-		Note: The effect of this configuration may vary
-		according to the device. For exact documentation
-		check the device's datasheet.
--- a/Documentation/ABI/testing/sysfs-bus-iio-meas-spec
+++ b/Documentation/ABI/testing/sysfs-bus-iio-meas-spec
@@ -1,8 +0,0 @@
-What:           /sys/bus/iio/devices/iio:deviceX/battery_low
-KernelVersion:  4.1.0
-Contact:        linux-iio@vger.kernel.org
-Description:
-                Reading returns either '1' or '0'. '1' means that the
-                battery level supplied to sensor is below 2.25V.
-                This ABI is available for tsys02d, htu21, ms8607
-		This ABI is available for htu21, ms8607
--- a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
+++ b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
@@ -1,4 +1,4 @@
-What		/sys/bus/iio/devices/iio:deviceX/in_proximity_input
+What		/sys/bus/iio/devices/iio:deviceX/in_proximity_raw
 Date:		March 2014
 KernelVersion:	3.15
 Contact:	Matt Ranostay <mranostay@gmail.com>
--- a/Documentation/ABI/testing/sysfs-bus-iio-trigger-sysfs
+++ b/Documentation/ABI/testing/sysfs-bus-iio-trigger-sysfs
@@ -9,34 +9,3 @@ Description:
 		automated testing or in situations, where other trigger methods
 		are not applicable. For example no RTC or spare GPIOs.
 		X is the IIO index of the trigger.
-
-What:		/sys/bus/iio/devices/triggerX/name
-KernelVersion:	2.6.39
-Contact:	linux-iio@vger.kernel.org
-Description:
-		The name attribute holds a description string for the current
-		trigger. In order to associate the trigger with an IIO device
-		one should write this name string to
-		/sys/bus/iio/devices/iio:deviceY/trigger/current_trigger.
-
-What:		/sys/bus/iio/devices/iio_sysfs_trigger/add_trigger
-KernelVersion:	2.6.39
-Contact:	linux-iio@vger.kernel.org
-Description:
-		This attribute is provided by the iio-trig-sysfs stand-alone
-		driver and it is used to activate the creation of a new trigger.
-		In order to achieve this, one should write a positive integer
-		into the associated file, which will serve as the id of the
-		trigger. If the trigger with the specified id is already present
-		in the system, an invalid argument message will be returned.
-
-What:		/sys/bus/iio/devices/iio_sysfs_trigger/remove_trigger
-KernelVersion:	2.6.39
-Contact:	linux-iio@vger.kernel.org
-Description:
-		This attribute is used to unregister and delete a previously
-		created trigger from the list of available triggers. In order to
-		achieve this, one should write a positive integer into the
-		associated file, representing the id of the trigger that needs
-		to be removed. If the trigger can't be found, an invalid
-		argument message will be returned to the user.
--- a/Documentation/ABI/testing/sysfs-bus-iio-vf610
+++ b/Documentation/ABI/testing/sysfs-bus-iio-vf610
@@ -1,16 +0,0 @@
-What:		/sys/bus/iio/devices/iio:deviceX/conversion_mode
-KernelVersion:	4.2
-Contact:	linux-iio@vger.kernel.org
-Description:
-		Specifies the hardware conversion mode used. The three
-		available modes are "normal", "high-speed" and "low-power",
-		where the last is the default mode.
-
-
-What:		/sys/bus/iio/devices/iio:deviceX/out_conversion_mode
-KernelVersion:	4.6
-Contact:	linux-iio@vger.kernel.org
-Description:
-		Specifies the hardware conversion mode used within DAC.
-		The two available modes are "high-power" and "low-power",
-		where "low-power" mode is the default mode.
--- a/Documentation/ABI/testing/sysfs-bus-intel_th-devices-gth
+++ b/Documentation/ABI/testing/sysfs-bus-intel_th-devices-gth
@@ -1,49 +0,0 @@
-What:		/sys/bus/intel_th/devices/<intel_th_id>-gth/masters/*
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RW) Configure output ports for STP masters. Writing -1
-		disables a master; any
-
-What:		/sys/bus/intel_th/devices/<intel_th_id>-gth/outputs/[0-7]_port
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RO) Output port type:
-		  0: not present,
-		  1: MSU (Memory Storage Unit)
-		  2: CTP (Common Trace Port)
-		  4: PTI (MIPI PTI).
-
-What:		/sys/bus/intel_th/devices/<intel_th_id>-gth/outputs/[0-7]_drop
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RW) Data retention policy setting: keep (0) or drop (1)
-		incoming data while output port is in reset.
-
-What:		/sys/bus/intel_th/devices/<intel_th_id>-gth/outputs/[0-7]_null
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RW) STP NULL packet generation: enabled (1) or disabled (0).
-
-What:		/sys/bus/intel_th/devices/<intel_th_id>-gth/outputs/[0-7]_flush
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RW) Force flush data from byte packing buffer for the output
-		port.
-
-What:		/sys/bus/intel_th/devices/<intel_th_id>-gth/outputs/[0-7]_reset
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RO) Output port is in reset (1).
-
-What:		/sys/bus/intel_th/devices/<intel_th_id>-gth/outputs/[0-7]_smcfreq
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RW) STP sync packet frequency for the port. Specifies the
-		number of clocks between mainenance packets.
--- a/Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc
+++ b/Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc
@@ -1,33 +0,0 @@
-What:		/sys/bus/intel_th/devices/<intel_th_id>-msc<msc-id>/wrap
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RW) Configure MSC buffer wrapping. 1 == wrapping enabled.
-
-What:		/sys/bus/intel_th/devices/<intel_th_id>-msc<msc-id>/mode
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RW) Configure MSC operating mode:
-		  - "single", for contiguous buffer mode (high-order alloc);
-		  - "multi", for multiblock mode;
-		  - "ExI", for DCI handler mode;
-		  - "debug", for debug mode.
-		If operating mode changes, existing buffer is deallocated,
-		provided there are no active users and tracing is not enabled,
-		otherwise the write will fail.
-
-What:		/sys/bus/intel_th/devices/<intel_th_id>-msc<msc-id>/nr_pages
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RW) Configure MSC buffer size for "single" or "multi" modes.
-		In single mode, this is a single number of pages, has to be
-		power of 2. In multiblock mode, this is a comma-separated list
-		of numbers of pages for each window to be allocated. Number of
-		windows is not limited.
-		Writing to this file deallocates existing buffer (provided
-		there are no active users and tracing is not enabled) and then
-		allocates a new one.
-
-
--- a/Documentation/ABI/testing/sysfs-bus-intel_th-devices-pti
+++ b/Documentation/ABI/testing/sysfs-bus-intel_th-devices-pti
@@ -1,24 +0,0 @@
-What:		/sys/bus/intel_th/devices/<intel_th_id>-pti/mode
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RW) Configure PTI output width. Currently supported values
-		are 4, 8, 12, 16.
-
-What:		/sys/bus/intel_th/devices/<intel_th_id>-pti/freerunning_clock
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RW) 0: PTI trace clock acts as a strobe which only toggles
-		when there is trace data to send. 1: PTI trace clock is a
-		free-running clock.
-
-What:		/sys/bus/intel_th/devices/<intel_th_id>-pti/clock_divider
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RW) Configure PTI port clock divider:
-		 - 0: Intel TH clock rate,
-		 - 1: 1/2 Intel TH clock rate,
-		 - 2: 1/4 Intel TH clock rate,
-		 - 3: 1/8 Intel TH clock rate.
--- a/Documentation/ABI/testing/sysfs-bus-intel_th-output-devices
+++ b/Documentation/ABI/testing/sysfs-bus-intel_th-output-devices
@@ -1,13 +0,0 @@
-What:		/sys/bus/intel_th/devices/<intel_th_id>-<device><id>/active
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RW) Writes of 1 or 0 enable or disable trace output to this
-		output device. Reads return current status.
-
-What:		/sys/bus/intel_th/devices/<intel_th_id>-msc<msc-id>/port
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:	(RO) Port number, corresponding to this output device on the
-		switch (GTH).
--- a/Documentation/ABI/testing/sysfs-bus-mcb
+++ b/Documentation/ABI/testing/sysfs-bus-mcb
@@ -1,29 +0,0 @@
-What:		/sys/bus/mcb/devices/mcb:X
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Johannes Thumshirn <jth@kernel.org>
-Description:	Hardware chip or device hosting the MEN chameleon bus
-
-What:		/sys/bus/mcb/devices/mcb:X/revision
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Johannes Thumshirn <jth@kernel.org>
-Description:	The FPGA's revision number
-
-What:		/sys/bus/mcb/devices/mcb:X/minor
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Johannes Thumshirn <jth@kernel.org>
-Description:	The FPGA's minor number
-
-What:		/sys/bus/mcb/devices/mcb:X/model
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Johannes Thumshirn <jth@kernel.org>
-Description:	The FPGA's model number
-
-What:		/sys/bus/mcb/devices/mcb:X/name
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Johannes Thumshirn <jth@kernel.org>
-Description:	The FPGA's name
--- a/Documentation/ABI/testing/sysfs-bus-mei
+++ b/Documentation/ABI/testing/sysfs-bus-mei
@@ -4,25 +4,4 @@ KernelVersion:	3.10
 Contact:	Samuel Ortiz <sameo@linux.intel.com>
 		linux-mei@linux.intel.com
 Description:	Stores the same MODALIAS value emitted by uevent
-		Format: mei:<mei device name>:<device uuid>:
-
-What:		/sys/bus/mei/devices/.../name
-Date:		May 2015
-KernelVersion:	4.2
-Contact:	Tomas Winkler <tomas.winkler@intel.com>
-Description:	Stores mei client device name
-		Format: string
-
-What:		/sys/bus/mei/devices/.../uuid
-Date:		May 2015
-KernelVersion:	4.2
-Contact:	Tomas Winkler <tomas.winkler@intel.com>
-Description:	Stores mei client device uuid
-		Format: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-
-What:		/sys/bus/mei/devices/.../version
-Date:		Aug 2015
-KernelVersion:	4.3
-Contact:	Tomas Winkler <tomas.winkler@intel.com>
-Description:	Stores mei client protocol version
-		Format: %d
+		Format: mei:<mei device name>
--- a/Documentation/ABI/testing/sysfs-bus-pci-drivers-janz-cmodio
+++ b/Documentation/ABI/testing/sysfs-bus-pci-drivers-janz-cmodio
@@ -1,8 +0,0 @@
-What:		/sys/bus/pci/drivers/janz-cmodio/.../modulbus_number
-Date:		May 2010
-KernelVersion:	2.6.35
-Contact:	Ira W. Snyder <ira.snyder@gmail.com>
-Description:
-		Value representing the HEX switch S2 of the janz carrier board CMOD-IO or CAN-PCI2
-
-		Read-only: value of the configuration switch (0..15)
--- a/Documentation/ABI/testing/sysfs-bus-rbd
+++ b/Documentation/ABI/testing/sysfs-bus-rbd
@@ -6,7 +6,7 @@ Description:

 Being used for adding and removing rbd block devices.

-Usage: <mon ip addr> <options> <pool name> <rbd image name> [<snap name>]
+Usage: <mon ip addr> <options> <pool name> <rbd image name> [snap name]

 $ echo "192.168.0.1 name=admin rbd foo" > /sys/bus/rbd/add

@@ -14,13 +14,9 @@ The snapshot name can be "-" or omitted to map the image read/write. A <dev-id>
 will be assigned for any registered block device. If snapshot is used, it will
 be mapped read-only.

-Usage: <dev-id> [force]
+Removal of a device:

- $ echo 2 > /sys/bus/rbd/remove
-
-Optional "force" argument which when passed will wait for running requests and
-then unmap the image. Requests sent to the driver after initiating the removal
-will be failed.  (August 2016, since 4.9.)
+  $ echo <dev-id> > /sys/bus/rbd/remove

 What:		/sys/bus/rbd/add_single_major
 Date:		December 2013
@@ -47,25 +43,10 @@ Description:	Available only if rbd module is inserted with single_major
 Entries under /sys/bus/rbd/devices/<dev-id>/
 --------------------------------------------

-client_addr
-
-	The ceph unique client entity_addr_t (address + nonce).
-	The format is <address>:<port>/<nonce>: '1.2.3.4:1234/5678' or
-	'[1:2:3:4:5:6:7:8]:1234/5678'.  (August 2016, since 4.9.)
-
 client_id

 	The ceph unique client id that was assigned for this specific session.

-cluster_fsid
-
-	The ceph cluster UUID.  (August 2016, since 4.9.)
-
-config_info
-
-	The string written into /sys/bus/rbd/add{,_single_major}.  (August
-	2016, since 4.9.)
-
 features

 	A hexadecimal encoding of the feature bits for this image.
@@ -111,10 +92,6 @@ current_snap

 	The current snapshot for which the device is mapped.

-snap_id
-
-	The current snapshot's id.  (August 2016, since 4.9.)
-
 parent

 	Information identifying the chain of parent images in a layered rbd
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -1,23 +1,3 @@
-What:		/sys/bus/usb/devices/INTERFACE/authorized
-Date:		August 2015
-Description:
-		This allows to authorize (1) or deauthorize (0)
-		individual interfaces instead a whole device
-		in contrast to the device authorization.
-		If a deauthorized interface will be authorized
-		so the driver probing must be triggered manually
-		by writing INTERFACE to /sys/bus/usb/drivers_probe
-		This allows to avoid side-effects with drivers
-		that need multiple interfaces.
-		A deauthorized interface cannot be probed or claimed.
-
-What:		/sys/bus/usb/devices/usbX/interface_authorized_default
-Date:		August 2015
-Description:
-		This is used as value that determines if interfaces
-		would be authorized by default.
-		The value can be 1 or 0. It's by default 1.
-
 What:		/sys/bus/usb/device/.../authorized
 Date:		July 2008
 KernelVersion:	2.6.26
@@ -134,22 +114,6 @@ Description:
 		enabled for the device. Developer can write y/Y/1 or n/N/0 to
 		the file to enable/disable the feature.

-What:		/sys/bus/usb/devices/.../power/usb3_hardware_lpm_u1
-		/sys/bus/usb/devices/.../power/usb3_hardware_lpm_u2
-Date:		November 2015
-Contact:	Kevin Strasser <kevin.strasser@linux.intel.com>
-		Lu Baolu <baolu.lu@linux.intel.com>
-Description:
-		If CONFIG_PM is set and a USB 3.0 lpm-capable device is plugged
-		in to a xHCI host which supports link PM, it will check if U1
-		and U2 exit latencies have been set in the BOS descriptor; if
-		the check is passed and the host supports USB3 hardware LPM,
-		USB3 hardware LPM will be enabled for the device and the USB
-		device directory will contain two files named
-		power/usb3_hardware_lpm_u1 and power/usb3_hardware_lpm_u2. These
-		files hold a string value (enable or disable) indicating whether
-		or not USB3 hardware LPM U1 or U2 is enabled for the device.
-
 What:		/sys/bus/usb/devices/.../removable
 Date:		February 2012
 Contact:	Matthew Garrett <mjg@redhat.com>
@@ -189,17 +153,6 @@ Description:
 		The file will read "hotplug", "wired" and "not used" if the
 		information is available, and "unknown" otherwise.

-What:		/sys/bus/usb/devices/.../(hub interface)/portX/usb3_lpm_permit
-Date:		November 2015
-Contact:	Lu Baolu <baolu.lu@linux.intel.com>
-Description:
-		Some USB3.0 devices are not friendly to USB3 LPM.  usb3_lpm_permit
-		attribute allows enabling/disabling usb3 lpm of a port. It takes
-		effect both before and after a usb device is enumerated. Supported
-		values are "0" if both u1 and u2 are NOT permitted, "u1" if only u1
-		is permitted, "u2" if only u2 is permitted, "u1_u2" if both u1 and
-		u2 are permitted.
-
 What:		/sys/bus/usb/devices/.../power/usb2_lpm_l1_timeout
 Date:		May 2013
 Contact:	Mathias Nyman <mathias.nyman@linux.intel.com>
--- a/Documentation/ABI/testing/sysfs-bus-usb-lvstest
+++ b/Documentation/ABI/testing/sysfs-bus-usb-lvstest
@@ -4,14 +4,14 @@ driver is bound with root hub device.

 What:		/sys/bus/usb/devices/.../get_dev_desc
 Date:		March 2014
-Contact:	Pratyush Anand <pratyush.anand@gmail.com>
+Contact:	Pratyush Anand <pratyush.anand@st.com>
 Description:
 		Write to this node to issue "Get Device Descriptor"
 		for Link Layer Validation device. It is needed for TD.7.06.

 What:		/sys/bus/usb/devices/.../u1_timeout
 Date:		March 2014
-Contact:	Pratyush Anand <pratyush.anand@gmail.com>
+Contact:	Pratyush Anand <pratyush.anand@st.com>
 Description:
 		Set "U1 timeout" for the downstream port where Link Layer
 		Validation device is connected. Timeout value must be between 0
@@ -19,7 +19,7 @@ Description:

 What:		/sys/bus/usb/devices/.../u2_timeout
 Date:		March 2014
-Contact:	Pratyush Anand <pratyush.anand@gmail.com>
+Contact:	Pratyush Anand <pratyush.anand@st.com>
 Description:
 		Set "U2 timeout" for the downstream port where Link Layer
 		Validation device is connected. Timeout value must be between 0
@@ -27,21 +27,21 @@ Description:

 What:		/sys/bus/usb/devices/.../hot_reset
 Date:		March 2014
-Contact:	Pratyush Anand <pratyush.anand@gmail.com>
+Contact:	Pratyush Anand <pratyush.anand@st.com>
 Description:
 		Write to this node to issue "Reset" for Link Layer Validation
 		device. It is needed for TD.7.29, TD.7.31, TD.7.34 and TD.7.35.

 What:		/sys/bus/usb/devices/.../u3_entry
 Date:		March 2014
-Contact:	Pratyush Anand <pratyush.anand@gmail.com>
+Contact:	Pratyush Anand <pratyush.anand@st.com>
 Description:
 		Write to this node to issue "U3 entry" for Link Layer
 		Validation device. It is needed for TD.7.35 and TD.7.36.

 What:		/sys/bus/usb/devices/.../u3_exit
 Date:		March 2014
-Contact:	Pratyush Anand <pratyush.anand@gmail.com>
+Contact:	Pratyush Anand <pratyush.anand@st.com>
 Description:
 		Write to this node to issue "U3 exit" for Link Layer
 		Validation device. It is needed for TD.7.36.
--- a/Documentation/ABI/testing/sysfs-class-cxl
+++ b/Documentation/ABI/testing/sysfs-class-cxl
@@ -6,17 +6,6 @@ Example: The real path of the attribute /sys/class/cxl/afu0.0s/irqs_max is

 Slave contexts (eg. /sys/class/cxl/afu0.0s):

-What:           /sys/class/cxl/<afu>/afu_err_buf
-Date:           September 2014
-Contact:        linuxppc-dev@lists.ozlabs.org
-Description:    read only
-                AFU Error Buffer contents. The contents of this file are
-		application specific and depends on the AFU being used.
-		Applications interacting with the AFU can use this attribute
-		to know about the current error condition and take appropriate
-		action like logging the event etc.
-
-
 What:           /sys/class/cxl/<afu>/irqs_max
 Date:           September 2014
 Contact:        linuxppc-dev@lists.ozlabs.org
@@ -26,7 +15,6 @@ Description:    read/write
                that hardware can support (eg. 2037). Write values will limit
                userspace applications to that many userspace interrupts. Must
                be >= irqs_min.
-Users:		https://github.com/ibm-capi/libcxl

 What:           /sys/class/cxl/<afu>/irqs_min
 Date:           September 2014
@@ -36,7 +24,6 @@ Description:    read only
                userspace must request on a CXL_START_WORK ioctl. Userspace may
                omit the num_interrupts field in the START_WORK IOCTL to get
                this minimum automatically.
-Users:		https://github.com/ibm-capi/libcxl

 What:           /sys/class/cxl/<afu>/mmio_size
 Date:           September 2014
@@ -44,7 +31,6 @@ Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
                Decimal value of the size of the MMIO space that may be mmaped
                by userspace.
-Users:		https://github.com/ibm-capi/libcxl

 What:           /sys/class/cxl/<afu>/modes_supported
 Date:           September 2014
@@ -52,7 +38,6 @@ Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
                List of the modes this AFU supports. One per line.
                Valid entries are: "dedicated_process" and "afu_directed"
-Users:		https://github.com/ibm-capi/libcxl

 What:           /sys/class/cxl/<afu>/mode
 Date:           September 2014
@@ -61,7 +46,6 @@ Description:    read/write
                The current mode the AFU is using. Will be one of the modes
                given in modes_supported. Writing will change the mode
                provided that no user contexts are attached.
-Users:		https://github.com/ibm-capi/libcxl


 What:           /sys/class/cxl/<afu>/prefault_mode
@@ -75,7 +59,6 @@ Description:    read/write
                                 descriptor as an effective address and
                                 prefault what it points to.
                        all: all segments process calling START_WORK maps.
-Users:		https://github.com/ibm-capi/libcxl

 What:           /sys/class/cxl/<afu>/reset
 Date:           September 2014
@@ -83,14 +66,12 @@ Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    write only
                Writing 1 here will reset the AFU provided there are not
                contexts active on the AFU.
-Users:		https://github.com/ibm-capi/libcxl

 What:           /sys/class/cxl/<afu>/api_version
 Date:           September 2014
 Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
                Decimal value of the current version of the kernel/user API.
-Users:		https://github.com/ibm-capi/libcxl

 What:           /sys/class/cxl/<afu>/api_version_compatible
 Date:           September 2014
@@ -98,7 +79,6 @@ Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
                Decimal value of the the lowest version of the userspace API
                this this kernel supports.
-Users:		https://github.com/ibm-capi/libcxl


 AFU configuration records (eg. /sys/class/cxl/afu0.0/cr0):
@@ -112,7 +92,6 @@ Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
 		Hexadecimal value of the vendor ID found in this AFU
 		configuration record.
-Users:		https://github.com/ibm-capi/libcxl

 What:           /sys/class/cxl/<afu>/cr<config num>/device
 Date:           February 2015
@@ -120,15 +99,13 @@ Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
 		Hexadecimal value of the device ID found in this AFU
 		configuration record.
-Users:		https://github.com/ibm-capi/libcxl

-What:           /sys/class/cxl/<afu>/cr<config num>/class
+What:           /sys/class/cxl/<afu>/cr<config num>/vendor
 Date:           February 2015
 Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
 		Hexadecimal value of the class code found in this AFU
 		configuration record.
-Users:		https://github.com/ibm-capi/libcxl

 What:           /sys/class/cxl/<afu>/cr<config num>/config
 Date:           February 2015
@@ -138,7 +115,6 @@ Description:    read only
 		record. The format is expected to match the either the standard
 		or extended configuration space defined by the PCIe
 		specification.
-Users:		https://github.com/ibm-capi/libcxl



@@ -150,21 +126,18 @@ Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
                Decimal value of the size of the MMIO space that may be mmaped
                by userspace. This includes all slave contexts space also.
-Users:		https://github.com/ibm-capi/libcxl

 What:           /sys/class/cxl/<afu>m/pp_mmio_len
 Date:           September 2014
 Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
                Decimal value of the Per Process MMIO space length.
-Users:		https://github.com/ibm-capi/libcxl

-What:           /sys/class/cxl/<afu>m/pp_mmio_off (not in a guest)
+What:           /sys/class/cxl/<afu>m/pp_mmio_off
 Date:           September 2014
 Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
                Decimal value of the Per Process MMIO space offset.
-Users:		https://github.com/ibm-capi/libcxl


 Card info (eg. /sys/class/cxl/card0)
@@ -174,16 +147,14 @@ Date:           September 2014
 Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
                Identifies the CAIA Version the card implements.
-Users:		https://github.com/ibm-capi/libcxl

 What:           /sys/class/cxl/<card>/psl_revision
 Date:           September 2014
 Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
                Identifies the revision level of the PSL.
-Users:		https://github.com/ibm-capi/libcxl

-What:           /sys/class/cxl/<card>/base_image (not in a guest)
+What:           /sys/class/cxl/<card>/base_image
 Date:           September 2014
 Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
@@ -191,17 +162,15 @@ Description:    read only
                that support loadable PSLs. For FPGAs this field identifies
                the image contained in the on-adapter flash which is loaded
                during the initial program load.
-Users:		https://github.com/ibm-capi/libcxl

-What:           /sys/class/cxl/<card>/image_loaded (not in a guest)
+What:           /sys/class/cxl/<card>/image_loaded
 Date:           September 2014
 Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read only
                Will return "user" or "factory" depending on the image loaded
                onto the card.
-Users:		https://github.com/ibm-capi/libcxl

-What:           /sys/class/cxl/<card>/load_image_on_perst (not in a guest)
+What:           /sys/class/cxl/<card>/load_image_on_perst
 Date:           December 2014
 Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    read/write
@@ -214,33 +183,10 @@ Description:    read/write
                user or factory image to be loaded.
                Default is to reload on PERST whichever image the card has
                loaded.
-Users:		https://github.com/ibm-capi/libcxl

 What:           /sys/class/cxl/<card>/reset
 Date:           October 2014
 Contact:        linuxppc-dev@lists.ozlabs.org
 Description:    write only
-                Writing 1 will issue a PERST to card provided there are no
-                contexts active on any one of the card AFUs. This may cause
-                the card to reload the FPGA depending on load_image_on_perst.
-                Writing -1 will do a force PERST irrespective of any active
-                contexts on the card AFUs.
-Users:		https://github.com/ibm-capi/libcxl
-
-What:		/sys/class/cxl/<card>/perst_reloads_same_image (not in a guest)
-Date:		July 2015
-Contact:	linuxppc-dev@lists.ozlabs.org
-Description:	read/write
-		Trust that when an image is reloaded via PERST, it will not
-		have changed.
-		0 = don't trust, the image may be different (default)
-		1 = trust that the image will not change.
-Users:		https://github.com/ibm-capi/libcxl
-
-What:           /sys/class/cxl/<card>/psl_timebase_synced
-Date:           March 2016
-Contact:        linuxppc-dev@lists.ozlabs.org
-Description:    read only
-                Returns 1 if the psl timebase register is synchronized
-                with the core timebase register, 0 otherwise.
-Users:          https://github.com/ibm-capi/libcxl
+                Writing 1 will issue a PERST to card which may cause the card
+                to reload the FPGA depending on load_image_on_perst.
--- a/Documentation/ABI/testing/sysfs-class-fpga-manager
+++ b/Documentation/ABI/testing/sysfs-class-fpga-manager
@@ -1,37 +0,0 @@
-What:		/sys/class/fpga_manager/<fpga>/name
-Date:		August 2015
-KernelVersion:	4.3
-Contact:	Alan Tull <atull@opensource.altera.com>
-Description:	Name of low level fpga manager driver.
-
-What:		/sys/class/fpga_manager/<fpga>/state
-Date:		August 2015
-KernelVersion:	4.3
-Contact:	Alan Tull <atull@opensource.altera.com>
-Description:	Read fpga manager state as a string.
-		The intent is to provide enough detail that if something goes
-		wrong during FPGA programming (something that the driver can't
-		fix) then userspace can know, i.e. if the firmware request
-		fails, that could be due to not being able to find the firmware
-		file.
-
-		This is a superset of FPGA states and fpga manager driver
-		states.  The fpga manager driver is walking through these steps
-		to get the FPGA into a known operating state.  It's a sequence,
-		though some steps may get skipped.  Valid FPGA states will vary
-		by manufacturer; this is a superset.
-
-		* unknown		= can't determine state
-		* power off		= FPGA power is off
-		* power up		= FPGA reports power is up
-		* reset			= FPGA held in reset state
-		* firmware request	= firmware class request in progress
-		* firmware request error = firmware request failed
-		* write init		= preparing FPGA for programming
-		* write init error	= Error while preparing FPGA for
-					  programming
-		* write			= FPGA ready to receive image data
-		* write error		= Error while programming
-		* write complete	= Doing post programming steps
-		* write complete error	= Error while doing post programming
-		* operating		= FPGA is programmed and operating
--- a/Documentation/ABI/testing/sysfs-class-infiniband
+++ b/Documentation/ABI/testing/sysfs-class-infiniband
@@ -1,16 +0,0 @@
-What:		/sys/class/infiniband/<hca>/ports/<port-number>/gid_attrs/ndevs/<gid-index>
-Date:		November 29, 2015
-KernelVersion:	4.4.0
-Contact:	linux-rdma@vger.kernel.org
-Description: 	The net-device's name associated with the GID resides
-		at index <gid-index>.
-
-What:		/sys/class/infiniband/<hca>/ports/<port-number>/gid_attrs/types/<gid-index>
-Date:		November 29, 2015
-KernelVersion:	4.4.0
-Contact:	linux-rdma@vger.kernel.org
-Description: 	The RoCE type of the associated GID resides at index <gid-index>.
-		This could either be "IB/RoCE v1" for IB and RoCE v1 based GODs
-		or "RoCE v2" for RoCE v2 based GIDs.
-
-
--- a/Documentation/ABI/testing/sysfs-class-led
+++ b/Documentation/ABI/testing/sysfs-class-led
@@ -24,8 +24,7 @@ Description:
 		of led events.
 		You can change triggers in a similar manner to the way an IO
 		scheduler is chosen. Trigger specific parameters can appear in
-		/sys/class/leds/<led> once a given trigger is selected. For
-		their documentation see sysfs-class-led-trigger-*.
+		/sys/class/leds/<led> once a given trigger is selected.

 What:		/sys/class/leds/<led>/inverted
 Date:		January 2011
--- a/Documentation/ABI/testing/sysfs-class-led-flash
+++ b/Documentation/ABI/testing/sysfs-class-led-flash
@@ -1,80 +0,0 @@
-What:		/sys/class/leds/<led>/flash_brightness
-Date:		March 2015
-KernelVersion:	4.0
-Contact:	Jacek Anaszewski <j.anaszewski@samsung.com>
-Description:	read/write
-		Set the brightness of this LED in the flash strobe mode, in
-		microamperes. The file is created only for the flash LED devices
-		that support setting flash brightness.
-
-		The value is between 0 and
-		/sys/class/leds/<led>/max_flash_brightness.
-
-What:		/sys/class/leds/<led>/max_flash_brightness
-Date:		March 2015
-KernelVersion:	4.0
-Contact:	Jacek Anaszewski <j.anaszewski@samsung.com>
-Description:	read only
-		Maximum brightness level for this LED in the flash strobe mode,
-		in microamperes.
-
-What:		/sys/class/leds/<led>/flash_timeout
-Date:		March 2015
-KernelVersion:	4.0
-Contact:	Jacek Anaszewski <j.anaszewski@samsung.com>
-Description:	read/write
-		Hardware timeout for flash, in microseconds. The flash strobe
-		is stopped after this period of time has passed from the start
-		of the strobe. The file is created only for the flash LED
-		devices that support setting flash timeout.
-
-What:		/sys/class/leds/<led>/max_flash_timeout
-Date:		March 2015
-KernelVersion:	4.0
-Contact:	Jacek Anaszewski <j.anaszewski@samsung.com>
-Description:	read only
-		Maximum flash timeout for this LED, in microseconds.
-
-What:		/sys/class/leds/<led>/flash_strobe
-Date:		March 2015
-KernelVersion:	4.0
-Contact:	Jacek Anaszewski <j.anaszewski@samsung.com>
-Description:	read/write
-		Flash strobe state. When written with 1 it triggers flash strobe
-		and when written with 0 it turns the flash off.
-
-		On read 1 means that flash is currently strobing and 0 means
-		that flash is off.
-
-What:		/sys/class/leds/<led>/flash_fault
-Date:		March 2015
-KernelVersion:	4.0
-Contact:	Jacek Anaszewski <j.anaszewski@samsung.com>
-Description:	read only
-		Space separated list of flash faults that may have occurred.
-		Flash faults are re-read after strobing the flash. Possible
-		flash faults:
-
-		* led-over-voltage - flash controller voltage to the flash LED
-			has exceeded the limit specific to the flash controller
-		* flash-timeout-exceeded - the flash strobe was still on when
-			the timeout set by the user has expired; not all flash
-			controllers may set this in all such conditions
-		* controller-over-temperature - the flash controller has
-			overheated
-		* controller-short-circuit - the short circuit protection
-			of the flash controller has been triggered
-		* led-power-supply-over-current - current in the LED power
-			supply has exceeded the limit specific to the flash
-			controller
-		* indicator-led-fault - the flash controller has detected
-			a short or open circuit condition on the indicator LED
-		* led-under-voltage - flash controller voltage to the flash
-			LED has been below the minimum limit specific to
-			the flash
-		* controller-under-voltage - the input voltage of the flash
-			controller is below the limit under which strobing the
-			flash at full current will not be possible;
-			the condition persists until this flag is no longer set
-		* led-over-temperature - the temperature of the LED has exceeded
-			its allowed upper limit
--- a/Documentation/ABI/testing/sysfs-class-led-trigger-oneshot
+++ b/Documentation/ABI/testing/sysfs-class-led-trigger-oneshot
@@ -1,36 +0,0 @@
-What:		/sys/class/leds/<led>/delay_on
-Date:		Jun 2012
-KernelVersion:	3.6
-Contact:	linux-leds@vger.kernel.org
-Description:
-		Specifies for how many milliseconds the LED has to stay at
-		LED_FULL brightness after it has been armed.
-		Defaults to 100 ms.
-
-What:		/sys/class/leds/<led>/delay_off
-Date:		Jun 2012
-KernelVersion:	3.6
-Contact:	linux-leds@vger.kernel.org
-Description:
-		Specifies for how many milliseconds the LED has to stay at
-		LED_OFF brightness after it has been armed.
-		Defaults to 100 ms.
-
-What:		/sys/class/leds/<led>/invert
-Date:		Jun 2012
-KernelVersion:	3.6
-Contact:	linux-leds@vger.kernel.org
-Description:
-		Reverse the blink logic. If set to 0 (default) blink on for
-		delay_on ms, then blink off for delay_off ms, leaving the LED
-		normally off. If set to 1, blink off for delay_off ms, then
-		blink on for delay_on ms, leaving the LED normally on.
-		Setting this value also immediately changes the LED state.
-
-What:		/sys/class/leds/<led>/shot
-Date:		Jun 2012
-KernelVersion:	3.6
-Contact:	linux-leds@vger.kernel.org
-Description:
-		Write any non-empty string to signal an events, this starts a
-		blink sequence if not already running.
--- a/Documentation/ABI/testing/sysfs-class-led-trigger-usbport
+++ b/Documentation/ABI/testing/sysfs-class-led-trigger-usbport
@@ -1,12 +0,0 @@
-What:		/sys/class/leds/<led>/ports/<port>
-Date:		September 2016
-KernelVersion:	4.9
-Contact:	linux-leds@vger.kernel.org
-		linux-usb@vger.kernel.org
-Description:
-		Every dir entry represents a single USB port that can be
-		selected for the USB port trigger. Selecting ports makes trigger
-		observing them for any connected devices and lighting on LED if
-		there are any.
-		Echoing "1" value selects USB port. Echoing "0" unselects it.
-		Current state can be also read.
--- a/Documentation/ABI/testing/sysfs-class-mic.txt
+++ b/Documentation/ABI/testing/sysfs-class-mic.txt
@@ -41,15 +41,18 @@ Description:
 		When read, this entry provides the current state of an Intel
 		MIC device in the context of the card OS. Possible values that
 		will be read are:
-		"ready" - The MIC device is ready to boot the card OS. On
+		"offline" - The MIC device is ready to boot the card OS. On
 		reading this entry after an OSPM resume, a "boot" has to be
 		written to this entry if the card was previously shutdown
 		during OSPM suspend.
-		"booting" - The MIC device has initiated booting a card OS.
-		"online" - The MIC device has completed boot and is online
+		"online" - The MIC device has initiated booting a card OS.
 		"shutting_down" - The card OS is shutting down.
-		"resetting" - A reset has been initiated for the MIC device
 		"reset_failed" - The MIC device has failed to reset.
+		"suspending" - The MIC device is currently being prepared for
+		suspend. On reading this entry, a "suspend" has to be written
+		to the state sysfs entry to ensure the card is shutdown during
+		OSPM suspend.
+		"suspended" - The MIC device has been suspended.

 		When written, this sysfs entry triggers different state change
 		operations depending upon the current state of the card OS.
@@ -59,6 +62,8 @@ Description:
 			sysfs entries.
 		"reset" - Initiates device reset.
 		"shutdown" - Initiates card OS shutdown.
+		"suspend" - Initiates card OS shutdown and also marks the card
+		as suspended.

 What:		/sys/class/mic/mic(x)/shutdown_status
 Date:		October 2013
@@ -121,7 +126,7 @@ Description:
 		the card. This sysfs entry can be written with the following
 		valid strings:
 		a) linux - Boot a Linux image.
-		b) flash - Boot an image for flash updates.
+		b) elf - Boot an elf image for flash updates.

 What:		/sys/class/mic/mic(x)/log_buf_addr
 Date:		October 2013
@@ -150,17 +155,3 @@ Description:
 		daemon to set the log buffer length address. The correct log
 		buffer length address to be written can be found in the
 		System.map file of the card OS.
-
-What:		/sys/class/mic/mic(x)/heartbeat_enable
-Date:		March 2015
-KernelVersion:	4.4
-Contact:	Ashutosh Dixit <ashutosh.dixit@intel.com>
-Description:
-		The MIC drivers detect and inform user space about card crashes
-		via a heartbeat mechanism (see the description of
-		shutdown_status above). User space can turn off this
-		notification by setting heartbeat_enable to 0 and enable it by
-		setting this entry to 1. If this notification is disabled it is
-		the responsibility of user space to detect card crashes via
-		alternative means such as a network ping. This setting is
-		enabled by default.
--- a/Documentation/ABI/testing/sysfs-class-mtd
+++ b/Documentation/ABI/testing/sysfs-class-mtd
@@ -222,13 +222,3 @@ Description:
 		The number of blocks that are marked as reserved, if any, in
 		this partition. These are typically used to store the in-flash
 		bad block table (BBT).
-
-What:		/sys/class/mtd/mtdX/offset
-Date:		March 2015
-KernelVersion:	4.1
-Contact:	linux-mtd@lists.infradead.org
-Description:
-		For a partition, the offset of that partition from the start
-		of the master device in bytes. This attribute is absent on
-		main devices, so it can be used to distinguish between
-		partitions and devices that aren't partitions.
--- a/Documentation/ABI/testing/sysfs-class-net
+++ b/Documentation/ABI/testing/sysfs-class-net
@@ -39,25 +39,6 @@ Description:
 		Format is a string, e.g: 00:11:22:33:44:55 for an Ethernet MAC
 		address.

-What:		/sys/class/net/<bridge iface>/bridge/group_fwd_mask
-Date:		January 2012
-KernelVersion:	3.2
-Contact:	netdev@vger.kernel.org
-Description:
-		Bitmask to allow forwarding of link local frames with address
-		01-80-C2-00-00-0X on a bridge device. Only values that set bits
-		not matching BR_GROUPFWD_RESTRICTED in net/bridge/br_private.h
-		allowed.
-		Default value 0 does not forward any link local frames.
-
-		Restricted bits:
-		0: 01-80-C2-00-00-00 Bridge Group Address used for STP
-		1: 01-80-C2-00-00-01 (MAC Control) 802.3 used for MAC PAUSE
-		2: 01-80-C2-00-00-02 (Link Aggregation) 802.3ad
-
-		Any values not setting these bits can be used. Take special
-		care when forwarding control frames e.g. 802.1X-PAE or LLDP.
-
 What:		/sys/class/net/<iface>/broadcast
 Date:		April 2005
 KernelVersion:	2.6.12
@@ -207,14 +188,6 @@ Description:
 		Indicates the interface unique physical port identifier within
 		the NIC, as a string.

-What:		/sys/class/net/<iface>/phys_port_name
-Date:		March 2015
-KernelVersion:	4.0
-Contact:	netdev@vger.kernel.org
-Description:
-		Indicates the interface physical port name within the NIC,
-		as a string.
-
 What:		/sys/class/net/<iface>/speed
 Date:		October 2009
 KernelVersion:	2.6.33
--- a/Documentation/ABI/testing/sysfs-class-net-batman-adv
+++ b/Documentation/ABI/testing/sysfs-class-net-batman-adv
@@ -1,11 +1,4 @@

-What:           /sys/class/net/<iface>/batman-adv/elp_interval
-Date:           Feb 2014
-Contact:        Linus Lüssing <linus.luessing@web.de>
-Description:
-                Defines the interval in milliseconds in which batman
-                emits probing packets for neighbor sensing (ELP).
-
 What:           /sys/class/net/<iface>/batman-adv/iface_status
 Date:           May 2010
 Contact:        Marek Lindner <mareklindner@neomailbox.ch>
@@ -20,11 +13,3 @@ Description:
                displays the batman mesh interface this <iface>
                currently is associated with.

-What:           /sys/class/net/<iface>/batman-adv/throughput_override
-Date:           Feb 2014
-Contact:        Antonio Quartulli <a@unstable.cc>
-description:
-                Defines the throughput value to be used by B.A.T.M.A.N. V
-                when estimating the link throughput using this interface.
-                If the value is set to 0 then batman-adv will try to
-                estimate the throughput by itself.
--- a/Documentation/ABI/testing/sysfs-class-net-cdc_ncm
+++ b/Documentation/ABI/testing/sysfs-class-net-cdc_ncm
@@ -19,25 +19,6 @@ Description:
 		Set to 0 to pad all frames. Set greater than tx_max to
 		disable all padding.

-What:		/sys/class/net/<iface>/cdc_ncm/ndp_to_end
-Date:		Dec 2015
-KernelVersion:	4.5
-Contact:	Bjørn Mork <bjorn@mork.no>
-Description:
-		Boolean attribute showing the status of the "NDP to
-		end" quirk.  Defaults to 'N', except for devices
-		already known to need it enabled.
-
-		The "NDP to end" quirk makes the driver place the NDP
-		(the packet index table) after the payload.  The NCM
-		specification does not mandate this, but some devices
-		are known to be more restrictive. Write 'Y' to this
-		attribute for temporary testing of a suspect device
-		failing to work with the default driver settings.
-
-		A device entry should be added to the driver if this
-		quirk is found to be required.
-
 What:		/sys/class/net/<iface>/cdc_ncm/rx_max
 Date:		May 2014
 KernelVersion:	3.16
--- a/Documentation/ABI/testing/sysfs-class-net-janz-ican3
+++ b/Documentation/ABI/testing/sysfs-class-net-janz-ican3
@@ -1,19 +0,0 @@
-What:		/sys/class/net/<iface>/termination
-Date:		May 2010
-KernelVersion:	2.6.35
-Contact:	Ira W. Snyder <ira.snyder@gmail.com>
-Description:
-		Value representing the can bus termination
-
-		Default: 1 (termination active)
-		Reading: get actual termination state
-		Writing: set actual termination state (0=no termination, 1=termination active)
-
-What:		/sys/class/net/<iface>/fwinfo
-Date:		May 2015
-KernelVersion:	3.19
-Contact:	Andreas Gröger <andreas24groeger@gmail.com>
-Description:
-		Firmware stamp of ican3 module
-		Read-only: 32 byte string identification of the ICAN3 module
-		(known values: "JANZ-ICAN3 ICANOS 1.xx", "JANZ-ICAN3 CAL/CANopen 1.xx")
--- a/Documentation/ABI/testing/sysfs-class-net-mesh
+++ b/Documentation/ABI/testing/sysfs-class-net-mesh
@@ -8,7 +8,7 @@ Description:

 What:           /sys/class/net/<mesh_iface>/mesh/<vlan_subdir>/ap_isolation
 Date:           May 2011
-Contact:        Antonio Quartulli <a@unstable.cc>
+Contact:        Antonio Quartulli <antonio@meshcoding.com>
 Description:
                Indicates whether the data traffic going from a
                wireless client to another wireless client will be
@@ -70,7 +70,7 @@ Description:

 What:		/sys/class/net/<mesh_iface>/mesh/isolation_mark
 Date:		Nov 2013
-Contact:	Antonio Quartulli <a@unstable.cc>
+Contact:	Antonio Quartulli <antonio@meshcoding.com>
 Description:
 		Defines the isolation mark (and its bitmask) which
 		is used to classify clients as "isolated" by the
--- a/Documentation/ABI/testing/sysfs-class-net-qmi
+++ b/Documentation/ABI/testing/sysfs-class-net-qmi
@@ -1,23 +0,0 @@
-What:		/sys/class/net/<iface>/qmi/raw_ip
-Date:		Dec 2015
-KernelVersion:	4.4
-Contact:	Bjørn Mork <bjorn@mork.no>
-Description:
-		Boolean.  Default: 'N'
-
-		Set this to 'Y' to change the network device link
-		framing from '802.3' to 'raw-ip'.
-
-		The netdev will change to reflect the link framing
-		mode.  The netdev is an ordinary ethernet device in
-		'802.3' mode, and the driver expects to exchange
-		frames with an ethernet header over the USB link. The
-		netdev is a headerless p-t-p device in 'raw-ip' mode,
-		and the driver expects to echange IPv4 or IPv6 packets
-		without any L2 header over the USB link.
-
-		Userspace is in full control of firmware configuration
-		through the delegation of the QMI protocol. Userspace
-		is responsible for coordination of driver and firmware
-		link framing mode, changing this setting to 'Y' if the
-		firmware is configured for 'raw-ip' mode.
--- a/Documentation/ABI/testing/sysfs-class-net-queues
+++ b/Documentation/ABI/testing/sysfs-class-net-queues
@@ -24,14 +24,6 @@ Description:
 		Indicates the number of transmit timeout events seen by this
 		network interface transmit queue.

-What:		/sys/class/<iface>/queues/tx-<queue>/tx_maxrate
-Date:		March 2015
-KernelVersion:	4.1
-Contact:	netdev@vger.kernel.org
-Description:
-		A Mbps max-rate set for the queue, a value of zero means disabled,
-		default is disabled.
-
 What:		/sys/class/<iface>/queues/tx-<queue>/xps_cpus
 Date:		November 2010
 KernelVersion:	2.6.38
--- a/Documentation/ABI/testing/sysfs-class-power
+++ b/Documentation/ABI/testing/sysfs-class-power
@@ -22,7 +22,7 @@ Description:
 What:		/sys/class/power_supply/max14577-charger/device/fast_charge_timer
 Date:		October 2014
 KernelVersion:	3.18.0
-Contact:	Krzysztof Kozlowski <krzk@kernel.org>
+Contact:	Krzysztof Kozlowski <k.kozlowski@samsung.com>
 Description:
 		This entry shows and sets the maximum time the max14577
 		charger operates in fast-charge mode. When the timer expires
@@ -36,7 +36,7 @@ Description:
 What:		/sys/class/power_supply/max77693-charger/device/fast_charge_timer
 Date:		January 2015
 KernelVersion:	3.19.0
-Contact:	Krzysztof Kozlowski <krzk@kernel.org>
+Contact:	Krzysztof Kozlowski <k.kozlowski@samsung.com>
 Description:
 		This entry shows and sets the maximum time the max77693
 		charger operates in fast-charge mode. When the timer expires
@@ -50,7 +50,7 @@ Description:
 What:		/sys/class/power_supply/max77693-charger/device/top_off_threshold_current
 Date:		January 2015
 KernelVersion:	3.19.0
-Contact:	Krzysztof Kozlowski <krzk@kernel.org>
+Contact:	Krzysztof Kozlowski <k.kozlowski@samsung.com>
 Description:
 		This entry shows and sets the charging current threshold for
 		entering top-off charging mode. When charging current in fast
@@ -65,7 +65,7 @@ Description:
 What:		/sys/class/power_supply/max77693-charger/device/top_off_timer
 Date:		January 2015
 KernelVersion:	3.19.0
-Contact:	Krzysztof Kozlowski <krzk@kernel.org>
+Contact:	Krzysztof Kozlowski <k.kozlowski@samsung.com>
 Description:
 		This entry shows and sets the maximum time the max77693
 		charger operates in top-off charge mode. When the timer expires
@@ -74,61 +74,3 @@ Description:

 		Valid values:
 		- 0 - 70 (minutes), step by 10 (rounded down)
-
-What:		/sys/class/power_supply/bq24257-charger/ovp_voltage
-Date:		October 2015
-KernelVersion:	4.4.0
-Contact:	Andreas Dannenberg <dannenberg@ti.com>
-Description:
-		This entry configures the overvoltage protection feature of bq24257-
-		type charger devices. This feature protects the device and other
-		components against damage from overvoltage on the input supply. See
-		device datasheet for details.
-
-		Valid values:
-		- 6000000, 6500000, 7000000, 8000000, 9000000, 9500000, 10000000,
-		  10500000 (all uV)
-
-What:		/sys/class/power_supply/bq24257-charger/in_dpm_voltage
-Date:		October 2015
-KernelVersion:	4.4.0
-Contact:	Andreas Dannenberg <dannenberg@ti.com>
-Description:
-		This entry configures the input dynamic power path management voltage of
-		bq24257-type charger devices. Once the supply drops to the configured
-		voltage, the input current limit is reduced down to prevent the further
-		drop of the supply. When the IC enters this mode, the charge current is
-		lower than the set value. See device datasheet for details.
-
-		Valid values:
-		- 4200000, 4280000, 4360000, 4440000, 4520000, 4600000, 4680000,
-		  4760000 (all uV)
-
-What:		/sys/class/power_supply/bq24257-charger/high_impedance_enable
-Date:		October 2015
-KernelVersion:	4.4.0
-Contact:	Andreas Dannenberg <dannenberg@ti.com>
-Description:
-		This entry allows enabling the high-impedance mode of bq24257-type
-		charger devices. If enabled, it places the charger IC into low power
-		standby mode with the switch mode controller disabled. When disabled,
-		the charger operates normally. See device datasheet for details.
-
-		Valid values:
-		- 1: enabled
-		- 0: disabled
-
-What:		/sys/class/power_supply/bq24257-charger/sysoff_enable
-Date:		October 2015
-KernelVersion:	4.4.0
-Contact:	Andreas Dannenberg <dannenberg@ti.com>
-Description:
-		This entry allows enabling the sysoff mode of bq24257-type charger
-		devices. If enabled and the input is removed, the internal battery FET
-		is turned off in order to reduce the leakage from the BAT pin to less
-		than 1uA. Note that on some devices/systems this disconnects the battery
-		from the system. See device datasheet for details.
-
-		Valid values:
-		- 1: enabled
-		- 0: disabled
--- a/Documentation/ABI/testing/sysfs-class-power-twl4030
+++ b/Documentation/ABI/testing/sysfs-class-power-twl4030
@@ -1,45 +0,0 @@
-What: /sys/class/power_supply/twl4030_ac/max_current
-      /sys/class/power_supply/twl4030_usb/max_current
-Description:
-	Read/Write limit on current which may
-	be drawn from the ac (Accessory Charger) or
-	USB port.
-
-	Value is in micro-Amps.
-
-	Value is set automatically to an appropriate
-	value when a cable is plugged or unplugged.
-
-	Value can the set by writing to the attribute.
-	The change will only persist until the next
-	plug event.  These event are reported via udev.
-
-
-What: /sys/class/power_supply/twl4030_usb/mode
-Description:
-	Changing mode for USB port.
-	Writing to this can disable charging.
-
-	Possible values are:
-		"auto" - draw power as appropriate for detected
-			 power source and battery status.
-		"off"  - do not draw any power.
-		"continuous"
-		       - activate mode described as "linear" in
-		         TWL data sheets.  This uses whatever
-			 current is available and doesn't switch off
-			 when voltage drops.
-
-			 This is useful for unstable power sources
-			 such as bicycle dynamo, but care should
-			 be taken that battery is not over-charged.
-
-What: /sys/class/power_supply/twl4030_ac/mode
-Description:
-	Changing mode for 'ac' port.
-	Writing to this can disable charging.
-
-	Possible values are:
-		"auto" - draw power as appropriate for detected
-			 power source and battery status.
-		"off"  - do not draw any power.
--- a/Documentation/ABI/testing/sysfs-class-pwm
+++ b/Documentation/ABI/testing/sysfs-class-pwm
@@ -77,12 +77,3 @@ Description:
 		Enable/disable the PWM signal.
 		0 is disabled
 		1 is enabled
-
-What:		/sys/class/pwm/pwmchipN/pwmX/capture
-Date:		June 2016
-KernelVersion:	4.8
-Contact:	Lee Jones <lee.jones@linaro.org>
-Description:
-		Capture information about a PWM signal. The output format is a
-		pair unsigned integers (period and duty cycle), separated by a
-		single space.
--- a/Documentation/ABI/testing/sysfs-class-rc-nuvoton
+++ b/Documentation/ABI/testing/sysfs-class-rc-nuvoton
@@ -1,15 +0,0 @@
-What:		/sys/class/rc/rcN/wakeup_data
-Date:		Mar 2016
-KernelVersion:	4.6
-Contact:	Mauro Carvalho Chehab <m.chehab@samsung.com>
-Description:
-		Reading this file returns the stored CIR wakeup sequence.
-		It starts with a pulse, followed by a space, pulse etc.
-		All values are in microseconds.
-		The same format can be used to store a wakeup sequence
-		in the Nuvoton chip by writing to this file.
-
-		Note: Some systems reset the stored wakeup sequence to a
-		factory default on each boot. On such systems store the
-		wakeup sequence in a file and set it on boot using e.g.
-		a udev rule.
--- a/Documentation/ABI/testing/sysfs-class-scsi_tape
+++ b/Documentation/ABI/testing/sysfs-class-scsi_tape
@@ -1,109 +0,0 @@
-What:           /sys/class/scsi_tape/*/stats/in_flight
-Date:           Apr 2015
-KernelVersion:  4.2
-Contact:        Shane Seymour <shane.seymour@hp.com>
-Description:
-		Show the number of I/Os currently in-flight between the st
-		module and the SCSI mid-layer.
-Users:
-
-
-What:           /sys/class/scsi_tape/*/stats/io_ns
-Date:           Apr 2015
-KernelVersion:  4.2
-Contact:        Shane Seymour <shane.seymour@hp.com>
-Description:
-		Shows the total amount of time spent waiting for all I/O
-                to and from the tape drive to complete. This includes all
-                reads, writes, and other SCSI commands issued to the tape
-                drive. An example of other SCSI commands would be tape
-                movement such as a rewind when a rewind tape device is
-                closed. This item is measured in nanoseconds.
-
-                To determine the amount of time spent waiting for other I/O
-                to complete subtract read_ns and write_ns from this value.
-Users:
-
-
-What:           /sys/class/scsi_tape/*/stats/other_cnt
-Date:           Apr 2015
-KernelVersion:  4.2
-Contact:        Shane Seymour <shane.seymour@hp.com>
-Description:
-		The number of I/O requests issued to the tape drive other
-		than SCSI read/write requests.
-Users:
-
-
-What:           /sys/class/scsi_tape/*/stats/read_byte_cnt
-Date:           Apr 2015
-KernelVersion:  4.2
-Contact:        Shane Seymour <shane.seymour@hp.com>
-Description:
-		Shows the total number of bytes requested from the tape drive.
-		This value is presented in bytes because tape drives support
-		variable length block sizes.
-Users:
-
-
-What:           /sys/class/scsi_tape/*/stats/read_cnt
-Date:           Apr 2015
-KernelVersion:  4.2
-Contact:        Shane Seymour <shane.seymour@hp.com>
-Description:
-		Shows the total number of read requests issued to the tape
-		drive.
-Users:
-
-
-What:           /sys/class/scsi_tape/*/stats/read_ns
-Date:           Apr 2015
-KernelVersion:  4.2
-Contact:        Shane Seymour <shane.seymour@hp.com>
-Description:
-		Shows the total amount of time in nanoseconds waiting for
-		read I/O requests to complete.
-Users:
-
-
-What:           /sys/class/scsi_tape/*/stats/write_byte_cnt
-Date:           Apr 2015
-KernelVersion:  4.2
-Contact:        Shane Seymour <shane.seymour@hp.com>
-Description:
-		Shows the total number of bytes written to the tape drive.
-		This value is presented in bytes because tape drives support
-		variable length block sizes.
-Users:
-
-
-What:           /sys/class/scsi_tape/*/stats/write_cnt
-Date:           Apr 2015
-KernelVersion:  4.2
-Contact:        Shane Seymour <shane.seymour@hp.com>
-Description:
-		Shows the total number of write requests issued to the tape
-		drive.
-Users:
-
-
-What:           /sys/class/scsi_tape/*/stats/write_ms
-Date:           Apr 2015
-KernelVersion:  4.2
-Contact:        Shane Seymour <shane.seymour@hp.com>
-Description:
-		Shows the total amount of time in nanoseconds waiting for
-		write I/O requests to complete.
-Users:
-
-
-What:           /sys/class/scsi_tape/*/stats/resid_cnt
-Date:           Apr 2015
-KernelVersion:  4.2
-Contact:        Shane Seymour <shane.seymour@hp.com>
-Description:
-		Shows the number of times we found that a residual >0
-		was found when the SCSI midlayer indicated that there was
-		an error. For reads this may be a case of someone issuing
-		reads greater than the block size.
-Users:
--- a/Documentation/ABI/testing/sysfs-class-stm
+++ b/Documentation/ABI/testing/sysfs-class-stm
@@ -1,24 +0,0 @@
-What:		/sys/class/stm/<stm>/masters
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:
-		Shows first and last available to software master numbers on
-		this STM device.
-
-What:		/sys/class/stm/<stm>/channels
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:
-		Shows the number of channels per master on this STM device.
-
-What:		/sys/class/stm/<stm>/hw_override
-Date:		March 2016
-KernelVersion:	4.7
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:
-		Reads as 0 if master numbers in the STP stream produced by
-		this stm device will match the master numbers assigned by
-		the software or 1 if the stm hardware overrides software
-		assigned masters.
--- a/Documentation/ABI/testing/sysfs-class-stm_source
+++ b/Documentation/ABI/testing/sysfs-class-stm_source
@@ -1,11 +0,0 @@
-What:		/sys/class/stm_source/<stm_source>/stm_source_link
-Date:		June 2015
-KernelVersion:	4.3
-Contact:	Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Description:
-		stm_source device linkage to stm device, where its tracing data
-		is directed. Reads return an existing connection or "<none>" if
-		this stm_source is not connected to any stm device yet.
-		Write an existing (registered) stm device's name here to
-		connect that device. If a device is already connected to this
-		stm_source, it will first be disconnected.
--- a/Documentation/ABI/testing/sysfs-class-watchdog
+++ b/Documentation/ABI/testing/sysfs-class-watchdog
@@ -1,51 +0,0 @@
-What:		/sys/class/watchdog/watchdogn/bootstatus
-Date:		August 2015
-Contact:	Wim Van Sebroeck <wim@iguana.be>
-Description:
-		It is a read only file. It contains status of the watchdog
-		device at boot. It is equivalent to WDIOC_GETBOOTSTATUS of
-		ioctl interface.
-
-What:		/sys/class/watchdog/watchdogn/identity
-Date:		August 2015
-Contact:	Wim Van Sebroeck <wim@iguana.be>
-Description:
-		It is a read only file. It contains identity string of
-		watchdog device.
-
-What:		/sys/class/watchdog/watchdogn/nowayout
-Date:		August 2015
-Contact:	Wim Van Sebroeck <wim@iguana.be>
-Description:
-		It is a read only file. While reading, it gives '1' if that
-		device supports nowayout feature else, it gives '0'.
-
-What:		/sys/class/watchdog/watchdogn/state
-Date:		August 2015
-Contact:	Wim Van Sebroeck <wim@iguana.be>
-Description:
-		It is a read only file. It gives active/inactive status of
-		watchdog device.
-
-What:		/sys/class/watchdog/watchdogn/status
-Date:		August 2015
-Contact:	Wim Van Sebroeck <wim@iguana.be>
-Description:
-		It is a read only file. It contains watchdog device's
-		internal status bits. It is equivalent to WDIOC_GETSTATUS
-		of ioctl interface.
-
-What:		/sys/class/watchdog/watchdogn/timeleft
-Date:		August 2015
-Contact:	Wim Van Sebroeck <wim@iguana.be>
-Description:
-		It is a read only file. It contains value of time left for
-		reset generation. It is equivalent to WDIOC_GETTIMELEFT of
-		ioctl interface.
-
-What:		/sys/class/watchdog/watchdogn/timeout
-Date:		August 2015
-Contact:	Wim Van Sebroeck <wim@iguana.be>
-Description:
-		It is a read only file. It is read to know about current
-		value of timeout programmed.
--- a/Documentation/ABI/testing/sysfs-class-zram
+++ b/Documentation/ABI/testing/sysfs-class-zram
@@ -1,24 +0,0 @@
-What:		/sys/class/zram-control/
-Date:		August 2015
-KernelVersion:	4.2
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		The zram-control/ class sub-directory belongs to zram
-		device class
-
-What:		/sys/class/zram-control/hot_add
-Date:		August 2015
-KernelVersion:	4.2
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		RO attribute. Read operation will cause zram to add a new
-		device and return its device id back to user (so one can
-		use /dev/zram<id>), or error code.
-
-What:		/sys/class/zram-control/hot_remove
-Date:		August 2015
-KernelVersion:	4.2
-Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-Description:
-		WO attribute. Remove a specific /dev/zramX device, where X
-		is a device_id provided by user.
--- a/Show More
+++ b/Show More