From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@elte•hu>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kees Cook <keescook@chromium•org>,
Heiko Stuebner <heiko@sntech•de>,
Kishon Vijay Abraham I <kishon@ti•com>
Subject: linux-next: manual merge of the usb tree with the tip tree
Date: Wed, 9 Mar 2016 13:35:15 +1100 [thread overview]
Message-ID: <20160309133515.4e7e4e95@canb.auug.org.au> (raw)
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.
next reply other threads:[~2016-03-09 2:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 2:35 Stephen Rothwell [this message]
2016-03-09 4:17 ` linux-next: manual merge of the usb tree with the tip tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2014-03-17 7:34 Stephen Rothwell
2014-03-17 18:30 ` Greg KH
2014-03-17 7:31 Stephen Rothwell
2014-03-17 18:30 ` Greg KH
2009-08-19 7:59 Stephen Rothwell
2009-08-19 23:38 ` Greg KH
2009-08-20 2:37 ` Jason Wessel
2009-08-20 2:48 ` Greg KH
2009-08-20 5:57 ` Peter Zijlstra
2009-08-20 19:31 ` Jason Wessel
2009-08-20 10:35 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160309133515.4e7e4e95@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=heiko@sntech$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=kishon@ti$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox