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

Commit 82a0a1cc authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'origin/master' into next 

Manual merge of:
	arch/powerpc/include/asm/pgtable-ppc32.h
parents 8d30c14c 5955c7a2

Documentation/PCI/PCIEBUS-HOWTO.txt

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ the PCI Express Port Bus driver from loading a service driver. 


int pcie_port_service_register(struct pcie_port_service_driver *new)



This API replaces the Linux Driver Model's pci_module_init API. A

This API replaces the Linux Driver Model's pci_register_driver API. A

service driver should always calls pcie_port_service_register at

module init. Note that after service driver being loaded, calls

such as pci_enable_device(dev) and pci_set_master(dev) are no longer

Documentation/connector/cn_test.c

+2 −4
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void cn_test_timer_func(unsigned long __data) 


		memcpy(m + 1, data, m->len);



		cn_netlink_send(m, 0, gfp_any());

		cn_netlink_send(m, 0, GFP_ATOMIC);

		kfree(m);

	}
@@ -160,10 +160,8 @@ static int cn_test_init(void) 
		goto err_out;

	}



	init_timer(&cn_test_timer);

	cn_test_timer.function = cn_test_timer_func;

	setup_timer(&cn_test_timer, cn_test_timer_func, 0);

	cn_test_timer.expires = jiffies + HZ;

	cn_test_timer.data = 0;

	add_timer(&cn_test_timer);



	return 0;

Documentation/kernel-doc-nano-HOWTO.txt

+4 −3
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ Only comments so marked will be considered by the kernel-doc scripts, 
and any comment so marked must be in kernel-doc format.  Do not use

"/**" to be begin a comment block unless the comment block contains

kernel-doc formatted comments.  The closing comment marker for

kernel-doc comments can be either "*/" or "**/".

kernel-doc comments can be either "*/" or "**/", but "*/" is

preferred in the Linux kernel tree.



Kernel-doc comments should be placed just before the function

or data structure being described.
@@ -63,7 +64,7 @@ Example kernel-doc function comment: 
 * comment lines.

 *

 * The longer description can have multiple paragraphs.

 **/

 */



The first line, with the short description, must be on a single line.
@@ -85,7 +86,7 @@ Example kernel-doc data structure comment. 
 *		perhaps with more lines and words.

 *

 * Longer description of this structure.

 **/

 */



The kernel-doc function comments describe each parameter to the

function, in order, with the @name lines.

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -937,6 +937,8 @@ and is between 256 and 4096 characters. It is defined in the file 




	intel_iommu=	[DMAR] Intel IOMMU driver (DMAR) option

		on

			Enable intel iommu driver.

		off

			Disable intel iommu driver.

		igfx_off [Default Off]

Documentation/tracers/mmiotrace.txt

+2 −4
Original line number Diff line number Diff line
@@ -78,12 +78,10 @@ to view your kernel log and look for "mmiotrace has lost events" warning. If 
events were lost, the trace is incomplete. You should enlarge the buffers and

try again. Buffers are enlarged by first seeing how large the current buffers

are:

$ cat /debug/tracing/trace_entries

$ cat /debug/tracing/buffer_size_kb

gives you a number. Approximately double this number and write it back, for

instance:

$ echo 0 > /debug/tracing/tracing_enabled

$ echo 128000 > /debug/tracing/trace_entries

$ echo 1 > /debug/tracing/tracing_enabled

$ echo 128000 > /debug/tracing/buffer_size_kb

Then start again from the top.



If you are doing a trace for a driver project, e.g. Nouveau, you should also