Hi Josh,
On Wed, May 23, 2012 at 3:31 PM, Josh Boyer <jwboyer@xxxxxxxxxx> wrote:
> kmod doesn't read /etc/modprobe.conf at all, so don't mention it in the
> modprobe man page. Point users to modprobe.d(5) instead.
> ---
> man/modprobe.xml | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/man/modprobe.xml b/man/modprobe.xml
> index e98e44e..03a534b 100644
> --- a/man/modprobe.xml
> +++ b/man/modprobe.xml
> @@ -80,10 +80,10 @@
> <command>modprobe</command> looks in the module directory
> <filename>/lib/modules/`uname -r`</filename> for all
> the modules and other files, except for the optional
> - <filename>/etc/modprobe.conf</filename> configuration file and
> + configuration files in the
> <filename>/etc/modprobe.d</filename> directory
> (see <citerefentry>
> - <refentrytitle>modprobe.conf</refentrytitle><manvolnum>5</manvolnum>
> + <refentrytitle>modprobe.d</refentrytitle><manvolnum>5</manvolnum>
> </citerefentry>). <command>modprobe</command> will also use module
> options specified on the kernel command line in the form of
> <module>.<option> and blacklists in the form of
> --
The patch had a trailing whitespace:
Applying: doc: Don't reference /etc/modprobe.conf
/home/lucas/p/kmod/.git/rebase-apply/patch:14: trailing whitespace.
configuration files in the
warning: 1 line adds whitespace errors.
I fixed it up and applied the patch. Thanks
Lucas De Marchi
--
To unsubscribe from this list: send the line "unsubscribe linux-modules" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
