From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Nov 2015 01:18:30 +0000 (+1100)
Subject: Merge remote-tracking branch 'jc_docs/docs-next'
X-Git-Tag: KARO-TX6UL-2015-11-03~62
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d999b3aef28863a07396eb396035aac1f8abd96c;hp=-c;p=karo-tx-linux.git

Merge remote-tracking branch 'jc_docs/docs-next'
---

d999b3aef28863a07396eb396035aac1f8abd96c
diff --combined Documentation/Changes
index f447f0516f07,268a849c4cc0..ec97b77c8b00
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@@ -43,7 -43,8 +43,8 @@@ o  udev                   08
  o  grub                   0.93                    # grub --version || grub-install --version
  o  mcelog                 0.6                     # mcelog --version
  o  iptables               1.4.2                   # iptables -V
 -o  openssl & libcrypto    1.0.1k                  # openssl version
 +o  openssl & libcrypto    1.0.0                   # openssl version
+ o  bc                     1.06.95                 # bc --version
  
  
  Kernel compilation
diff --combined Documentation/DocBook/Makefile
index 810f466238d3,d2544961b67a..91f6d89bb19f
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -14,7 -14,7 +14,7 @@@ DOCBOOKS := z8530book.xml device-driver
  	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
  	    80211.xml debugobjects.xml sh.xml regulator.xml \
  	    alsa-driver-api.xml writing-an-alsa-driver.xml \
 -	    tracepoint.xml drm.xml media_api.xml w1.xml \
 +	    tracepoint.xml gpu.xml media_api.xml w1.xml \
  	    writing_musb_glue_layer.xml crypto-API.xml iio.xml
  
  include Documentation/DocBook/media/Makefile
@@@ -69,6 -69,12 +69,12 @@@ installmandocs: mandoc
  KERNELDOCXMLREF = $(srctree)/scripts/kernel-doc-xml-ref
  KERNELDOC       = $(srctree)/scripts/kernel-doc
  DOCPROC         = $(objtree)/scripts/docproc
+ CHECK_LC_CTYPE = $(objtree)/scripts/check-lc_ctype
+ 
+ # Use a fixed encoding - UTF-8 if the C library has support built-in
+ # or ASCII if not
+ LC_CTYPE := $(call try-run, LC_CTYPE=C.UTF-8 $(CHECK_LC_CTYPE),C.UTF-8,C)
+ export LC_CTYPE
  
  XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl
  XMLTOFLAGS += --skip-validation
diff --combined Documentation/kernel-parameters.txt
index a5a7cfce76e4,f97071ac9b4c..1826ea17e899
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -167,8 -167,7 +167,8 @@@ bytes respectively. Such letter suffixe
  
  	acpi=		[HW,ACPI,X86,ARM64]
  			Advanced Configuration and Power Interface
 -			Format: { force | off | strict | noirq | rsdt }
 +			Format: { force | off | strict | noirq | rsdt |
 +				  copy_dsdt }
  			force -- enable ACPI if default was off
  			off -- disable ACPI if default was on
  			noirq -- do not use ACPI for IRQ routing
@@@ -790,8 -789,10 +790,10 @@@
  			is passed, kernel could allocate physical memory region
  			above 4G, that cause second kernel crash on system
  			that require some amount of low memory, e.g. swiotlb
- 			requires at least 64M+32K low memory.  Kernel would
- 			try to allocate 72M below 4G automatically.
+ 			requires at least 64M+32K low memory, also enough extra
+ 			low memory is needed to make sure DMA buffers for 32-bit
+ 			devices won't run out. Kernel would try to allocate at
+ 			at least 256M below 4G automatically.
  			This one let user to specify own low range under 4G
  			for second kernel instead.
  			0: to disable low allocation.
@@@ -930,11 -931,11 +932,11 @@@
  			The filter can be disabled or changed to another
  			driver later using sysfs.
  
 -	drm_kms_helper.edid_firmware=[<connector>:]<file>
 -			Broken monitors, graphic adapters and KVMs may
 -			send no or incorrect EDID data sets. This parameter
 -			allows to specify an EDID data set in the
 -			/lib/firmware directory that is used instead.
 +	drm_kms_helper.edid_firmware=[<connector>:]<file>[,[<connector>:]<file>]
 +			Broken monitors, graphic adapters, KVMs and EDIDless
 +			panels may send no or incorrect EDID data sets.
 +			This parameter allows to specify an EDID data sets
 +			in the /lib/firmware directory that are used instead.
  			Generic built-in EDID data sets are used, if one of
  			edid/1024x768.bin, edid/1280x1024.bin,
  			edid/1680x1050.bin, or edid/1920x1080.bin is given
@@@ -943,10 -944,7 +945,10 @@@
  			available in Documentation/EDID/HOWTO.txt. An EDID
  			data set will only be used for a particular connector,
  			if its name and a colon are prepended to the EDID
 -			name.
 +			name. Each connector may use a unique EDID data
 +			set by separating the files with a comma.  An EDID
 +			data set with no connector name will be used for
 +			any connectors not explicitly specified.
  
  	dscc4.setup=	[NET]
  
@@@ -975,6 -973,10 +977,10 @@@
  
  	earlycon=	[KNL] Output early console device and options.
  
+ 			When used with no options, the early console is
+ 			determined by the stdout-path property in device
+ 			tree's chosen node.
+ 
  		cdns,<addr>
  			Start an early, polled-mode console on a cadence serial
  			port at the specified address. The cadence serial port
@@@ -1550,9 -1552,6 +1556,9 @@@
  		hwp_only
  			Only load intel_pstate on systems which support
  			hardware P state control (HWP) if available.
 +		no_acpi
 +			Don't use ACPI processor performance control objects
 +			_PSS and _PPC specified limits.
  
  	intremap=	[X86-64, Intel-IOMMU]
  			on	enable Interrupt Remapping (default)
@@@ -2321,11 -2320,12 +2327,12 @@@
  	nmi_watchdog=	[KNL,BUGS=X86] Debugging features for SMP kernels
  			Format: [panic,][nopanic,][num]
  			Valid num: 0 or 1
- 			0 - turn nmi_watchdog off
- 			1 - turn nmi_watchdog on
+ 			0 - turn hardlockup detector in nmi_watchdog off
+ 			1 - turn hardlockup detector in nmi_watchdog on
  			When panic is specified, panic when an NMI watchdog
  			timeout occurs (or 'nopanic' to override the opposite
- 			default).
+ 			default). To disable both hard and soft lockup detectors,
+ 			please see 'nowatchdog'.
  			This is useful when you use a panic=... timeout and
  			need the box quickly up again.
  
diff --combined MAINTAINERS
index bbf296fb27d9,0c98c3c23f98..5ec6b79f9318
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -615,8 -615,9 +615,8 @@@ F:	Documentation/hwmon/fam15h_powe
  F:	drivers/hwmon/fam15h_power.c
  
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 -M:	Thomas Dahlmann <dahlmann.thomas@arcor.de>
  L:	linux-geode@lists.infradead.org (moderated for non-subscribers)
 -S:	Supported
 +S:	Orphan
  F:	drivers/usb/gadget/udc/amd5536udc.*
  
  AMD GEODE PROCESSOR/CHIPSET SUPPORT
