Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de9ea203 authored by Russell King's avatar Russell King
Browse files

Merge branch 'origin'

parents 2be23c47 d56557af

Documentation/DocBook/tracepoint.tmpl

+5 −0
Original line number Diff line number Diff line
@@ -104,4 +104,9 @@ 
   <title>Block IO</title>

!Iinclude/trace/events/block.h

  </chapter>



  <chapter id="workqueue">

   <title>Workqueue</title>

!Iinclude/trace/events/workqueue.h

  </chapter>

</book>

Documentation/kernel-parameters.txt

+10 −7
Original line number Diff line number Diff line
@@ -1974,15 +1974,18 @@ and is between 256 and 4096 characters. It is defined in the file 
		force	Enable ASPM even on devices that claim not to support it.

			WARNING: Forcing ASPM on may cause system lockups.



	pcie_ports=	[PCIE] PCIe ports handling:

		auto	Ask the BIOS whether or not to use native PCIe services

			associated with PCIe ports (PME, hot-plug, AER).  Use

			them only if that is allowed by the BIOS.

		native	Use native PCIe services associated with PCIe ports

			unconditionally.

		compat	Treat PCIe ports as PCI-to-PCI bridges, disable the PCIe

			ports driver.



	pcie_pme=	[PCIE,PM] Native PCIe PME signaling options:

			Format: {auto|force}[,nomsi]

		auto	Use native PCIe PME signaling if the BIOS allows the

			kernel to control PCIe config registers of root ports.

		force	Use native PCIe PME signaling even if the BIOS refuses

			to allow the kernel to control the relevant PCIe config

			registers.

		nomsi	Do not use MSI for native PCIe PME signaling (this makes

			all PCIe root ports use INTx for everything).

			all PCIe root ports use INTx for all services).



	pcmv=		[HW,PCMCIA] BadgePAD 4

MAINTAINERS

+8 −3
Original line number Diff line number Diff line
@@ -2201,6 +2201,12 @@ L: linux-rdma@vger.kernel.org 
S:	Supported

F:	drivers/infiniband/hw/ehca/



EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER

M:	Breno Leitao <leitao@linux.vnet.ibm.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ehea/



EMBEDDED LINUX

M:	Paul Gortmaker <paul.gortmaker@windriver.com>

M:	Matt Mackall <mpm@selenic.com>
@@ -3923,8 +3929,7 @@ F: Documentation/sound/oss/MultiSound 
F:	sound/oss/msnd*



MULTITECH MULTIPORT CARD (ISICOM)

M:	Jiri Slaby <jirislaby@gmail.com>

S:	Maintained

S:	Orphan

F:	drivers/char/isicom.c

F:	include/linux/isicom.h
@@ -4604,7 +4609,7 @@ F: include/linux/preempt.h 
PRISM54 WIRELESS DRIVER

M:	"Luis R. Rodriguez" <mcgrof@gmail.com>

L:	linux-wireless@vger.kernel.org

W:	http://prism54.org

W:	http://wireless.kernel.org/en/users/Drivers/p54

S:	Obsolete

F:	drivers/net/wireless/prism54/

arch/alpha/include/asm/cache.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
# define L1_CACHE_SHIFT     5

#endif



#define L1_CACHE_ALIGN(x)  (((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))

#define SMP_CACHE_BYTES    L1_CACHE_BYTES



#endif

arch/alpha/kernel/err_marvel.c

+3 −3
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ marvel_print_err_cyc(u64 err_cyc) 
#define IO7__ERR_CYC__CYCLE__M	(0x7)



	printk("%s        Packet In Error: %s\n"

	       "%s        Error in %s, cycle %ld%s%s\n",

	       "%s        Error in %s, cycle %lld%s%s\n",

	       err_print_prefix, 

	       packet_desc[EXTRACT(err_cyc, IO7__ERR_CYC__PACKET)],

	       err_print_prefix,
@@ -313,7 +313,7 @@ marvel_print_po7_ugbge_sym(u64 ugbge_sym) 
	}



	printk("%s      Up Hose Garbage Symptom:\n"

	       "%s        Source Port: %ld - Dest PID: %ld - OpCode: %s\n", 

	       "%s        Source Port: %lld - Dest PID: %lld - OpCode: %s\n",

	       err_print_prefix,

	       err_print_prefix, 

	       EXTRACT(ugbge_sym, IO7__PO7_UGBGE_SYM__UPH_SRC_PORT),
@@ -552,7 +552,7 @@ marvel_print_pox_spl_cmplt(u64 spl_cmplt) 
#define IO7__POX_SPLCMPLT__REM_BYTE_COUNT__M	(0xfff)



	printk("%s      Split Completion Error:\n"	

	       "%s         Source (Bus:Dev:Func): %ld:%ld:%ld\n",

	       "%s         Source (Bus:Dev:Func): %lld:%lld:%lld\n",

	       err_print_prefix,

	       err_print_prefix,

	       EXTRACT(spl_cmplt, IO7__POX_SPLCMPLT__SOURCE_BUS),