Loading Documentation/IPMI.txt +5 −2 Original line number Original line Diff line number Diff line Loading @@ -587,7 +587,7 @@ used to control it: modprobe ipmi_watchdog timeout=<t> pretimeout=<t> action=<action type> modprobe ipmi_watchdog timeout=<t> pretimeout=<t> action=<action type> preaction=<preaction type> preop=<preop type> start_now=x preaction=<preaction type> preop=<preop type> start_now=x nowayout=x ifnum_to_use=n nowayout=x ifnum_to_use=n panic_wdt_timeout=<t> ifnum_to_use specifies which interface the watchdog timer should use. ifnum_to_use specifies which interface the watchdog timer should use. The default is -1, which means to pick the first one registered. The default is -1, which means to pick the first one registered. Loading @@ -597,7 +597,9 @@ is the amount of seconds before the reset that the pre-timeout panic will occur (if pretimeout is zero, then pretimeout will not be enabled). Note occur (if pretimeout is zero, then pretimeout will not be enabled). Note that the pretimeout is the time before the final timeout. So if the that the pretimeout is the time before the final timeout. So if the timeout is 50 seconds and the pretimeout is 10 seconds, then the pretimeout timeout is 50 seconds and the pretimeout is 10 seconds, then the pretimeout will occur in 40 second (10 seconds before the timeout). will occur in 40 second (10 seconds before the timeout). The panic_wdt_timeout is the value of timeout which is set on kernel panic, in order to let actions such as kdump to occur during panic. The action may be "reset", "power_cycle", or "power_off", and The action may be "reset", "power_cycle", or "power_off", and specifies what to do when the timer times out, and defaults to specifies what to do when the timer times out, and defaults to Loading Loading @@ -634,6 +636,7 @@ for configuring the watchdog: ipmi_watchdog.preop=<preop type> ipmi_watchdog.preop=<preop type> ipmi_watchdog.start_now=x ipmi_watchdog.start_now=x ipmi_watchdog.nowayout=x ipmi_watchdog.nowayout=x ipmi_watchdog.panic_wdt_timeout=<t> The options are the same as the module parameter options. The options are the same as the module parameter options. Loading Documentation/i2c/busses/i2c-i801 +1 −0 Original line number Original line Diff line number Diff line Loading @@ -32,6 +32,7 @@ Supported adapters: * Intel Sunrise Point-LP (PCH) * Intel Sunrise Point-LP (PCH) * Intel DNV (SOC) * Intel DNV (SOC) * Intel Broxton (SOC) * Intel Broxton (SOC) * Intel Lewisburg (PCH) Datasheets: Publicly available at the Intel website Datasheets: Publicly available at the Intel website On Intel Patsburg and later chipsets, both the normal host SMBus controller On Intel Patsburg and later chipsets, both the normal host SMBus controller Loading Documentation/kernel-parameters.txt +0 −3 Original line number Original line Diff line number Diff line Loading @@ -1583,9 +1583,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. hwp_only hwp_only Only load intel_pstate on systems which support Only load intel_pstate on systems which support hardware P state control (HWP) if available. 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] intremap= [X86-64, Intel-IOMMU] on enable Interrupt Remapping (default) on enable Interrupt Remapping (default) Loading MAINTAINERS +27 −13 Original line number Original line Diff line number Diff line Loading @@ -2449,7 +2449,9 @@ F: drivers/firmware/broadcom/* BROADCOM STB NAND FLASH DRIVER BROADCOM STB NAND FLASH DRIVER M: Brian Norris <computersforpeace@gmail.com> M: Brian Norris <computersforpeace@gmail.com> M: Kamal Dasu <kdasu.kdev@gmail.com> L: linux-mtd@lists.infradead.org L: linux-mtd@lists.infradead.org L: bcm-kernel-feedback-list@broadcom.com S: Maintained S: Maintained F: drivers/mtd/nand/brcmnand/ F: drivers/mtd/nand/brcmnand/ Loading Loading @@ -2546,7 +2548,7 @@ F: arch/c6x/ CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS M: David Howells <dhowells@redhat.com> M: David Howells <dhowells@redhat.com> L: linux-cachefs@redhat.com L: linux-cachefs@redhat.com (moderated for non-subscribers) S: Supported S: Supported F: Documentation/filesystems/caching/cachefiles.txt F: Documentation/filesystems/caching/cachefiles.txt F: fs/cachefiles/ F: fs/cachefiles/ Loading Loading @@ -2929,10 +2931,9 @@ S: Maintained F: drivers/platform/x86/compal-laptop.c F: drivers/platform/x86/compal-laptop.c CONEXANT ACCESSRUNNER USB DRIVER CONEXANT ACCESSRUNNER USB DRIVER M: Simon Arlott <cxacru@fire.lp0.eu> L: accessrunner-general@lists.sourceforge.net L: accessrunner-general@lists.sourceforge.net W: http://accessrunner.sourceforge.net/ W: http://accessrunner.sourceforge.net/ S: Maintained S: Orphan F: drivers/usb/atm/cxacru.c F: drivers/usb/atm/cxacru.c CONFIGFS CONFIGFS Loading Loading @@ -4409,6 +4410,7 @@ K: fmc_d.*register FPGA MANAGER FRAMEWORK FPGA MANAGER FRAMEWORK M: Alan Tull <atull@opensource.altera.com> M: Alan Tull <atull@opensource.altera.com> R: Moritz Fischer <moritz.fischer@ettus.com> S: Maintained S: Maintained F: drivers/fpga/ F: drivers/fpga/ F: include/linux/fpga/fpga-mgr.h F: include/linux/fpga/fpga-mgr.h Loading Loading @@ -4559,7 +4561,7 @@ F: include/linux/frontswap.h FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS M: David Howells <dhowells@redhat.com> M: David Howells <dhowells@redhat.com> L: linux-cachefs@redhat.com L: linux-cachefs@redhat.com (moderated for non-subscribers) S: Supported S: Supported F: Documentation/filesystems/caching/ F: Documentation/filesystems/caching/ F: fs/fscache/ F: fs/fscache/ Loading Loading @@ -5711,13 +5713,6 @@ M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar> S: Maintained S: Maintained F: net/ipv4/netfilter/ipt_MASQUERADE.c F: net/ipv4/netfilter/ipt_MASQUERADE.c IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER M: Francois Romieu <romieu@fr.zoreil.com> M: Sorbica Shieh <sorbica@icplus.com.tw> L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/icplus/ipg.* IPATH DRIVER IPATH DRIVER M: Mike Marciniszyn <infinipath@intel.com> M: Mike Marciniszyn <infinipath@intel.com> L: linux-rdma@vger.kernel.org L: linux-rdma@vger.kernel.org Loading Loading @@ -6923,13 +6918,21 @@ F: drivers/scsi/megaraid.* F: drivers/scsi/megaraid/ F: drivers/scsi/megaraid/ MELLANOX ETHERNET DRIVER (mlx4_en) MELLANOX ETHERNET DRIVER (mlx4_en) M: Amir Vadai <amirv@mellanox.com> M: Eugenia Emantayev <eugenia@mellanox.com> L: netdev@vger.kernel.org L: netdev@vger.kernel.org S: Supported S: Supported W: http://www.mellanox.com W: http://www.mellanox.com Q: http://patchwork.ozlabs.org/project/netdev/list/ Q: http://patchwork.ozlabs.org/project/netdev/list/ F: drivers/net/ethernet/mellanox/mlx4/en_* F: drivers/net/ethernet/mellanox/mlx4/en_* MELLANOX ETHERNET DRIVER (mlx5e) M: Saeed Mahameed <saeedm@mellanox.com> L: netdev@vger.kernel.org S: Supported W: http://www.mellanox.com Q: http://patchwork.ozlabs.org/project/netdev/list/ F: drivers/net/ethernet/mellanox/mlx5/core/en_* MELLANOX ETHERNET SWITCH DRIVERS MELLANOX ETHERNET SWITCH DRIVERS M: Jiri Pirko <jiri@mellanox.com> M: Jiri Pirko <jiri@mellanox.com> M: Ido Schimmel <idosch@mellanox.com> M: Ido Schimmel <idosch@mellanox.com> Loading Loading @@ -7901,6 +7904,18 @@ S: Maintained F: net/openvswitch/ F: net/openvswitch/ F: include/uapi/linux/openvswitch.h F: include/uapi/linux/openvswitch.h OPERATING PERFORMANCE POINTS (OPP) M: Viresh Kumar <vireshk@kernel.org> M: Nishanth Menon <nm@ti.com> M: Stephen Boyd <sboyd@codeaurora.org> L: linux-pm@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git F: drivers/base/power/opp/ F: include/linux/pm_opp.h F: Documentation/power/opp.txt F: Documentation/devicetree/bindings/opp/ OPL4 DRIVER OPL4 DRIVER M: Clemens Ladisch <clemens@ladisch.de> M: Clemens Ladisch <clemens@ladisch.de> L: alsa-devel@alsa-project.org (moderated for non-subscribers) L: alsa-devel@alsa-project.org (moderated for non-subscribers) Loading Loading @@ -9314,7 +9329,6 @@ F: drivers/i2c/busses/i2c-designware-* F: include/linux/platform_data/i2c-designware.h F: include/linux/platform_data/i2c-designware.h SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER M: Seungwon Jeon <tgih.jun@samsung.com> M: Jaehoon Chung <jh80.chung@samsung.com> M: Jaehoon Chung <jh80.chung@samsung.com> L: linux-mmc@vger.kernel.org L: linux-mmc@vger.kernel.org S: Maintained S: Maintained Loading Makefile +1 −1 Original line number Original line Diff line number Diff line VERSION = 4 VERSION = 4 PATCHLEVEL = 4 PATCHLEVEL = 4 SUBLEVEL = 0 SUBLEVEL = 0 EXTRAVERSION = -rc1 EXTRAVERSION = -rc2 NAME = Blurry Fish Butt NAME = Blurry Fish Butt # *DOCUMENTATION* # *DOCUMENTATION* Loading Loading
Documentation/IPMI.txt +5 −2 Original line number Original line Diff line number Diff line Loading @@ -587,7 +587,7 @@ used to control it: modprobe ipmi_watchdog timeout=<t> pretimeout=<t> action=<action type> modprobe ipmi_watchdog timeout=<t> pretimeout=<t> action=<action type> preaction=<preaction type> preop=<preop type> start_now=x preaction=<preaction type> preop=<preop type> start_now=x nowayout=x ifnum_to_use=n nowayout=x ifnum_to_use=n panic_wdt_timeout=<t> ifnum_to_use specifies which interface the watchdog timer should use. ifnum_to_use specifies which interface the watchdog timer should use. The default is -1, which means to pick the first one registered. The default is -1, which means to pick the first one registered. Loading @@ -597,7 +597,9 @@ is the amount of seconds before the reset that the pre-timeout panic will occur (if pretimeout is zero, then pretimeout will not be enabled). Note occur (if pretimeout is zero, then pretimeout will not be enabled). Note that the pretimeout is the time before the final timeout. So if the that the pretimeout is the time before the final timeout. So if the timeout is 50 seconds and the pretimeout is 10 seconds, then the pretimeout timeout is 50 seconds and the pretimeout is 10 seconds, then the pretimeout will occur in 40 second (10 seconds before the timeout). will occur in 40 second (10 seconds before the timeout). The panic_wdt_timeout is the value of timeout which is set on kernel panic, in order to let actions such as kdump to occur during panic. The action may be "reset", "power_cycle", or "power_off", and The action may be "reset", "power_cycle", or "power_off", and specifies what to do when the timer times out, and defaults to specifies what to do when the timer times out, and defaults to Loading Loading @@ -634,6 +636,7 @@ for configuring the watchdog: ipmi_watchdog.preop=<preop type> ipmi_watchdog.preop=<preop type> ipmi_watchdog.start_now=x ipmi_watchdog.start_now=x ipmi_watchdog.nowayout=x ipmi_watchdog.nowayout=x ipmi_watchdog.panic_wdt_timeout=<t> The options are the same as the module parameter options. The options are the same as the module parameter options. Loading
Documentation/i2c/busses/i2c-i801 +1 −0 Original line number Original line Diff line number Diff line Loading @@ -32,6 +32,7 @@ Supported adapters: * Intel Sunrise Point-LP (PCH) * Intel Sunrise Point-LP (PCH) * Intel DNV (SOC) * Intel DNV (SOC) * Intel Broxton (SOC) * Intel Broxton (SOC) * Intel Lewisburg (PCH) Datasheets: Publicly available at the Intel website Datasheets: Publicly available at the Intel website On Intel Patsburg and later chipsets, both the normal host SMBus controller On Intel Patsburg and later chipsets, both the normal host SMBus controller Loading
Documentation/kernel-parameters.txt +0 −3 Original line number Original line Diff line number Diff line Loading @@ -1583,9 +1583,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. hwp_only hwp_only Only load intel_pstate on systems which support Only load intel_pstate on systems which support hardware P state control (HWP) if available. 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] intremap= [X86-64, Intel-IOMMU] on enable Interrupt Remapping (default) on enable Interrupt Remapping (default) Loading
MAINTAINERS +27 −13 Original line number Original line Diff line number Diff line Loading @@ -2449,7 +2449,9 @@ F: drivers/firmware/broadcom/* BROADCOM STB NAND FLASH DRIVER BROADCOM STB NAND FLASH DRIVER M: Brian Norris <computersforpeace@gmail.com> M: Brian Norris <computersforpeace@gmail.com> M: Kamal Dasu <kdasu.kdev@gmail.com> L: linux-mtd@lists.infradead.org L: linux-mtd@lists.infradead.org L: bcm-kernel-feedback-list@broadcom.com S: Maintained S: Maintained F: drivers/mtd/nand/brcmnand/ F: drivers/mtd/nand/brcmnand/ Loading Loading @@ -2546,7 +2548,7 @@ F: arch/c6x/ CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS M: David Howells <dhowells@redhat.com> M: David Howells <dhowells@redhat.com> L: linux-cachefs@redhat.com L: linux-cachefs@redhat.com (moderated for non-subscribers) S: Supported S: Supported F: Documentation/filesystems/caching/cachefiles.txt F: Documentation/filesystems/caching/cachefiles.txt F: fs/cachefiles/ F: fs/cachefiles/ Loading Loading @@ -2929,10 +2931,9 @@ S: Maintained F: drivers/platform/x86/compal-laptop.c F: drivers/platform/x86/compal-laptop.c CONEXANT ACCESSRUNNER USB DRIVER CONEXANT ACCESSRUNNER USB DRIVER M: Simon Arlott <cxacru@fire.lp0.eu> L: accessrunner-general@lists.sourceforge.net L: accessrunner-general@lists.sourceforge.net W: http://accessrunner.sourceforge.net/ W: http://accessrunner.sourceforge.net/ S: Maintained S: Orphan F: drivers/usb/atm/cxacru.c F: drivers/usb/atm/cxacru.c CONFIGFS CONFIGFS Loading Loading @@ -4409,6 +4410,7 @@ K: fmc_d.*register FPGA MANAGER FRAMEWORK FPGA MANAGER FRAMEWORK M: Alan Tull <atull@opensource.altera.com> M: Alan Tull <atull@opensource.altera.com> R: Moritz Fischer <moritz.fischer@ettus.com> S: Maintained S: Maintained F: drivers/fpga/ F: drivers/fpga/ F: include/linux/fpga/fpga-mgr.h F: include/linux/fpga/fpga-mgr.h Loading Loading @@ -4559,7 +4561,7 @@ F: include/linux/frontswap.h FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS M: David Howells <dhowells@redhat.com> M: David Howells <dhowells@redhat.com> L: linux-cachefs@redhat.com L: linux-cachefs@redhat.com (moderated for non-subscribers) S: Supported S: Supported F: Documentation/filesystems/caching/ F: Documentation/filesystems/caching/ F: fs/fscache/ F: fs/fscache/ Loading Loading @@ -5711,13 +5713,6 @@ M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar> S: Maintained S: Maintained F: net/ipv4/netfilter/ipt_MASQUERADE.c F: net/ipv4/netfilter/ipt_MASQUERADE.c IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER M: Francois Romieu <romieu@fr.zoreil.com> M: Sorbica Shieh <sorbica@icplus.com.tw> L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/icplus/ipg.* IPATH DRIVER IPATH DRIVER M: Mike Marciniszyn <infinipath@intel.com> M: Mike Marciniszyn <infinipath@intel.com> L: linux-rdma@vger.kernel.org L: linux-rdma@vger.kernel.org Loading Loading @@ -6923,13 +6918,21 @@ F: drivers/scsi/megaraid.* F: drivers/scsi/megaraid/ F: drivers/scsi/megaraid/ MELLANOX ETHERNET DRIVER (mlx4_en) MELLANOX ETHERNET DRIVER (mlx4_en) M: Amir Vadai <amirv@mellanox.com> M: Eugenia Emantayev <eugenia@mellanox.com> L: netdev@vger.kernel.org L: netdev@vger.kernel.org S: Supported S: Supported W: http://www.mellanox.com W: http://www.mellanox.com Q: http://patchwork.ozlabs.org/project/netdev/list/ Q: http://patchwork.ozlabs.org/project/netdev/list/ F: drivers/net/ethernet/mellanox/mlx4/en_* F: drivers/net/ethernet/mellanox/mlx4/en_* MELLANOX ETHERNET DRIVER (mlx5e) M: Saeed Mahameed <saeedm@mellanox.com> L: netdev@vger.kernel.org S: Supported W: http://www.mellanox.com Q: http://patchwork.ozlabs.org/project/netdev/list/ F: drivers/net/ethernet/mellanox/mlx5/core/en_* MELLANOX ETHERNET SWITCH DRIVERS MELLANOX ETHERNET SWITCH DRIVERS M: Jiri Pirko <jiri@mellanox.com> M: Jiri Pirko <jiri@mellanox.com> M: Ido Schimmel <idosch@mellanox.com> M: Ido Schimmel <idosch@mellanox.com> Loading Loading @@ -7901,6 +7904,18 @@ S: Maintained F: net/openvswitch/ F: net/openvswitch/ F: include/uapi/linux/openvswitch.h F: include/uapi/linux/openvswitch.h OPERATING PERFORMANCE POINTS (OPP) M: Viresh Kumar <vireshk@kernel.org> M: Nishanth Menon <nm@ti.com> M: Stephen Boyd <sboyd@codeaurora.org> L: linux-pm@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git F: drivers/base/power/opp/ F: include/linux/pm_opp.h F: Documentation/power/opp.txt F: Documentation/devicetree/bindings/opp/ OPL4 DRIVER OPL4 DRIVER M: Clemens Ladisch <clemens@ladisch.de> M: Clemens Ladisch <clemens@ladisch.de> L: alsa-devel@alsa-project.org (moderated for non-subscribers) L: alsa-devel@alsa-project.org (moderated for non-subscribers) Loading Loading @@ -9314,7 +9329,6 @@ F: drivers/i2c/busses/i2c-designware-* F: include/linux/platform_data/i2c-designware.h F: include/linux/platform_data/i2c-designware.h SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER M: Seungwon Jeon <tgih.jun@samsung.com> M: Jaehoon Chung <jh80.chung@samsung.com> M: Jaehoon Chung <jh80.chung@samsung.com> L: linux-mmc@vger.kernel.org L: linux-mmc@vger.kernel.org S: Maintained S: Maintained Loading
Makefile +1 −1 Original line number Original line Diff line number Diff line VERSION = 4 VERSION = 4 PATCHLEVEL = 4 PATCHLEVEL = 4 SUBLEVEL = 0 SUBLEVEL = 0 EXTRAVERSION = -rc1 EXTRAVERSION = -rc2 NAME = Blurry Fish Butt NAME = Blurry Fish Butt # *DOCUMENTATION* # *DOCUMENTATION* Loading
