Skip to content

Commit

Permalink
Merge pull request #7 from torvalds/master
Browse files Browse the repository at this point in the history
upgrade to latest head of torvalds/linux
  • Loading branch information
AshishNamdev committed Sep 29, 2015
2 parents 5a55224 + 3225031 commit 235cb6f
Show file tree
Hide file tree
Showing 19,733 changed files with 1,877,640 additions and 644,848 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .get_maintainer.ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Christoph Hellwig <[email protected]>
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
*.order
*.elf
*.bin
*.tar
*.gz
*.bz2
*.lzma
Expand All @@ -35,6 +36,7 @@
modules.builtin
Module.symvers
*.dwo
*.su

#
# Top-level generic files
Expand All @@ -43,6 +45,7 @@ Module.symvers
/TAGS
/linux
/vmlinux
/vmlinux.32
/vmlinux-gdb.py
/vmlinuz
/System.map
Expand Down Expand Up @@ -88,6 +91,9 @@ GRTAGS
GSYMS
GTAGS

# id-utils files
ID

*.orig
*~
\#*#
Expand All @@ -96,6 +102,7 @@ GTAGS
# Leavings from module signing
#
extra_certificates
signing_key.pem
signing_key.priv
signing_key.x509
x509.genkey
Expand Down
10 changes: 9 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Aleksey Gorelov <[email protected]>
Al Viro <[email protected]>
Al Viro <[email protected]>
Andreas Herrmann <[email protected]>
Andrey Ryabinin <[email protected]> <[email protected]>
Andrew Morton <[email protected]>
Andrew Vasquez <[email protected]>
Andy Adamson <[email protected]>
Expand Down Expand Up @@ -84,6 +85,7 @@ Mayuresh Janorkar <[email protected]>
Michael Buesch <[email protected]>
Michel Dänzer <[email protected]>
Mitesh shah <[email protected]>
Mohit Kumar <[email protected]> <[email protected]>
Morten Welinder <[email protected]>
Morten Welinder <[email protected]>
Morten Welinder <[email protected]>
Expand All @@ -95,11 +97,14 @@ Patrick Mochel <[email protected]>
Peter A Jonsson <[email protected]>
Peter Oruba <[email protected]>
Peter Oruba <[email protected]>
Pratyush Anand <[email protected]> <[email protected]>
Praveen BP <[email protected]>
Rajesh Shah <[email protected]>
Ralf Baechle <[email protected]>
Ralf Wildenhues <[email protected]>
Randy Dunlap <[email protected]> <[email protected]>
Rémi Denis-Courmont <[email protected]>
Ricardo Ribalda Delgado <[email protected]>
Rudolf Marek <[email protected]>
Rui Saraiva <[email protected]>
Sachin P Sant <[email protected]>
Expand All @@ -112,6 +117,7 @@ Shiraz Hashim <[email protected]> <[email protected]>
Simon Kelley <[email protected]>
Stéphane Witzmann <[email protected]>
Stephen Hemminger <[email protected]>
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
Sumit Semwal <[email protected]>
Tejun Heo <[email protected]>
Thomas Graf <[email protected]>
Expand All @@ -121,7 +127,9 @@ 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]>
Viresh Kumar <[email protected]> <[email protected]>
Viresh Kumar <[email protected]> <[email protected]>
Viresh Kumar <[email protected]> <[email protected]>
Takashi YOSHII <[email protected]>
Yusuke Goda <[email protected]>
Gustavo Padovan <[email protected]>
Expand Down
50 changes: 45 additions & 5 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ D: One of assisting postmasters for vger.kernel.org's lists
S: (ask for current address)
S: Finland

N: Thomas Abraham
E: [email protected]
D: Samsung pin controller driver

N: Dragos Acostachioaie
E: [email protected]
W: http://www.arbornet.org/~dragos
Expand Down Expand Up @@ -508,6 +512,10 @@ E: [email protected]
W: http://paulbristow.net/linux/idefloppy.html
D: Maintainer of IDE/ATAPI floppy driver

N: Stefano Brivio
E: [email protected]
D: Broadcom B43 driver

N: Dominik Brodowski
E: [email protected]
W: http://www.brodo.de/
Expand Down Expand Up @@ -2045,6 +2053,10 @@ D: pirq addr, CS5535 alsa audio driver
S: Gurgaon, India
S: Kuala Lumpur, Malaysia

N: Mohit Kumar
D: ST Microelectronics SPEAr13xx PCI host bridge driver
D: Synopsys Designware PCI host bridge driver

N: Gabor Kuti
M: [email protected]
M: [email protected]
Expand Down Expand Up @@ -2732,6 +2744,10 @@ S: C/ Mieses 20, 9-B
S: Valladolid 47009
S: Spain