@@@ -788,11 -789,6 +788,11 @@@ S:	Maintaine
  F:	drivers/net/appletalk/
  F:	net/appletalk/
  
 +APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT
 +M:	Duc Dang <dhdang@apm.com>
 +S:	Supported
 +F:	arch/arm64/boot/dts/apm/
 +
  APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
  M:	Iyappan Subramanian <isubramanian@apm.com>
  M:	Keyur Chudgar <kchudgar@apm.com>
@@@ -812,13 -808,6 +812,13 @@@ S:	Maintaine
  F:	drivers/video/fbdev/arcfb.c
  F:	drivers/video/fbdev/core/fb_defio.c
  
 +ARCNET NETWORK LAYER
 +M:	Michael Grzeschik <m.grzeschik@pengutronix.de>
 +L:	netdev@vger.kernel.org
 +S:	Maintained
 +F:	drivers/net/arcnet/
 +F:	include/uapi/linux/if_arcnet.h
 +
  ARM MFM AND FLOPPY DRIVERS
  M:	Ian Molton <spyro@f2s.com>
  S:	Maintained
@@@ -827,13 -816,12 +827,13 @@@ F:	arch/arm/include/asm/floppy.
  
  ARM PMU PROFILING AND DEBUGGING
  M:	Will Deacon <will.deacon@arm.com>
 +R:	Mark Rutland <mark.rutland@arm.com>
  S:	Maintained
 -F:	arch/arm/kernel/perf_*
 +F:	arch/arm*/kernel/perf_*
  F:	arch/arm/oprofile/common.c
 -F:	arch/arm/kernel/hw_breakpoint.c
 -F:	arch/arm/include/asm/hw_breakpoint.h
 -F:	arch/arm/include/asm/perf_event.h
 +F:	arch/arm*/kernel/hw_breakpoint.c
 +F:	arch/arm*/include/asm/hw_breakpoint.h
 +F:	arch/arm*/include/asm/perf_event.h
  F:	drivers/perf/arm_pmu.c
  F:	include/linux/perf/arm_pmu.h
  
@@@ -900,12 -888,11 +900,12 @@@ M:	Lennert Buytenhek <kernel@wantstofly
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:	Maintained
  
 -ARM/Allwinner A1X SoC support
 +ARM/Allwinner sunXi SoC support
  M:	Maxime Ripard <maxime.ripard@free-electrons.com>
 +M:	Chen-Yu Tsai <wens@csie.org>
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:	Maintained
 -N:	sun[x4567]i
 +N:	sun[x456789]i
  
  ARM/Allwinner SoC Clock Support
  M:	Emilio López <emilio@elopez.com.ar>
@@@ -924,7 -911,7 +924,7 @@@ M:	Tsahee Zidenberg <tsahee@annapurnala
  S:	Maintained
  F:	arch/arm/mach-alpine/
  
 -ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
 +ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
  M:	Nicolas Ferre <nicolas.ferre@atmel.com>
  M:	Alexandre Belloni <alexandre.belloni@free-electrons.com>
  M:	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
@@@ -1237,13 -1224,6 +1237,13 @@@ ARM/LPC18XX ARCHITECTUR
  M:	Joachim Eastwood <manabian@gmail.com>
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:	Maintained
 +F:	arch/arm/boot/dts/lpc43*
 +F:	drivers/clk/nxp/clk-lpc18xx*
 +F:	drivers/clocksource/time-lpc32xx.c
 +F:	drivers/i2c/busses/i2c-lpc2k.c
 +F:	drivers/memory/pl172.c
 +F:	drivers/mtd/spi-nor/nxp-spifi.c
 +F:	drivers/rtc/rtc-lpc24xx.c
  N:	lpc18xx
  
  ARM/MAGICIAN MACHINE SUPPORT
