Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 943d32a1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge google common 'android-3.18' into 'msm-3.18'"

parents efde38e3 2f7fc274

Documentation/ABI/testing/sysfs-fs-f2fs

+6 −0
Original line number Diff line number Diff line
@@ -186,3 +186,9 @@ Date: August 2017 
Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:

		 Controls sleep time of GC urgent mode



What:		/sys/fs/f2fs/<disk>/readdir_ra

Date:		November 2017

Contact:	"Sheng Yong" <shengyong1@huawei.com>

Description:

		 Controls readahead inode block in readdir.

Documentation/devicetree/bindings/dma/snps-dma.txt

+1 −1
Original line number Diff line number Diff line
@@ -58,6 +58,6 @@ Example: 
		interrupts = <0 35 0x4>;

		status = "disabled";

		dmas = <&dmahost 12 0 1>,

			<&dmahost 13 0 1 0>;

			<&dmahost 13 1 0>;

		dma-names = "rx", "rx";

	};

Documentation/filesystems/ext4.txt

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ data_err=ignore(*) Just print an error message if an error occurs 
data_err=abort		Abort the journal if an error occurs in a file

			data buffer in ordered mode.



grpid			Give objects the same group ID as their creator.

grpid			New objects have the group ID of their parent.

bsdgroups



nogrpid		(*)	New objects have the group ID of their creator.

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 94

SUBLEVEL = 98

EXTRAVERSION =

NAME = Diseased Newt

arch/alpha/kernel/pci_impl.h

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ struct pci_iommu_arena 
};



#if defined(CONFIG_ALPHA_SRM) && \

    (defined(CONFIG_ALPHA_CIA) || defined(CONFIG_ALPHA_LCA))

    (defined(CONFIG_ALPHA_CIA) || defined(CONFIG_ALPHA_LCA) || \

     defined(CONFIG_ALPHA_AVANTI))

# define NEED_SRM_SAVE_RESTORE

#else

# undef NEED_SRM_SAVE_RESTORE