N: Jens Osterkamp
E: [email protected]
D: Maintainer of Spidernet network driver for Cell

N: Gadi Oxman
E: [email protected]
D: Original author and maintainer of IDE/ATAPI floppy/tape drivers
Expand Down Expand Up @@ -2976,6 +2992,10 @@ S: 2200 Mission College Blvd
S: Santa Clara, CA 95052
S: USA

N: Anil Ravindranath
E: [email protected]
D: PMC-Sierra MaxRAID driver

N: Eric S. Raymond
E: [email protected]
W: http://www.tuxedo.org/~esr/
Expand Down Expand Up @@ -3008,6 +3028,19 @@ W: http://www.qsl.net/dl1bke/
D: Generic Z8530 driver, AX.25 DAMA slave implementation
D: Several AX.25 hacks

N: Ricardo Ribalda Delgado
E: [email protected]
W: http://ribalda.com
D: PLX USB338x driver
D: PCA9634 driver
D: Option GTM671WFS
D: Fintek F81216A
D: Various kernel hacks
S: Qtechnology A/S
S: Valby Langgade 142
S: 2500 Valby
S: Denmark

N: Francois-Rene Rideau
E: [email protected]
W: http://www.tunes.org/~fare
Expand Down Expand Up @@ -3194,15 +3227,15 @@ S: 69 rue Dunois
S: 75013 Paris
S: France

N: Aleksa Sarai
E: [email protected]
W: https://www.cyphar.com/
D: `pids` cgroup subsystem

N: Dipankar Sarma
E: [email protected]
D: RCU

N: Yoshinori Sato
E: [email protected]
D: uClinux for Renesas H8/300 (H8300)
D: http://uclinux-h8.sourceforge.jp/

N: Hannu Savolainen
E: [email protected]
D: Maintainer of the sound drivers until 2.1.x days.
Expand Down Expand Up @@ -3688,6 +3721,13 @@ N: Dirk Verworner
D: Co-author of German book ``Linux-Kernel-Programmierung''
D: Co-founder of Berlin Linux User Group

N: Andrew Victor
E: [email protected]
W: http://maxim.org.za/at91_26.html
D: First maintainer of Atmel ARM-based SoC, aka AT91
D: Introduced support for at91rm9200, the first chip of AT91 family
S: South Africa

N: Riku Voipio
E: [email protected]
D: Author of PCA9532 LED and Fintek f75375s hwmon driver
Expand Down
119 changes: 119 additions & 0 deletions Documentation/ABI/obsolete/sysfs-block-zram
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
What: /sys/block/zram<id>/num_reads
Date: August 2015
Contact: Sergey Senozhatsky <[email protected]>
Description:
The num_reads file is read-only and specifies the number of
reads (failed or successful) done on this device.
Now accessible via zram<id>/stat node.

What: /sys/block/zram<id>/num_writes
Date: August 2015
Contact: Sergey Senozhatsky <[email protected]>
Description:
The num_writes file is read-only and specifies the number of
writes (failed or successful) done on this device.
Now accessible via zram<id>/stat node.

What: /sys/block/zram<id>/invalid_io
Date: August 2015
Contact: Sergey Senozhatsky <[email protected]>
Description:
The invalid_io file is read-only and specifies the number of
non-page-size-aligned I/O requests issued to this device.
Now accessible via zram<id>/io_stat node.

What: /sys/block/zram<id>/failed_reads
Date: August 2015
Contact: Sergey Senozhatsky <[email protected]>
Description:
The failed_reads file is read-only and specifies the number of
failed reads happened on this device.
Now accessible via zram<id>/io_stat node.

What: /sys/block/zram<id>/failed_writes
Date: August 2015
Contact: Sergey Senozhatsky <[email protected]>
Description:
The failed_writes file is read-only and specifies the number of
failed writes happened on this device.
Now accessible via zram<id>/io_stat node.