@@@ -1458,12 -1438,7 +1458,12 @@@ F:	arch/arm/mach-exynos*
  F:	drivers/*/*s3c2410*
  F:	drivers/*/*/*s3c2410*
  F:	drivers/spi/spi-s3c*
 +F:	drivers/soc/samsung/*
  F:	sound/soc/samsung/*
 +F:	Documentation/arm/Samsung/
 +F:	Documentation/devicetree/bindings/arm/samsung/
 +F:	Documentation/devicetree/bindings/sram/samsung-sram.txt
 +F:	Documentation/devicetree/bindings/power/pd-samsung.txt
  N:	exynos
  
  ARM/SAMSUNG MOBILE MACHINE SUPPORT
@@@ -1498,14 -1473,6 +1498,14 @@@ L:	linux-media@vger.kernel.or
  S:	Maintained
  F:	drivers/media/platform/s5p-tv/
  
 +ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
 +M:	Andrzej Pietrasiewicz <andrzej.p@samsung.com>
 +M:	Jacek Anaszewski <j.anaszewski@samsung.com>
 +L:	linux-arm-kernel@lists.infradead.org
 +L:	linux-media@vger.kernel.org
 +S:	Maintained
 +F:	drivers/media/platform/s5p-jpeg/
 +
  ARM/SHMOBILE ARM ARCHITECTURE
  M:	Simon Horman <horms@verge.net.au>
  M:	Magnus Damm <magnus.damm@gmail.com>
@@@ -1518,6 -1485,8 +1518,6 @@@ F:	arch/arm/boot/dts/emev2
  F:	arch/arm/boot/dts/r7s*
  F:	arch/arm/boot/dts/r8a*
  F:	arch/arm/boot/dts/sh*
 -F:	arch/arm/configs/bockw_defconfig
 -F:	arch/arm/configs/marzen_defconfig
  F:	arch/arm/configs/shmobile_defconfig
  F:	arch/arm/include/debug/renesas-scif.S
  F:	arch/arm/mach-shmobile/
@@@ -1552,7 -1521,6 +1552,7 @@@ W:	http://www.stlinux.co
  S:	Maintained
  F:	arch/arm/mach-sti/
  F:	arch/arm/boot/dts/sti*
 +F:	drivers/char/hw_random/st-rng.c
  F:	drivers/clocksource/arm_global_timer.c
  F:	drivers/clocksource/clksrc_st_lpc.c
  F:	drivers/i2c/busses/i2c-st.c
@@@ -1632,10 -1600,7 +1632,10 @@@ M:	Masahiro Yamada <yamada.masahiro@soc
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:	Maintained
  F:	arch/arm/boot/dts/uniphier*
 +F:	arch/arm/include/asm/hardware/cache-uniphier.h
  F:	arch/arm/mach-uniphier/
 +F:	arch/arm/mm/cache-uniphier.c
 +F:	drivers/i2c/busses/i2c-uniphier*
  F:	drivers/pinctrl/uniphier/
  F:	drivers/tty/serial/8250/8250_uniphier.c
  N:	uniphier
@@@ -2389,27 -2354,19 +2389,27 @@@ L:	linux-scsi@vger.kernel.or
  S:	Supported
  F:	drivers/scsi/bnx2i/
  
 -BROADCOM CYGNUS/IPROC ARM ARCHITECTURE
 +BROADCOM IPROC ARM ARCHITECTURE
  M:	Ray Jui <rjui@broadcom.com>
  M:	Scott Branden <sbranden@broadcom.com>
 +M:	Jon Mason <jonmason@broadcom.com>
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:	bcm-kernel-feedback-list@broadcom.com
  T:	git git://github.com/broadcom/cygnus-linux.git
  S:	Maintained
  N:	iproc
  N:	cygnus
 +N:	nsp
  N:	bcm9113*
  N:	bcm9583*
 -N:	bcm583*
 +N:	bcm9585*
 +N:	bcm9586*
 +N:	bcm988312
  N:	bcm113*
 +N:	bcm583*
 +N:	bcm585*
 +N:	bcm586*
 +N:	bcm88312
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:	Gregory Fong <gregory.0xf0@gmail.com>
@@@ -2767,10 -2724,9 +2767,10 @@@ S:	Supporte
  F:	drivers/net/ethernet/cisco/enic/
  
  CISCO VIC LOW LATENCY NIC DRIVER
 -M:	Upinder Malhi <umalhi@cisco.com>
 +M:	Christian Benvenuti <benve@cisco.com>
 +M:	Dave Goodell <dgoodell@cisco.com>
  S:	Supported
 -F:	drivers/infiniband/hw/usnic
 +F:	drivers/infiniband/hw/usnic/
  
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
  M:	Hartley Sweeten <hsweeten@visionengravers.com>
@@@ -3405,7 -3361,6 +3405,7 @@@ M:	Support Opensource <support.opensour
  W:	http://www.dialog-semiconductor.com/products
  S:	Supported
  F:	Documentation/hwmon/da90??
 +F:	Documentation/devicetree/bindings/sound/da[79]*.txt
  F:	drivers/gpio/gpio-da90??.c
  F:	drivers/hwmon/da90??-hwmon.c
  F:	drivers/iio/adc/da91??-*.c
@@@ -3439,6 -3394,7 +3439,6 @@@ F:	drivers/staging/dgnc
  
  DIGI EPCA PCI PRODUCTS
  M:	Lidza Louina <lidza.louina@gmail.com>
 -M:	Mark Hounschell <markh@compro.net>
  M:	Daeseok Youn <daeseok.youn@gmail.com>
  L:	driverdev-devel@linuxdriverproject.org
  S:	Maintained
@@@ -3540,13 -3496,15 +3540,15 @@@ M:	Jonathan Corbet <corbet@lwn.net
  L:	linux-doc@vger.kernel.org
  S:	Maintained
  F:	Documentation/
+ F:	scripts/docproc.c
+ F:	scripts/kernel-doc*
  X:	Documentation/ABI/
  X:	Documentation/devicetree/
  X:	Documentation/acpi
  X:	Documentation/power
  X:	Documentation/spi
  X:	Documentation/DocBook/media
- T:	git git://git.lwn.net/linux-2.6.git docs-next
+ T:	git git://git.lwn.net/linux.git docs-next
  
  DOUBLETALK DRIVER
  M:	"James R. Van Zandt" <jrv@vanzandt.mv.com>
@@@ -3623,7 -3581,6 +3625,7 @@@ M:	Daniel Vetter <daniel.vetter@intel.c
  M:	Jani Nikula <jani.nikula@linux.intel.com>
  L:	intel-gfx@lists.freedesktop.org
  L:	dri-devel@lists.freedesktop.org
 +W:	https://01.org/linuxgraphics/
  Q:	http://patchwork.freedesktop.org/project/intel-gfx/
  T:	git git://anongit.freedesktop.org/drm-intel
  S:	Supported
@@@ -3631,13 -3588,6 +3633,13 @@@ F:	drivers/gpu/drm/i915
  F:	include/drm/i915*
  F:	include/uapi/drm/i915*
  
 +DRM DRIVERS FOR ATMEL HLCDC
 +M:	Boris Brezillon <boris.brezillon@free-electrons.com>
 +L:	dri-devel@lists.freedesktop.org
 +S:	Supported
 +F:	drivers/gpu/drm/atmel-hlcdc/
 +F:	Documentation/devicetree/bindings/drm/atmel/
 +
  DRM DRIVERS FOR EXYNOS
  M:	Inki Dae <inki.dae@samsung.com>
  M:	Joonyoung Shim <jy0922.shim@samsung.com>
@@@ -3666,14 -3616,6 +3668,14 @@@ S:	Maintaine
  F:	drivers/gpu/drm/imx/
  F:	Documentation/devicetree/bindings/drm/imx/
  
 +DRM DRIVERS FOR GMA500 (Poulsbo, Moorestown and derivative chipsets)
 +M:	Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
 +L:	dri-devel@lists.freedesktop.org
 +T:	git git://github.com/patjak/drm-gma500
 +S:	Maintained
 +F:	drivers/gpu/drm/gma500
 +F:	include/drm/gma500*
 +
  DRM DRIVERS FOR NVIDIA TEGRA
  M:	Thierry Reding <thierry.reding@gmail.com>
  M:	Terje Bergström <tbergstrom@nvidia.com>
@@@ -4058,7 -4000,7 +4060,7 @@@ S:	Maintaine
  F:	sound/usb/misc/ua101.c
  
  EXTENSIBLE FIRMWARE INTERFACE (EFI)
 -M:	Matt Fleming <matt.fleming@intel.com>
 +M:	Matt Fleming <matt@codeblueprint.co.uk>
  L:	linux-efi@vger.kernel.org
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
  S:	Maintained
@@@ -4073,7 -4015,7 +4075,7 @@@ F:	include/linux/efi*.
  EFI VARIABLE FILESYSTEM
  M:	Matthew Garrett <matthew.garrett@nebula.com>
  M:	Jeremy Kerr <jk@ozlabs.org>
 -M:	Matt Fleming <matt.fleming@intel.com>
 +M:	Matt Fleming <matt@codeblueprint.co.uk>
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
  L:	linux-efi@vger.kernel.org
  S:	Maintained
@@@ -4467,14 -4409,6 +4469,14 @@@ L:	linuxppc-dev@lists.ozlabs.or
  S:	Maintained
  F:	drivers/net/ethernet/freescale/ucc_geth*
  
 +FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
 +M:	Claudiu Manoil <claudiu.manoil@freescale.com>
 +L:	netdev@vger.kernel.org
 +S:	Maintained
 +F:	drivers/net/ethernet/freescale/gianfar*
 +X:	drivers/net/ethernet/freescale/gianfar_ptp.c
 +F:	Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
 +
  FREESCALE QUICC ENGINE UCC UART DRIVER
  M:	Timur Tabi <timur@tabi.org>
  L:	linuxppc-dev@lists.ozlabs.org
@@@ -5152,7 -5086,6 +5154,7 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/i2c/
  F:	Documentation/i2c/
  F:	drivers/i2c/
 +F:	drivers/i2c/*/
  F:	include/linux/i2c.h
  F:	include/linux/i2c-*.h
  F:	include/uapi/linux/i2c.h
@@@ -5610,7 -5543,7 +5612,7 @@@ F:	drivers/net/wireless/iwlegacy
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:	Johannes Berg <johannes.berg@intel.com>
  M:	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
 -M:	Intel Linux Wireless <ilw@linux.intel.com>
 +M:	Intel Linux Wireless <linuxwifi@intel.com>
  L:	linux-wireless@vger.kernel.org
  W:	http://intellinuxwireless.org
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
@@@ -6021,7 -5954,7 +6023,7 @@@ F:	virt/kvm
  KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
  M:	Joerg Roedel <joro@8bytes.org>
  L:	kvm@vger.kernel.org
 -W:	http://kvm.qumranet.com
 +W:	http://www.linux-kvm.org/
  S:	Maintained
  F:	arch/x86/include/asm/svm.h
  F:	arch/x86/kvm/svm.c
@@@ -6029,7 -5962,7 +6031,7 @@@
  KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
  M:	Alexander Graf <agraf@suse.com>
  L:	kvm-ppc@vger.kernel.org
 -W:	http://kvm.qumranet.com
 +W:	http://www.linux-kvm.org/
  T:	git git://github.com/agraf/linux-2.6.git
  S:	Supported
  F:	arch/powerpc/include/asm/kvm*
@@@ -6157,13 -6090,6 +6159,13 @@@ F:	Documentation/auxdisplay/ks010
  F:	drivers/auxdisplay/ks0108.c
  F:	include/linux/ks0108.h
  
 +L3MDEV
 +M:	David Ahern <dsa@cumulusnetworks.com>
 +L:	netdev@vger.kernel.org
 +S:	Maintained
 +F:	net/l3mdev
 +F:	include/net/l3mdev.h
 +
  LAPB module
  L:	linux-x25@vger.kernel.org
  S:	Orphan
