Merge branch 'cm-13.0' of https://github.com/AndroiableDroid/android_…

…kernel_cyanogen_msm8916

.gitignore

@@ -0,0 +1,93 @@
+#
+# NOTE! Don't add files that are generated in specific
+# subdirectories here. Add them in the ".gitignore" file
+# in that subdirectory instead.
+#
+# NOTE! Please use 'git ls-files -i --exclude-standard'
+# command after changing this file, to see if there are
+# any tracked files which get ignored after the change.
+#
+# Normal rules
+#
+.*
+*.o
+*.o.*
+*.a
+*.s
+*.ko
+*.so
+*.so.dbg
+*.mod.c
+*.i
+*.lst
+*.symtypes
+*.order
+modules.builtin
+*.elf
+*.bin
+*.gz
+*.bz2
+*.lzma
+*.xz
+*.lzo
+*.patch
+*.gcno
+
+#
+# Top-level generic files
+#
+/tags
+/TAGS
+/linux
+/vmlinux
+/vmlinuz
+/System.map
+/Module.markers
+/Module.symvers
+
+#
+# Debian directory (make deb-pkg)
+#
+/debian/
+
+#
+# git files that we don't want to ignore even it they are dot-files
+#
+!.gitignore
+!.mailmap
+
+#
+# Generated include files
+#
+include/config
+include/generated
+arch/*/include/generated
+
+# stgit generated dirs
+patches-*
+
+# quilt's files
+patches
+series
+
+# cscope files
+cscope.*
+ncscope.*
+
+# gnu global files
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+
+*.orig
+*~
+\#*#
+
+#
+# Leavings from module signing
+#
+extra_certificates
+signing_key.priv
+signing_key.x509
+x509.genkey

.mailmap

@@ -0,0 +1,118 @@
+#
+# This list is used by git-shortlog to fix a few botched name translations
+# in the git archive, either because the author's full name was messed up
+# and/or not always written the same way, making contributions from the
+# same person appearing not to be so or badly displayed.
+#
+# repo-abbrev: /pub/scm/linux/kernel/git/
+#
+
+Aaron Durbin <[email protected]>
+Adam Oldham <[email protected]>
+Adam Radford <[email protected]>
+Adrian Bunk <[email protected]>
+Alan Cox <[email protected]>
+Alan Cox <[email protected]>
+Aleksey Gorelov <[email protected]>
+Al Viro <[email protected]>
+Al Viro <[email protected]>
+Andreas Herrmann <[email protected]>
+Andrew Morton <[email protected]>
+Andrew Vasquez <[email protected]>
+Andy Adamson <[email protected]>
+Archit Taneja <[email protected]>
+Arnaud Patard <[email protected]>
+Arnd Bergmann <[email protected]>
+Axel Dyks <[email protected]>
+Axel Lin <[email protected]>
+Ben Gardner <[email protected]>
+Ben M Cahill <[email protected]>
+Björn Steinbrink <[email protected]>
+Brian Avery <[email protected]>
+Brian King <[email protected]>
+Christoph Hellwig <[email protected]>
+Corey Minyard <[email protected]>
+Damian Hobson-Garcia <[email protected]>
+David Brownell <[email protected]>
+David Woodhouse <[email protected]>
+Dmitry Eremin-Solenikov <[email protected]>
+Domen Puncer <[email protected]>
+Douglas Gilbert <[email protected]>
+Ed L. Cashin <[email protected]>
+Evgeniy Polyakov <[email protected]>
+Felipe W Damasio <[email protected]>
+Felix Kuhling <[email protected]>
+Felix Moeller <[email protected]>
+Filipe Lautert <[email protected]>
+Franck Bui-Huu <[email protected]>
+Frank Zago <[email protected]>
+Greg Kroah-Hartman <greg@echidna.(none)>
+Greg Kroah-Hartman <[email protected]>
+Greg Kroah-Hartman <[email protected]>
+Henk Vergonet <[email protected]>
+Henrik Kretzschmar <[email protected]>
+Herbert Xu <[email protected]>
+Jacob Shin <[email protected]>
+James Bottomley <jejb@mulgrave.(none)>
+James Bottomley <[email protected]>
+James E Wilson <[email protected]>
+James Ketrenos <jketreno@io.(none)>
+Jean Tourrilhes <[email protected]>
+Jeff Garzik <[email protected]>
+Jens Axboe <[email protected]>
+Jens Osterkamp <[email protected]>
+John Stultz <[email protected]>
+Juha Yrjola <at solidboot.com>
+Juha Yrjola <[email protected]>
+Juha Yrjola <[email protected]>
+Kay Sievers <[email protected]>
+Kenneth W Chen <[email protected]>
+Koushik <[email protected]>
+Kuninori Morimoto <[email protected]>
+Leonid I Ananiev <[email protected]>
+Linas Vepstas <[email protected]>
+Mark Brown <[email protected]>
+Matthieu CASTET <[email protected]>
+Mayuresh Janorkar <[email protected]>
+Michael Buesch <[email protected]>
+Michel Dänzer <[email protected]>
+Mitesh shah <[email protected]>
+Morten Welinder <[email protected]>
+Morten Welinder <[email protected]>
+Morten Welinder <[email protected]>
+Morten Welinder <[email protected]>
+Mythri P K <[email protected]>
+Nguyen Anh Quynh <[email protected]>
+Paolo 'Blaisorblade' Giarrusso <[email protected]>
+Patrick Mochel <[email protected]>
+Peter A Jonsson <[email protected]>
+Peter Oruba <[email protected]>
+Peter Oruba <[email protected]>
+Praveen BP <[email protected]>
+Rajesh Shah <[email protected]>
+Ralf Baechle <[email protected]>
+Ralf Wildenhues <[email protected]>
+Rémi Denis-Courmont <[email protected]>
+Rudolf Marek <[email protected]>
+Rui Saraiva <[email protected]>
+Sachin P Sant <[email protected]>
+Sam Ravnborg <[email protected]>
+Sascha Hauer <[email protected]>
+S.Çağlar Onur <[email protected]>
+Simon Kelley <[email protected]>
+Stéphane Witzmann <[email protected]>
+Stephen Hemminger <[email protected]>
+Sumit Semwal <[email protected]>
+Tejun Heo <[email protected]>
+Thomas Graf <[email protected]>
+Tony Luck <[email protected]>
+Tsuneo Yoshioka <[email protected]>
+Uwe Kleine-König <[email protected]>
+Uwe Kleine-König <[email protected]>
+Uwe Kleine-König <[email protected]>
+Valdis Kletnieks <[email protected]>
+Viresh Kumar <[email protected]> <[email protected]>
+Takashi YOSHII <[email protected]>
+Yusuke Goda <[email protected]>
+Gustavo Padovan <[email protected]>
+Gustavo Padovan <[email protected]>

Documentation/ABI/testing/sysfs-block-zram

@@ -5,20 +5,33 @@ Description:
 		The disksize file is read-write and specifies the disk size
 		which represents the limit on the *uncompressed* worth of data
 		that can be stored in this disk.
+<<<<<<< HEAD
+=======
+		Unit: bytes
+>>>>>>> ff59b2a95bafd4a5ced1a0700067b39cf3b37bed
 
 What:		/sys/block/zram<id>/initstate
 Date:		August 2010
 Contact:	Nitin Gupta <[email protected]>
 Description:
+<<<<<<< HEAD
 		The disksize file is read-only and shows the initialization
+=======
+		The initstate file is read-only and shows the initialization
+>>>>>>> ff59b2a95bafd4a5ced1a0700067b39cf3b37bed
 		state of the device.
 
 What:		/sys/block/zram<id>/reset
 Date:		August 2010
 Contact:	Nitin Gupta <[email protected]>
 Description:
+<<<<<<< HEAD
 		The disksize file is write-only and allows resetting the
 		device. The reset operation frees all the memory assocaited
+=======
+		The reset file is write-only and allows resetting the
+		device. The reset operation frees all the memory associated
+>>>>>>> ff59b2a95bafd4a5ced1a0700067b39cf3b37bed
 		with this device.
 
 What:		/sys/block/zram<id>/num_reads
@@ -42,6 +55,7 @@ Description:
 		The invalid_io file is read-only and specifies the number of
 		non-page-size-aligned I/O requests issued to this device.
 
+<<<<<<< HEAD
 What:		/sys/block/zram<id>/notify_free
 Date:		August 2010
 Contact:	Nitin Gupta <[email protected]>
@@ -60,6 +74,50 @@ Description:
 		discard requests received by this device. These requests
 		provide information to block device regarding blocks which are
 		no longer used by filesystem.
+=======
+What:		/sys/block/zram<id>/failed_reads
+Date:		February 2014
+Contact:	Sergey Senozhatsky <[email protected]>
+Description:
+		The failed_reads file is read-only and specifies the number of
+		failed reads happened on this device.
+
+What:		/sys/block/zram<id>/failed_writes
+Date:		February 2014
+Contact:	Sergey Senozhatsky <[email protected]>
+Description:
+		The failed_writes file is read-only and specifies the number of
+		failed writes happened on this device.
+
+What:		/sys/block/zram<id>/max_comp_streams
+Date:		February 2014
+Contact:	Sergey Senozhatsky <[email protected]>
+Description:
+		The max_comp_streams file is read-write and specifies the
+		number of backend's zcomp_strm compression streams (number of
+		concurrent compress operations).
+
+What:		/sys/block/zram<id>/comp_algorithm
+Date:		February 2014
+Contact:	Sergey Senozhatsky <[email protected]>
+Description:
+		The comp_algorithm file is read-write and lets to show
+		available and selected compression algorithms, change
+		compression algorithm selection.
+
+What:		/sys/block/zram<id>/notify_free
+Date:		August 2010
+Contact:	Nitin Gupta <[email protected]>
+Description:
+		The notify_free file is read-only. Depending on device usage
+		scenario it may account a) the number of pages freed because
+		of swap slot free notifications or b) the number of pages freed
+		because of REQ_DISCARD requests sent by bio. The former ones
+		are sent to a swap block device when a swap slot is freed, which
+		implies that this disk is being used as a swap disk. The latter
+		ones are sent by filesystem mounted with discard option,
+		whenever some data blocks are getting discarded.
+>>>>>>> ff59b2a95bafd4a5ced1a0700067b39cf3b37bed
 
 What:		/sys/block/zram<id>/zero_pages
 Date:		August 2010
@@ -97,3 +155,50 @@ Description:
 		efficiency can be calculated using compr_data_size and this
 		statistic.
 		Unit: bytes
+<<<<<<< HEAD
+=======
+
+What:		/sys/block/zram<id>/mem_used_max
+Date:		August 2014
+Contact:	Minchan Kim <[email protected]>
+Description:
+		The mem_used_max file is read/write and specifies the amount
+		of maximum memory zram have consumed to store compressed data.
+		For resetting the value, you should write "0". Otherwise,
+		you could see -EINVAL.
+		Unit: bytes
+
+What:		/sys/block/zram<id>/mem_limit
+Date:		August 2014
+Contact:	Minchan Kim <[email protected]>
+Description:
+		The mem_limit file is read/write and specifies the maximum
+		amount of memory ZRAM can use to store the compressed data.  The
+		limit could be changed in run time and "0" means disable the
+		limit.  No limit is the initial state.  Unit: bytes
+
+What:		/sys/block/zram<id>/compact
+Date:		August 2015
+Contact:	Minchan Kim <[email protected]>
+Description:
+		The compact file is write-only and trigger compaction for
+		allocator zrm uses. The allocator moves some objects so that
+		it could free fragment space.
+
+What:		/sys/block/zram<id>/io_stat
+Date:		August 2015
+Contact:	Sergey Senozhatsky <[email protected]>
+Description:
+		The io_stat file is read-only and accumulates device's I/O
+		statistics not accounted by block layer. For example,
+		failed_reads, failed_writes, etc. File format is similar to
+		block layer statistics file format.
+
+What:		/sys/block/zram<id>/mm_stat
+Date:		August 2015
+Contact:	Sergey Senozhatsky <[email protected]>
+Description:
+		The mm_stat file is read-only and represents device's mm
+		statistics (orig_data_size, compr_data_size, etc.) in a format
+		similar to block layer statistics file format.
+>>>>>>> ff59b2a95bafd4a5ced1a0700067b39cf3b37bed