diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-13 10:36:39 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-13 10:36:39 +0100 |
commit | c24889167583c2e7fbd1a9e12ef508c8405f6fd4 (patch) | |
tree | 4be6b8654d135b554253b6ab22c314260a413751 /init | |
parent | 38bf57fa7b671f2bf7530888aa8199450265c5c8 (diff) | |
parent | 868c97a846a73e937d835b09b8c885a69df50ec8 (diff) | |
download | linux-stable-c24889167583c2e7fbd1a9e12ef508c8405f6fd4.tar.gz linux-stable-c24889167583c2e7fbd1a9e12ef508c8405f6fd4.tar.bz2 linux-stable-c24889167583c2e7fbd1a9e12ef508c8405f6fd4.zip |
Merge tag 'docs-4.10' of git://git.lwn.net/linux into drm-misc-next
Backmerge the docs-next branch from Jon into drm-misc so that we can
apply the dma-buf documentation cleanup patches. Git found a conflict
where there was none because both drm-misc and docs had identical
patches to clean up file rename issues in the rst include directives.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 2 | ||||
-rw-r--r-- | init/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 34407f15e6d3..172f80ea0d58 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1306,7 +1306,7 @@ config BLK_DEV_INITRD boot loader (loadlin or lilo) and that is mounted as root before the normal boot procedure. It is typically used to load modules needed to mount the "real" root file system, - etc. See <file:Documentation/initrd.txt> for details. + etc. See <file:Documentation/admin-guide/initrd.rst> for details. If RAM disk support (BLK_DEV_RAM) is also included, this also enables initial RAM disk (initrd) support and adds diff --git a/init/main.c b/init/main.c index 2858be732f6d..691eb9351a83 100644 --- a/init/main.c +++ b/init/main.c @@ -980,7 +980,7 @@ static int __ref kernel_init(void *unused) return 0; panic("No working init found. Try passing init= option to kernel. " - "See Linux Documentation/init.txt for guidance."); + "See Linux Documentation/admin-guide/init.rst for guidance."); } static noinline void __init kernel_init_freeable(void) |