Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (63f45b80) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/early-userspace/README

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ the image from specifications.
		CPIO ARCHIVE method

		You can create a cpio archive that contains the early userspace image.
		Youre cpio archive should be specified in CONFIG_INITRAMFS_SOURCE and it
		Your cpio archive should be specified in CONFIG_INITRAMFS_SOURCE and it
		will be used directly. Only a single cpio file may be specified in
		CONFIG_INITRAMFS_SOURCE and directory and file names are not allowed in
		combination with a cpio archive.

+0 −1

Original line number	Diff line number	Diff line
		@@ -1988,7 +1988,6 @@ PKTCDVD DRIVER
		P: Peter Osterlund
		M: petero2@telia.com
		L: linux-kernel@vger.kernel.org
		L: packet-writing@suse.com
		S: Maintained

		POSIX CLOCKS and TIMERS

+4 −4

Original line number	Diff line number	Diff line
		@@ -97,6 +97,10 @@
		* features to asm/floppy.h.
		*/

		/*
		* 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
		*/

		/*
		* 1998/05/07 -- Russell King -- More portability cleanups; moved definition of
		* interrupt and dma channel to asm/floppy.h. Cleaned up some formatting &
		@@ -158,10 +162,6 @@ static int print_unex = 1;
		#define FDPATCHES
		#include <linux/fdreg.h>

		/*
		* 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
		*/

		#include <linux/fd.h>
		#include <linux/hdreg.h>

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#include "../lowlevel/ftape-rw.h"
		#include "../lowlevel/ftape-read.h"
		#include "../lowlevel/ftape-tracing.h"
		#include "../lowlevel/ftape-buffer.h"

		/* DMA'able memory allocation stuff.
		*/

+1 −0