@@@ -6314,14 -6240,6 +6316,14 @@@ F:	drivers/nvdimm/pmem.
  F:	include/linux/pmem.h
  F:	arch/*/include/asm/pmem.h
  
 +LIGHTNVM PLATFORM SUPPORT
 +M:	Matias Bjorling <mb@lightnvm.io>
 +W:	http://github/OpenChannelSSD
 +S:	Maintained
 +F:	drivers/lightnvm/
 +F:	include/linux/lightnvm.h
 +F:	include/uapi/linux/lightnvm.h
 +
  LINUX FOR IBM pSERIES (RS/6000)
  M:	Paul Mackerras <paulus@au.ibm.com>
  W:	http://www.ibm.com/linux/ltc/projects/ppc
@@@ -6639,13 -6557,6 +6641,13 @@@ M:	Guenter Roeck <linux@roeck-us.net
  S:	Maintained
  F:	drivers/net/dsa/mv88e6352.c
  
 +MARVELL CRYPTO DRIVER
 +M:	Boris Brezillon <boris.brezillon@free-electrons.com>
 +M:	Arnaud Ebalard <arno@natisbad.org>
 +F:	drivers/crypto/marvell/
 +S:	Maintained
 +L:	linux-crypto@vger.kernel.org
 +
  MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
  M:	Mirko Lindner <mlindner@marvell.com>
  M:	Stephen Hemminger <stephen@networkplumber.org>
@@@ -6864,6 -6775,7 +6866,6 @@@ F:	drivers/scsi/megaraid
  
  MELLANOX ETHERNET DRIVER (mlx4_en)
  M:	Amir Vadai <amirv@mellanox.com>
 -M:	Ido Shamay <idos@mellanox.com>
  L:	netdev@vger.kernel.org
  S:	Supported
  W:	http://www.mellanox.com
@@@ -7056,7 -6968,6 +7058,7 @@@ M:	Alan Ott <alan@signal11.us
  L:	linux-wpan@vger.kernel.org
  S:	Maintained
  F:	drivers/net/ieee802154/mrf24j40.c
 +F:	Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
  
  MSI LAPTOP SUPPORT
  M:	"Lee, Chun-Yi" <jlee@suse.com>
@@@ -7129,6 -7040,7 +7131,6 @@@ F:	drivers/media/i2c/mt9v032.
  F:	include/media/mt9v032.h
  
  MULTIFUNCTION DEVICES (MFD)
 -M:	Samuel Ortiz <sameo@linux.intel.com>
  M:	Lee Jones <lee.jones@linaro.org>
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
  S:	Supported
@@@ -7390,6 -7302,7 +7392,6 @@@ S:	Odd Fixe
  F:	drivers/net/
  F:	include/linux/if_*
  F:	include/linux/netdevice.h
 -F:	include/linux/arcdevice.h
  F:	include/linux/etherdevice.h
  F:	include/linux/fcdevice.h
  F:	include/linux/fddidevice.h
@@@ -7482,10 -7395,10 +7484,10 @@@ NOKIA N900 POWER SUPPLY DRIVER
  M:	Pali Rohár <pali.rohar@gmail.com>
  S:	Maintained
  F:	include/linux/power/bq2415x_charger.h
 -F:	include/linux/power/bq27x00_battery.h
 +F:	include/linux/power/bq27xxx_battery.h
  F:	include/linux/power/isp1704_charger.h
  F:	drivers/power/bq2415x_charger.c
 -F:	drivers/power/bq27x00_battery.c
 +F:	drivers/power/bq27xxx_battery.c
  F:	drivers/power/isp1704_charger.c
  F:	drivers/power/rx51_battery.c
  
@@@ -7528,13 -7441,11 +7530,13 @@@ F:	drivers/video/fbdev/riva
  F:	drivers/video/fbdev/nvidia/
  
  NVM EXPRESS DRIVER
 -M:	Matthew Wilcox <willy@linux.intel.com>
 +M:	Keith Busch <keith.busch@intel.com>
 +M:	Jens Axboe <axboe@fb.com>
  L:	linux-nvme@lists.infradead.org
 -T:	git git://git.infradead.org/users/willy/linux-nvme.git
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 +W:	https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/
  S:	Supported
 -F:	drivers/block/nvme*
 +F:	drivers/nvme/host/
  F:	include/linux/nvme.h
  
  NVMEM FRAMEWORK
@@@ -8029,14 -7940,6 +8031,14 @@@ F:	include/linux/pci
  F:	arch/x86/pci/
  F:	arch/x86/kernel/quirks.c
  
 +PCI DRIVER FOR ALTERA PCIE IP
 +M:	Ley Foon Tan <lftan@altera.com>
 +L:	rfi@lists.rocketboards.org (moderated for non-subscribers)
 +L:	linux-pci@vger.kernel.org
 +S:	Supported
 +F:	Documentation/devicetree/bindings/pci/altera-pcie.txt
 +F:	drivers/pci/host/pcie-altera.c
 +
  PCI DRIVER FOR ARM VERSATILE PLATFORM
  M:	Rob Herring <robh@kernel.org>
  L:	linux-pci@vger.kernel.org
@@@ -8138,14 -8041,6 +8140,14 @@@ L:	linux-pci@vger.kernel.or
  S:	Maintained
  F:	drivers/pci/host/*spear*
  
 +PCI MSI DRIVER FOR ALTERA MSI IP
 +M:	Ley Foon Tan <lftan@altera.com>
 +L:	rfi@lists.rocketboards.org (moderated for non-subscribers)
 +L:	linux-pci@vger.kernel.org
 +S:	Supported
 +F:	Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
 +F:	drivers/pci/host/pcie-altera-msi.c
 +
  PCI MSI DRIVER FOR APPLIEDMICRO XGENE
  M:	Duc Dang <dhdang@apm.com>
  L:	linux-pci@vger.kernel.org
@@@ -8154,13 -8049,6 +8156,13 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
  F:	drivers/pci/host/pci-xgene-msi.c
  
 +PCIE DRIVER FOR HISILICON
 +M:	Zhou Wang <wangzhou1@hisilicon.com>
 +L:	linux-pci@vger.kernel.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
 +F:	drivers/pci/host/pcie-hisi.c
 +
  PCMCIA SUBSYSTEM
  P:	Linux PCMCIA Team
  L:	linux-pcmcia@lists.infradead.org
@@@ -8370,6 -8258,12 +8372,6 @@@ M:	"Rafael J. Wysocki" <rafael.j.wysock
  S:	Maintained
  F:	drivers/pnp/
  
 -PNXxxxx I2C DRIVER
 -M:	Vitaly Wool <vitalywool@gmail.com>
 -L:	linux-i2c@vger.kernel.org
 -S:	Maintained
 -F:	drivers/i2c/busses/i2c-pnx.c
 -
  PPP PROTOCOL DRIVERS AND COMPRESSORS
  M:	Paul Mackerras <paulus@samba.org>
  L:	linux-ppp@vger.kernel.org
@@@ -8608,6 -8502,7 +8610,6 @@@ F:	Documentation/networking/LICENSE.qla
  F:	drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 -M:	Shahed Shaikh <shahed.shaikh@qlogic.com>
  M:	Dept-GELinuxNICDev@qlogic.com
  L:	netdev@vger.kernel.org
  S:	Supported
@@@ -8622,16 -8517,6 +8624,16 @@@ L:	netdev@vger.kernel.or
  S:	Supported
  F:	drivers/net/ethernet/qlogic/qlge/
  
 +QLOGIC QL4xxx ETHERNET DRIVER
 +M:	Yuval Mintz <Yuval.Mintz@qlogic.com>
 +M:	Ariel Elior <Ariel.Elior@qlogic.com>
 +M:	everest-linux-l2@qlogic.com
 +L:	netdev@vger.kernel.org
 +S:	Supported
 +F:	drivers/net/ethernet/qlogic/qed/
 +F:	include/linux/qed/
 +F:	drivers/net/ethernet/qlogic/qede/
 +
  QNX4 FILESYSTEM
  M:	Anders Larsen <al@alarsen.net>
  W:	http://www.alarsen.net/linux/qnx4fs/
@@@ -8983,13 -8868,6 +8985,13 @@@ S:	Maintaine
  F:	drivers/net/wireless/rtlwifi/
  F:	drivers/net/wireless/rtlwifi/rtl8192ce/
  
 +RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
 +M:	Jes Sorensen <Jes.Sorensen@redhat.com>
 +L:	linux-wireless@vger.kernel.org
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8723au-mac80211
 +S:	Maintained
 +F:	drivers/net/wireless/realtek/rtl8xxxu/
 +
  S3 SAVAGE FRAMEBUFFER DRIVER
  M:	Antonino Daplas <adaplas@gmail.com>
  L:	linux-fbdev@vger.kernel.org
@@@ -9063,13 -8941,6 +9065,13 @@@ F:	drivers/s390/net/*iucv
  F:	include/net/iucv/
  F:	net/iucv/
  
 +S390 IOMMU (PCI)
 +M:	Gerald Schaefer <gerald.schaefer@de.ibm.com>
 +L:	linux-s390@vger.kernel.org
 +W:	http://www.ibm.com/developerworks/linux/linux390/
 +S:	Supported
 +F:	drivers/iommu/s390-iommu.c
 +
  S3C24XX SD/MMC Driver
  M:	Ben Dooks <ben-linux@fluff.org>
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -9228,15 -9099,6 +9230,15 @@@ S: Supporte
  F: Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt
  F: drivers/net/ethernet/synopsys/dwc_eth_qos.c
  
 +SYNOPSYS DESIGNWARE I2C DRIVER
 +M:	Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +M:	Jarkko Nikula <jarkko.nikula@linux.intel.com>
 +M:	Mika Westerberg <mika.westerberg@linux.intel.com>
 +L:	linux-i2c@vger.kernel.org
 +S:	Maintained
 +F:	drivers/i2c/busses/i2c-designware-*
 +F:	include/linux/platform_data/i2c-designware.h
 +
  SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
  M:	Seungwon Jeon <tgih.jun@samsung.com>
  M:	Jaehoon Chung <jh80.chung@samsung.com>
@@@ -9289,16 -9151,6 +9291,16 @@@ W:	http://www.sunplus.co
  S:	Supported
  F:	arch/score/
  
 +SYSTEM CONTROL & POWER INTERFACE (SCPI) Message Protocol drivers
 +M:	Sudeep Holla <sudeep.holla@arm.com>
 +L:	linux-arm-kernel@lists.infradead.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/arm/arm,scpi.txt
 +F:	drivers/clk/clk-scpi.c
 +F:	drivers/cpufreq/scpi-cpufreq.c
 +F:	drivers/firmware/arm_scpi.c
 +F:	include/linux/scpi_protocol.h
 +
  SCSI CDROM DRIVER
  M:	Jens Axboe <axboe@kernel.dk>
  L:	linux-scsi@vger.kernel.org
@@@ -10054,12 -9906,13 +10056,12 @@@ F:	drivers/staging/media/lirc
  STAGING - LUSTRE PARALLEL FILESYSTEM
  M:	Oleg Drokin <oleg.drokin@intel.com>
  M:	Andreas Dilger <andreas.dilger@intel.com>
 -L:	HPDD-discuss@lists.01.org (moderated for non-subscribers)
 -W:	http://lustre.opensfs.org/
 +L:	lustre-devel@lists.lustre.org (moderated for non-subscribers)
 +W:	http://wiki.lustre.org/
  S:	Maintained
  F:	drivers/staging/lustre
  
  STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
 -M:	Julian Andres Klode <jak@jak-linux.org>
  M:	Marc Dietrich <marvin24@gmx.de>
  L:	ac100@lists.launchpad.net (moderated for non-subscribers)
  L:	linux-tegra@vger.kernel.org
@@@ -10214,7 -10067,6 +10216,7 @@@ F:	include/net/switchdev.
  
  SYNOPSYS ARC ARCHITECTURE
  M:	Vineet Gupta <vgupta@synopsys.com>
 +L:	linux-snps-arc@lists.infraded.org
  S:	Supported
  F:	arch/arc/
  F:	Documentation/devicetree/bindings/arc/*
@@@ -10488,16 -10340,6 +10490,16 @@@ F:	include/uapi/linux/thermal.
  F:	include/linux/cpu_cooling.h
  F:	Documentation/devicetree/bindings/thermal/
  
 +THERMAL/CPU_COOLING
 +M:	Amit Daniel Kachhap <amit.kachhap@gmail.com>
 +M:	Viresh Kumar <viresh.kumar@linaro.org>
 +M:	Javi Merino <javi.merino@arm.com>
 +L:	linux-pm@vger.kernel.org
 +S:	Supported
 +F:	Documentation/thermal/cpu-cooling-api.txt
 +F:	drivers/thermal/cpu_cooling.c
 +F:	include/linux/cpu_cooling.h
 +
  THINGM BLINK(1) USB RGB LED DRIVER
  M:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>
  S:	Maintained
@@@ -10732,7 -10574,6 +10734,7 @@@ F:	drivers/media/pci/tw68
  TPM DEVICE DRIVER
  M:	Peter Huewe <peterhuewe@gmx.de>
  M:	Marcel Selhorst <tpmdd@selhorst.net>
 +M:	Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
  R:	Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
  W:	http://tpmdd.sourceforge.net
  L:	tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
@@@ -11217,12 -11058,6 +11219,12 @@@ S:	Maintaine
  F:	Documentation/fb/uvesafb.txt
  F:	drivers/video/fbdev/uvesafb.*
  
 +VF610 NAND DRIVER
 +M:	Stefan Agner <stefan@agner.ch>
 +L:	linux-mtd@lists.infradead.org
 +S:	Supported
 +F:	drivers/mtd/nand/vf610_nfc.c
 +
  VFAT/FAT/MSDOS FILESYSTEM
  M:	OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
  S:	Maintained
@@@ -11253,12 -11088,6 +11255,12 @@@ S:	Maintaine
  F:	drivers/media/v4l2-core/videobuf2-*
  F:	include/media/videobuf2-*
  
 +VIRTUAL SERIO DEVICE DRIVER
 +M:	Stephen Chandler Paul <thatslyude@gmail.com>
 +S:	Maintained
 +F:	drivers/input/serio/userio.c
 +F:	include/uapi/linux/userio.h
 +
  VIRTIO CONSOLE DRIVER
  M:	Amit Shah <amit.shah@redhat.com>
  L:	virtualization@lists.linux-foundation.org
@@@ -11360,7 -11189,7 +11362,7 @@@ F:	drivers/vlynq/vlynq.
  F:	include/linux/vlynq.h
  
  VME SUBSYSTEM
 -M:	Martyn Welch <martyn.welch@ge.com>
 +M:	Martyn Welch <martyn@welchs.me.uk>
  M:	Manohar Vanga <manohar.vanga@gmail.com>
  M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:	devel@driverdev.osuosl.org
@@@ -11412,6 -11241,7 +11414,6 @@@ VOLTAGE AND CURRENT REGULATOR FRAMEWOR
  M:	Liam Girdwood <lgirdwood@gmail.com>
  M:	Mark Brown <broonie@kernel.org>
  L:	linux-kernel@vger.kernel.org
 -W:	http://opensource.wolfsonmicro.com/node/15
  W:	http://www.slimlogic.co.uk/?p=48
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
  S:	Supported
@@@ -11424,7 -11254,7 +11426,7 @@@ M:	Shrijeet Mukherjee <shm@cumulusnetwo
  L:	netdev@vger.kernel.org
  S:	Maintained
  F:	drivers/net/vrf.c
 -F:	include/net/vrf.h
 +F:	Documentation/networking/vrf.txt
  
  VT1211 HARDWARE MONITOR DRIVER
  M:	Juerg Haefliger <juergh@gmail.com>
@@@ -11536,15 -11366,23 +11538,15 @@@ W:	http://oops.ghostprotocols.net:81/bl
  S:	Maintained
  F:	drivers/net/wireless/wl3501*
  
 -WM97XX TOUCHSCREEN DRIVERS
 -M:	Mark Brown <broonie@kernel.org>
 -M:	Liam Girdwood <lrg@slimlogic.co.uk>
 -L:	linux-input@vger.kernel.org
 -T:	git git://opensource.wolfsonmicro.com/linux-2.6-touch
 -W:	http://opensource.wolfsonmicro.com/node/7
 -S:	Supported
 -F:	drivers/input/touchscreen/*wm97*
 -F:	include/linux/wm97xx.h
 -
  WOLFSON MICROELECTRONICS DRIVERS
  L:	patches@opensource.wolfsonmicro.com
 -T:	git git://opensource.wolfsonmicro.com/linux-2.6-asoc
 -T:	git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 -W:	http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
 +T:	git https://github.com/CirrusLogic/linux-drivers.git
 +W:	https://github.com/CirrusLogic/linux-drivers/wiki
  S:	Supported
  F:	Documentation/hwmon/wm83??
 +F:	Documentation/devicetree/bindings/extcon/extcon-arizona.txt
 +F:	Documentation/devicetree/bindings/regulator/arizona-regulator.txt
 +F:	Documentation/devicetree/bindings/mfd/arizona.txt
  F:	arch/arm/mach-s3c64xx/mach-crag6410*
  F:	drivers/clk/clk-wm83*.c
  F:	drivers/extcon/extcon-arizona.c
@@@ -11813,7 -11651,6 +11815,7 @@@ F:	drivers/tty/serial/zs.
  ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR
  M:	Minchan Kim <minchan@kernel.org>
  M:	Nitin Gupta <ngupta@vflare.org>
 +R:	Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
  L:	linux-mm@kvack.org
  S:	Maintained
  F:	mm/zsmalloc.c
diff --combined Makefile
index c90179e66a60,d23d2e97a835..961b17e2fd26
--- a/Makefile
+++ b/Makefile
@@@ -1,8 -1,8 +1,8 @@@
  VERSION = 4
  PATCHLEVEL = 3
  SUBLEVEL = 0
 -EXTRAVERSION = -rc2
 -NAME = Hurr durr I'ma sheep
 +EXTRAVERSION = -rc7
 +NAME = Blurry Fish Butt
  
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
@@@ -342,14 -342,9 +342,14 @@@ include scripts/Kbuild.includ
  # Make variables (CC, etc...)
  AS		= $(CROSS_COMPILE)as
  LD		= $(CROSS_COMPILE)ld
 +LDFINAL	= $(LD)
  CC		= $(CROSS_COMPILE)gcc
  CPP		= $(CC) -E
 +ifdef CONFIG_LTO
 +AR		= $(CROSS_COMPILE)gcc-ar
 +else
  AR		= $(CROSS_COMPILE)ar
 +endif
  NM		= $(CROSS_COMPILE)nm
  STRIP		= $(CROSS_COMPILE)strip
  OBJCOPY		= $(CROSS_COMPILE)objcopy
@@@ -411,7 -406,7 +411,7 @@@ KERNELVERSION = $(VERSION)$(if $(PATCHL
  
  export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
  export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
 -export CPP AR NM STRIP OBJCOPY OBJDUMP
 +export CPP AR NM STRIP OBJCOPY OBJDUMP LDFINAL
  export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE
  export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
  
@@@ -422,17 -417,6 +422,17 @@@ export KBUILD_AFLAGS_MODULE KBUILD_CFLA
  export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL
  export KBUILD_ARFLAGS
  
 +ifdef CONFIG_LTO
 +# LTO gcc creates a lot of files in TMPDIR, and with /tmp as tmpfs
 +# it's easy to drive the machine OOM. Use the object directory
 +# instead.
 +ifndef TMPDIR
 +TMPDIR ?= $(objtree)
 +export TMPDIR
 +$(info setting TMPDIR=$(objtree) for LTO build)
 +endif
 +endif
 +
  # When compiling out-of-tree modules, put MODVERDIR in the module
  # tree rather than in the kernel tree. The kernel tree might
  # even be read-only.
@@@ -793,7 -777,6 +793,7 @@@ endi
  
  include scripts/Makefile.kasan
  include scripts/Makefile.extrawarn
 +include scripts/Makefile.lto
  
  # Add any arch overrides and user supplied CPPFLAGS, AFLAGS and CFLAGS as the
  # last assignments
@@@ -1092,9 -1075,6 +1092,9 @@@ PHONY += kselftes
  kselftest:
  	$(Q)$(MAKE) -C tools/testing/selftests run_tests
  
 +kselftest-clean:
 +	$(Q)$(MAKE) -C tools/testing/selftests clean
 +
  # ---------------------------------------------------------------------------
  # Modules
  
@@@ -1302,7 -1282,6 +1302,7 @@@ help
  	@echo  '  kselftest       - Build and run kernel selftest (run as root)'
  	@echo  '                    Build, install, and boot kernel before'
  	@echo  '                    running kselftest on it'
 +	@echo  '  kselftest-clean - Remove all generated kselftest files'
  	@echo  ''
  	@echo  'Kernel packaging:'
  	@$(MAKE) $(build)=$(package-dir) help
@@@ -1357,7 -1336,7 +1357,7 @@@ $(help-board-dirs): help-%
  # Documentation targets
  # ---------------------------------------------------------------------------
  %docs: scripts_basic FORCE
- 	$(Q)$(MAKE) $(build)=scripts build_docproc
+ 	$(Q)$(MAKE) $(build)=scripts build_docproc build_check-lc_ctype
  	$(Q)$(MAKE) $(build)=Documentation/DocBook $@
  
  else # KBUILD_EXTMOD
diff --combined scripts/kernel-doc
index 0276d2b5eefe,80428be3411a..125b906cd1d4
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@@ -206,59 -206,73 +206,73 @@@ my $type_env = '(\$\w+)'
  #  One for each output format
  
  # these work fairly well
- my %highlights_html = ( $type_constant, "<i>\$1</i>",
- 			$type_func, "<b>\$1</b>",
- 			$type_struct_xml, "<i>\$1</i>",
- 			$type_env, "<b><i>\$1</i></b>",
- 			$type_param, "<tt><b>\$1</b></tt>" );
+ my @highlights_html = (
+                        [$type_constant, "<i>\$1</i>"],
+                        [$type_func, "<b>\$1</b>"],
+                        [$type_struct_xml, "<i>\$1</i>"],
+                        [$type_env, "<b><i>\$1</i></b>"],
+                        [$type_param, "<tt><b>\$1</b></tt>"]
+                       );
  my $local_lt = "\\\\\\\\lt:";
  my $local_gt = "\\\\\\\\gt:";
  my $blankline_html = $local_lt . "p" . $local_gt;	# was "<p>"
  
  # html version 5
- my %highlights_html5 = ( $type_constant, "<span class=\"const\">\$1</span>",
- 			$type_func, "<span class=\"func\">\$1</span>",
- 			$type_struct_xml, "<span class=\"struct\">\$1</span>",
- 			$type_env, "<span class=\"env\">\$1</span>",
- 			$type_param, "<span class=\"param\">\$1</span>" );
+ my @highlights_html5 = (
+                         [$type_constant, "<span class=\"const\">\$1</span>"],
+                         [$type_func, "<span class=\"func\">\$1</span>"],
+                         [$type_struct_xml, "<span class=\"struct\">\$1</span>"],
+                         [$type_env, "<span class=\"env\">\$1</span>"],
+                         [$type_param, "<span class=\"param\">\$1</span>]"]
+ 		       );
  my $blankline_html5 = $local_lt . "br /" . $local_gt;
  
  # XML, docbook format
- my %highlights_xml = ( "([^=])\\\"([^\\\"<]+)\\\"", "\$1<quote>\$2</quote>",
- 			$type_constant, "<constant>\$1</constant>",
- 			$type_func, "<function>\$1</function>",
- 			$type_struct_xml, "<structname>\$1</structname>",
- 			$type_env, "<envar>\$1</envar>",
- 			$type_param, "<parameter>\$1</parameter>" );
+ my @highlights_xml = (
+                       ["([^=])\\\"([^\\\"<]+)\\\"", "\$1<quote>\$2</quote>"],
+                       [$type_constant, "<constant>\$1</constant>"],
+                       [$type_struct_xml, "<structname>\$1</structname>"],
+                       [$type_param, "<parameter>\$1</parameter>"],
+                       [$type_func, "<function>\$1</function>"],
+                       [$type_env, "<envar>\$1</envar>"]
+ 		     );
  my $blankline_xml = $local_lt . "/para" . $local_gt . $local_lt . "para" . $local_gt . "\n";
  
  # gnome, docbook format
- my %highlights_gnome = ( $type_constant, "<replaceable class=\"option\">\$1</replaceable>",
- 			 $type_func, "<function>\$1</function>",
- 			 $type_struct, "<structname>\$1</structname>",
- 			 $type_env, "<envar>\$1</envar>",
- 			 $type_param, "<parameter>\$1</parameter>" );
+ my @highlights_gnome = (
+                         [$type_constant, "<replaceable class=\"option\">\$1</replaceable>"],
+                         [$type_func, "<function>\$1</function>"],
+                         [$type_struct, "<structname>\$1</structname>"],
+                         [$type_env, "<envar>\$1</envar>"],
+                         [$type_param, "<parameter>\$1</parameter>" ]
+ 		       );
  my $blankline_gnome = "</para><para>\n";
  
  # these are pretty rough
- my %highlights_man = ( $type_constant, "\$1",
- 		       $type_func, "\\\\fB\$1\\\\fP",
- 		       $type_struct, "\\\\fI\$1\\\\fP",
- 		       $type_param, "\\\\fI\$1\\\\fP" );
+ my @highlights_man = (
+                       [$type_constant, "\$1"],
+                       [$type_func, "\\\\fB\$1\\\\fP"],
+                       [$type_struct, "\\\\fI\$1\\\\fP"],
+                       [$type_param, "\\\\fI\$1\\\\fP"]
+ 		     );
  my $blankline_man = "";
  
  # text-mode
- my %highlights_text = ( $type_constant, "\$1",
- 			$type_func, "\$1",
- 			$type_struct, "\$1",
- 			$type_param, "\$1" );
+ my @highlights_text = (
+                        [$type_constant, "\$1"],
+                        [$type_func, "\$1"],
+                        [$type_struct, "\$1"],
+                        [$type_param, "\$1"]
+ 		      );
  my $blankline_text = "";
  
  # list mode
- my %highlights_list = ( $type_constant, "\$1",
- 			$type_func, "\$1",
- 			$type_struct, "\$1",
- 			$type_param, "\$1" );
+ my @highlights_list = (
+                        [$type_constant, "\$1"],
+                        [$type_func, "\$1"],
+                        [$type_struct, "\$1"],
+                        [$type_param, "\$1"]
+ 		      );
  my $blankline_list = "";
  
  # read arguments
@@@ -273,7 -287,7 +287,7 @@@ my $verbose = 0
  my $output_mode = "man";
  my $output_preformatted = 0;
  my $no_doc_sections = 0;
- my %highlights = %highlights_man;
+ my @highlights = @highlights_man;
  my $blankline = $blankline_man;
  my $modulename = "Kernel API";
  my $function_only = 0;
@@@ -374,31 -388,31 +388,31 @@@ while ($ARGV[0] =~ m/^-(.*)/) 
      my $cmd = shift @ARGV;
      if ($cmd eq "-html") {
  	$output_mode = "html";
- 	%highlights = %highlights_html;
+ 	@highlights = @highlights_html;
  	$blankline = $blankline_html;
      } elsif ($cmd eq "-html5") {
  	$output_mode = "html5";
- 	%highlights = %highlights_html5;
+ 	@highlights = @highlights_html5;
  	$blankline = $blankline_html5;
      } elsif ($cmd eq "-man") {
  	$output_mode = "man";
- 	%highlights = %highlights_man;
+ 	@highlights = @highlights_man;
  	$blankline = $blankline_man;
      } elsif ($cmd eq "-text") {
  	$output_mode = "text";
- 	%highlights = %highlights_text;
+ 	@highlights = @highlights_text;
  	$blankline = $blankline_text;
      } elsif ($cmd eq "-docbook") {
  	$output_mode = "xml";
- 	%highlights = %highlights_xml;
+ 	@highlights = @highlights_xml;
  	$blankline = $blankline_xml;
      } elsif ($cmd eq "-list") {
  	$output_mode = "list";
- 	%highlights = %highlights_list;
+ 	@highlights = @highlights_list;
  	$blankline = $blankline_list;
      } elsif ($cmd eq "-gnome") {
  	$output_mode = "gnome";
- 	%highlights = %highlights_gnome;
+ 	@highlights = @highlights_gnome;
  	$blankline = $blankline_gnome;
      } elsif ($cmd eq "-module") { # not needed for XML, inherits from calling document
  	$modulename = shift @ARGV;
@@@ -1746,7 -1760,7 +1760,7 @@@ sub output_declaration 
      my $func = "output_${functype}_$output_mode";
      if (($function_only==0) ||
  	( $function_only == 1 && defined($function_table{$name})) ||
- 	( $function_only == 2 && !defined($function_table{$name})))
+ 	( $function_only == 2 && !($functype eq "function" && defined($function_table{$name}))))
      {
  	&$func(@_);
  	$section_counter++;
@@@ -1791,8 -1805,8 +1805,8 @@@ sub dump_struct($$) 
  	$nested = $1;
  
  	# ignore members marked private:
- 	$members =~ s/\/\*\s*private:.*?\/\*\s*public:.*?\*\///gos;
- 	$members =~ s/\/\*\s*private:.*//gos;
+ 	$members =~ s/\/\*\s*private:.*?\/\*\s*public:.*?\*\///gosi;
+ 	$members =~ s/\/\*\s*private:.*//gosi;
  	# strip comments:
  	$members =~ s/\/\*.*?\*\///gos;
  	$nested =~ s/\/\*.*?\*\///gos;
