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

Commit 6effe5f5 authored by Len Brown's avatar Len Brown
Browse files

Merge branches 'sony-laptop', 'bugzilla-14247' and 'bugzilla-14271' into release

parents 5e6f9725 e12ac3d0 a83893ae

Documentation/SubmittingPatches

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ your e-mail client so that it sends your patches untouched. 
When sending patches to Linus, always follow step #7.



Large changes are not appropriate for mailing lists, and some

maintainers.  If your patch, uncompressed, exceeds 40 kB in size,

maintainers.  If your patch, uncompressed, exceeds 300 kB in size,

it is preferred that you store your patch on an Internet-accessible

server, and provide instead a URL (link) pointing to your patch.

Documentation/filesystems/ext4.txt

+10 −3
Original line number Diff line number Diff line
@@ -282,9 +282,16 @@ stripe=n Number of filesystem blocks that mballoc will try 
			to use for allocation size and alignment. For RAID5/6

			systems this should be the number of data

			disks *  RAID chunk size in file system blocks.

delalloc	(*)	Deferring block allocation until write-out time.

nodelalloc		Disable delayed allocation. Blocks are allocation

			when data is copied from user to page cache.



delalloc	(*)	Defer block allocation until just before ext4

			writes out the block(s) in question.  This

			allows ext4 to better allocation decisions

			more efficiently.

nodelalloc		Disable delayed allocation.  Blocks are allocated

			when the data is copied from userspace to the

			page cache, either via the write(2) system call

			or when an mmap'ed page which was previously

			unallocated is written for the first time.



max_batch_time=usec	Maximum amount of time ext4 should wait for

			additional filesystem operations to be batch

Documentation/filesystems/proc.txt

+0 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,6 @@ Table 1-12: Files in /proc/fs/ext4/<devname> 
..............................................................................

 File            Content                                        

 mb_groups       details of multiblock allocator buddy cache of free blocks

 mb_history      multiblock allocation history

..............................................................................

Documentation/filesystems/vfat.txt

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ shortname=lower|win95|winnt|mixed 
		 winnt: emulate the Windows NT rule for display/create.

		 mixed: emulate the Windows NT rule for display,

			emulate the Windows 95 rule for create.

		 Default setting is `lower'.

		 Default setting is `mixed'.



tz=UTC        -- Interpret timestamps as UTC rather than local time.

                 This option disables the conversion of timestamps

MAINTAINERS

+15 −2
Original line number Diff line number Diff line
@@ -741,23 +741,36 @@ M: Dirk Opfer <dirk@opfer-online.de> 
S:	Maintained



ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT

P:	Marek Vasut

M:	marek.vasut@gmail.com

M:	Marek Vasut <marek.vasut@gmail.com>

L:	linux-arm-kernel@lists.infradead.org

W:	http://hackndev.com

S:	Maintained

F:	arch/arm/mach-pxa/include/mach/palmtx.h

F:	arch/arm/mach-pxa/palmtx.c

F:	arch/arm/mach-pxa/include/mach/palmt5.h

F:	arch/arm/mach-pxa/palmt5.c

F:	arch/arm/mach-pxa/include/mach/palmld.h

F:	arch/arm/mach-pxa/palmld.c

F:	arch/arm/mach-pxa/include/mach/palmte2.h

F:	arch/arm/mach-pxa/palmte2.c

F:	arch/arm/mach-pxa/include/mach/palmtc.h

F:	arch/arm/mach-pxa/palmtc.c



ARM/PALM TREO 680 SUPPORT

M:	Tomas Cech <sleep_walker@suse.cz>

L:	linux-arm-kernel@lists.infradead.org

W:	http://hackndev.com

S:	Maintained

F:	arch/arm/mach-pxa/include/mach/treo680.h

F:	arch/arm/mach-pxa/treo680.c



ARM/PALMZ72 SUPPORT

M:	Sergey Lapin <slapin@ossfans.org>

L:	linux-arm-kernel@lists.infradead.org

W:	http://hackndev.com

S:	Maintained

F:	arch/arm/mach-pxa/include/mach/palmz72.h

F:	arch/arm/mach-pxa/palmz72.c



ARM/PLEB SUPPORT

M:	Peter Chubb <pleb@gelato.unsw.edu.au>