Messages in this thread | | | Date | Wed, 9 Mar 2016 13:35:15 +1100 | From | Stephen Rothwell <> | 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.
| |