@@@ -1869,31 -1883,6 +1883,31 @@@ sub dump_typedef($$) 
      my $file = shift;
  
      $x =~ s@/\*.*?\*/@@gos;	# strip comments.
 +
 +    # Parse function prototypes
 +    if ($x =~ /typedef\s+(\w+)\s*\(\*\s*(\w\S+)\s*\)\s*\((.*)\);/) {
 +	# Function typedefs
 +	$return_type = $1;
 +	$declaration_name = $2;
 +	my $args = $3;
 +
 +	create_parameterlist($args, ',', $file);
 +
 +	output_declaration($declaration_name,
 +			   'function',
 +			   {'function' => $declaration_name,
 +			    'module' => $modulename,
 +			    'functiontype' => $return_type,
 +			    'parameterlist' => \@parameterlist,
 +			    'parameterdescs' => \%parameterdescs,
 +			    'parametertypes' => \%parametertypes,
 +			    'sectionlist' => \@sectionlist,
 +			    'sections' => \%sections,
 +			    'purpose' => $declaration_purpose
 +			   });
 +	return;
 +    }
 +
      while (($x =~ /\(*.\)\s*;$/) || ($x =~ /\[*.\]\s*;$/)) {
  	$x =~ s/\(*.\)\s*;$/;/;
  	$x =~ s/\[*.\]\s*;$/;/;
@@@ -2416,12 -2405,13 +2430,13 @@@ sub process_file($) 
      my $descr;
      my $in_purpose = 0;
      my $initial_section_counter = $section_counter;
+     my ($orig_file) = @_;
  
      if (defined($ENV{'SRCTREE'})) {
- 	$file = "$ENV{'SRCTREE'}" . "/" . "@_";
+ 	$file = "$ENV{'SRCTREE'}" . "/" . $orig_file;
      }
      else {
- 	$file = "@_";
+ 	$file = $orig_file;
      }
      if (defined($source_map{$file})) {
  	$file = $source_map{$file};
@@@ -2665,7 -2655,7 +2680,7 @@@
  	    print "<refentry>\n";
  	    print " <refnamediv>\n";
  	    print "  <refname>\n";
- 	    print "   ${file}\n";
+ 	    print "   ${orig_file}\n";
  	    print "  </refname>\n";
  	    print "  <refpurpose>\n";
  	    print "   Document generation inconsistency\n";
@@@ -2679,7 -2669,7 +2694,7 @@@
  	    print "   <para>\n";
  	    print "    The template for this document tried to insert\n";
  	    print "    the structured comment from the file\n";
- 	    print "    <filename>${file}</filename> at this point,\n";
+ 	    print "    <filename>${orig_file}</filename> at this point,\n";
  	    print "    but none was found.\n";
  	    print "    This dummy section is inserted to allow\n";
  	    print "    generation to continue.\n";
@@@ -2696,9 -2686,11 +2711,11 @@@ $kernelversion = get_kernel_version()
  
  # generate a sequence of code that will splice in highlighting information
  # using the s// operator.
- foreach my $pattern (sort keys %highlights) {
- #   print STDERR "scanning pattern:$pattern, highlight:($highlights{$pattern})\n";
-     $dohighlight .=  "\$contents =~ s:$pattern:$highlights{$pattern}:gs;\n";
+ foreach my $k (keys @highlights) {
+     my $pattern = $highlights[$k][0];
+     my $result = $highlights[$k][1];
+ #   print STDERR "scanning pattern:$pattern, highlight:($result)\n";
+     $dohighlight .=  "\$contents =~ s:$pattern:$result:gs;\n";
  }
  
  # Read the file that maps relative names to absolute names for