Commit 3bdae4f4 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/debug' into x86/irq 

We merge this branch because x86/debug touches code that we started
cleaning up in x86/irq. The two branches started out independent,
but as unexpected amount of activity went into x86/irq, they became
dependent. Resolve that by this cross-merge.
parents 9f1e87ea 5f5db591

Documentation/kernel-parameters.txt

+8 −3
Original line number Diff line number Diff line
@@ -294,7 +294,9 @@ and is between 256 and 4096 characters. It is defined in the file 
			Possible values are:

			isolate - enable device isolation (each device, as far

			          as possible, will get its own protection

			          domain)

			          domain) [default]

			share - put every device behind one IOMMU into the

				same protection domain

			fullflush - enable flushing of IO/TLB entries when

				    they are unmapped. Otherwise they are

				    flushed before they will be reused, which
@@ -1193,8 +1195,8 @@ and is between 256 and 4096 characters. It is defined in the file 
			it is equivalent to "nosmp", which also disables

			the IO APIC.



	max_addr=[KMG]	[KNL,BOOT,ia64] All physical memory greater than or

			equal to this physical address is ignored.

	max_addr=nn[KMG]	[KNL,BOOT,ia64] All physical memory greater than

			or equal to this physical address is ignored.



	max_luns=	[SCSI] Maximum number of LUNs to probe.

			Should be between 1 and 2^32-1.
@@ -1294,6 +1296,9 @@ and is between 256 and 4096 characters. It is defined in the file 


	mga=		[HW,DRM]



	min_addr=nn[KMG]	[KNL,BOOT,ia64] All physical memory below this

			physical address is ignored.



	mminit_loglevel=

			[KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this

			parameter allows control of the logging verbosity for

Documentation/networking/phy.txt

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ Letting the PHY Abstraction Layer do Everything 
   static void adjust_link(struct net_device *dev);

 

 Next, you need to know the device name of the PHY connected to this device. 

 The name will look something like, "phy0:0", where the first number is the

 The name will look something like, "0:00", where the first number is the

 bus id, and the second is the PHY's address on that bus.  Typically,

 the bus is responsible for making its ID unique.

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -1809,7 +1809,7 @@ S: Maintained 


FTRACE

P:	Steven Rostedt

M:	srostedt@redhat.com

M:	rostedt@goodmis.org

S:	Maintained



FUJITSU FR-V (FRV) PORT
@@ -3928,8 +3928,6 @@ M: bootc@bootc.net 
S:	Maintained



SOFTWARE RAID (Multiple Disks) SUPPORT

P:	Ingo Molnar

M:	mingo@redhat.com

P:	Neil Brown

M:	neilb@suse.de

L:	linux-raid@vger.kernel.org

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 28

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Killer Bat of Doom



# *DOCUMENTATION*

arch/blackfin/include/asm/bfin-global.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ extern u16 _bfin_swrst; /* shadow for Software Reset Register (SWRST) */ 
extern unsigned long _ramstart, _ramend, _rambase;

extern unsigned long memory_start, memory_end, physical_mem_end;

extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[],

	_ebss_l1[], _l1_lma_start[], _sdata_b_l1[], _ebss_b_l1[],

	_ebss_l1[], _l1_lma_start[], _sdata_b_l1[], _sbss_b_l1[], _ebss_b_l1[],

	_stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[], _sbss_l2[],

	_ebss_l2[], _l2_lma_start[];

CRA Git | Maintained and supported by SUSTech CRA and CCSE