What: /sys/block/zram<id>/notify_free
Date: August 2015
Contact: Sergey Senozhatsky <[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.
Now accessible via zram<id>/io_stat node.

What: /sys/block/zram<id>/zero_pages
Date: August 2015
Contact: Sergey Senozhatsky <[email protected]>
Description:
The zero_pages file is read-only and specifies number of zero
filled pages written to this disk. No memory is allocated for
such pages.
Now accessible via zram<id>/mm_stat node.

What: /sys/block/zram<id>/orig_data_size
Date: August 2015
Contact: Sergey Senozhatsky <[email protected]>
Description:
The orig_data_size file is read-only and specifies uncompressed
size of data stored in this disk. This excludes zero-filled
pages (zero_pages) since no memory is allocated for them.
Unit: bytes
Now accessible via zram<id>/mm_stat node.

What: /sys/block/zram<id>/compr_data_size
Date: August 2015
Contact: Sergey Senozhatsky <[email protected]>
Description:
The compr_data_size file is read-only and specifies compressed
size of data stored in this disk. So, compression ratio can be
calculated using orig_data_size and this statistic.
Unit: bytes
Now accessible via zram<id>/mm_stat node.

What: /sys/block/zram<id>/mem_used_total
Date: August 2015
Contact: Sergey Senozhatsky <[email protected]>
Description:
The mem_used_total file is read-only and specifies the amount
of memory, including allocator fragmentation and metadata
overhead, allocated for this disk. So, allocator space
efficiency can be calculated using compr_data_size and this
statistic.
Unit: bytes
Now accessible via zram<id>/mm_stat node.

What: /sys/block/zram<id>/mem_used_max
Date: August 2015
Contact: Sergey Senozhatsky <[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
Downgraded to write-only node: so it's possible to set new
value only; its current value is stored in zram<id>/mm_stat
node.

What: /sys/block/zram<id>/mem_limit
Date: August 2015
Contact: Sergey Senozhatsky <[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
Downgraded to write-only node: so it's possible to set new
value only; its current value is stored in zram<id>/mm_stat
node.
29 changes: 29 additions & 0 deletions Documentation/ABI/stable/sysfs-bus-vmbus
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
What: /sys/bus/vmbus/devices/vmbus_*/id
Date: Jul 2009
KernelVersion: 2.6.31
Contact: K. Y. Srinivasan <[email protected]>
Description: The VMBus child_relid of the device's primary channel
Users: tools/hv/lsvmbus

What: /sys/bus/vmbus/devices/vmbus_*/class_id
Date: Jul 2009
KernelVersion: 2.6.31
Contact: K. Y. Srinivasan <[email protected]>
Description: The VMBus interface type GUID of the device
Users: tools/hv/lsvmbus

What: /sys/bus/vmbus/devices/vmbus_*/device_id
Date: Jul 2009
KernelVersion: 2.6.31
Contact: K. Y. Srinivasan <[email protected]>
Description: The VMBus interface instance GUID of the device
Users: tools/hv/lsvmbus

What: /sys/bus/vmbus/devices/vmbus_*/channel_vp_mapping
Date: Jul 2015
KernelVersion: 4.2.0
Contact: K. Y. Srinivasan <[email protected]>
Description: The mapping of which primary/sub channels are bound to which
Virtual Processors.
Format: <channel's child_relid:the bound cpu's number>
Users: tools/hv/lsvmbus
11 changes: 11 additions & 0 deletions Documentation/ABI/stable/sysfs-bus-w1
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
What: /sys/bus/w1/devices/.../w1_master_timeout_us
Date: April 2015
Contact: Dmitry Khromov <[email protected]>
Description: Bus scanning interval, microseconds component.
Some of 1-Wire devices commonly associated with physical access
control systems are attached/generate presence for as short as
100 ms - hence the tens-to-hundreds milliseconds scan intervals
are required.
see Documentation/w1/w1.generic for detailed information.
Users: any user space application which wants to know bus scanning
interval
6 changes: 6 additions & 0 deletions Documentation/ABI/stable/sysfs-driver-w1_ds28ea00
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
What: /sys/bus/w1/devices/.../w1_seq
Date: Apr 2015
Contact: Matt Campbell <[email protected]>
Description: Support for the DS28EA00 chain sequence function
see Documentation/w1/slaves/w1_therm for detailed information
Users: any user space application which wants to communicate with DS28EA00
2 changes: 1 addition & 1 deletion Documentation/ABI/testing/configfs-spear-pcie-gadget
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
What: /config/pcie-gadget
Date: Feb 2011
KernelVersion: 2.6.37
Contact: Pratyush Anand <pratyush.anand@st.com>
Contact: Pratyush Anand <pratyush.anand@gmail.com>
Description:

Interface is used to configure selected dual mode PCIe controller
Expand Down
2 changes: 1 addition & 1 deletion Documentation/ABI/testing/configfs-usb-gadget-loopback
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ Description:
The attributes:

qlen - depth of loopback queue
bulk_buflen - buffer length
buflen - buffer length
2 changes: 1 addition & 1 deletion Documentation/ABI/testing/configfs-usb-gadget-sourcesink
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Description:
isoc_maxpacket - 0 - 1023 (fs), 0 - 1024 (hs/ss)
isoc_mult - 0..2 (hs/ss only)
isoc_maxburst - 0..15 (ss only)
qlen - buffer length
buflen - buffer length
Loading

0 comments on commit 235cb6f

Please sign in to comment.