linux-kernel - linux-next: manual merge of the usb tree with the tip tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 9 Mar 2016 13:35:15 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kees Cook <keescook@...omium.org>,
	Heiko Stuebner <heiko@...ech.de>,
	Kishon Vijay Abraham I <kishon@...com>
Subject: linux-next: manual merge of the usb tree with the tip tree

Hi all,

Today's linux-next merge of the usb tree got a conflict in:

  Documentation/kernel-parameters.txt

between commit:

  d2aa1acad22f ("mm/init: Add 'rodata=off' boot cmdline parameter to disable read-only kernel mappings")

from the tip tree and commit:

  605df8af33a7 ("phy: rockchip-usb: add handler for usb-uart functionality")

from the usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/kernel-parameters.txt
index 1bf357083cef,8a6c6c02f916..000000000000
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -3517,10 -3491,12 +3517,16 @@@ bytes respectively. Such letter suffixe
  
  	ro		[KNL] Mount root device read-only on boot
  
+ 	rockchip.usb_uart
+ 			Enable the uart passthrough on the designated usb port
+ 			on Rockchip SoCs. When active, the signals of the
+ 			debug-uart get routed to the D+ and D- pins of the usb
+ 			port and the regular usb controller gets disabled.
+ 
 +	rodata=		[KNL]
 +		on	Mark read-only kernel memory as read-only (default).
 +		off	Leave read-only kernel memory writable for debugging.
 +
  	root=		[KNL] Root filesystem
  			See name_to_dev_t comment in init/do_mounts.c.