Loading Documentation/cgroups/memory.txt +4 −0 Original line number Original line Diff line number Diff line Loading @@ -466,6 +466,10 @@ Note: 5.3 swappiness 5.3 swappiness Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only. Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only. Please note that unlike the global swappiness, memcg knob set to 0 really prevents from any swapping even if there is a swap storage available. This might lead to memcg OOM killer if there are no file pages to reclaim. Following cgroups' swappiness can't be changed. Following cgroups' swappiness can't be changed. - root cgroup (uses /proc/sys/vm/swappiness). - root cgroup (uses /proc/sys/vm/swappiness). Loading Documentation/filesystems/proc.txt +12 −4 Original line number Original line Diff line number Diff line Loading @@ -33,7 +33,7 @@ Table of Contents 2 Modifying System Parameters 2 Modifying System Parameters 3 Per-Process Parameters 3 Per-Process Parameters 3.1 /proc/<pid>/oom_score_adj - Adjust the oom-killer 3.1 /proc/<pid>/oom_adj & /proc/<pid>/oom_score_adj - Adjust the oom-killer score score 3.2 /proc/<pid>/oom_score - Display current oom-killer score 3.2 /proc/<pid>/oom_score - Display current oom-killer score 3.3 /proc/<pid>/io - Display the IO accounting fields 3.3 /proc/<pid>/io - Display the IO accounting fields Loading Loading @@ -1320,10 +1320,10 @@ of the kernel. CHAPTER 3: PER-PROCESS PARAMETERS CHAPTER 3: PER-PROCESS PARAMETERS ------------------------------------------------------------------------------ ------------------------------------------------------------------------------ 3.1 /proc/<pid>/oom_score_adj- Adjust the oom-killer score 3.1 /proc/<pid>/oom_adj & /proc/<pid>/oom_score_adj- Adjust the oom-killer score -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- This file can be used to adjust the badness heuristic used to select which These file can be used to adjust the badness heuristic used to select which process gets killed in out of memory conditions. process gets killed in out of memory conditions. The badness heuristic assigns a value to each candidate task ranging from 0 The badness heuristic assigns a value to each candidate task ranging from 0 Loading Loading @@ -1361,6 +1361,12 @@ same system, cpuset, mempolicy, or memory controller resources to use at least equivalent to discounting 50% of the task's allowed memory from being considered equivalent to discounting 50% of the task's allowed memory from being considered as scoring against the task. as scoring against the task. For backwards compatibility with previous kernels, /proc/<pid>/oom_adj may also be used to tune the badness score. Its acceptable values range from -16 (OOM_ADJUST_MIN) to +15 (OOM_ADJUST_MAX) and a special value of -17 (OOM_DISABLE) to disable oom killing entirely for that task. Its value is scaled linearly with /proc/<pid>/oom_score_adj. The value of /proc/<pid>/oom_score_adj may be reduced no lower than the last The value of /proc/<pid>/oom_score_adj may be reduced no lower than the last value set by a CAP_SYS_RESOURCE process. To reduce the value any lower value set by a CAP_SYS_RESOURCE process. To reduce the value any lower requires CAP_SYS_RESOURCE. requires CAP_SYS_RESOURCE. Loading @@ -1375,7 +1381,9 @@ minimal amount of work. ------------------------------------------------------------- ------------------------------------------------------------- This file can be used to check the current score used by the oom-killer is for This file can be used to check the current score used by the oom-killer is for any given <pid>. any given <pid>. Use it together with /proc/<pid>/oom_score_adj to tune which process should be killed in an out-of-memory situation. 3.3 /proc/<pid>/io - Display the IO accounting fields 3.3 /proc/<pid>/io - Display the IO accounting fields ------------------------------------------------------- ------------------------------------------------------- Loading Documentation/networking/netdev-features.txt +1 −1 Original line number Original line Diff line number Diff line Loading @@ -164,4 +164,4 @@ read the CRC recorded by the NIC on receipt of the packet. This requests that the NIC receive all possible frames, including errored This requests that the NIC receive all possible frames, including errored frames (such as bad FCS, etc). This can be helpful when sniffing a link with frames (such as bad FCS, etc). This can be helpful when sniffing a link with bad packets on it. Some NICs may receive more packets if also put into normal bad packets on it. Some NICs may receive more packets if also put into normal PROMISC mdoe. PROMISC mode. MAINTAINERS +59 −9 Original line number Original line Diff line number Diff line Loading @@ -3598,6 +3598,49 @@ F: drivers/hid/hid-hyperv.c F: drivers/net/hyperv/ F: drivers/net/hyperv/ F: drivers/staging/hv/ F: drivers/staging/hv/ I2C OVER PARALLEL PORT M: Jean Delvare <khali@linux-fr.org> L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-parport F: Documentation/i2c/busses/i2c-parport-light F: drivers/i2c/busses/i2c-parport.c F: drivers/i2c/busses/i2c-parport-light.c I2C/SMBUS CONTROLLER DRIVERS FOR PC M: Jean Delvare <khali@linux-fr.org> L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-ali1535 F: Documentation/i2c/busses/i2c-ali1563 F: Documentation/i2c/busses/i2c-ali15x3 F: Documentation/i2c/busses/i2c-amd756 F: Documentation/i2c/busses/i2c-amd8111 F: Documentation/i2c/busses/i2c-i801 F: Documentation/i2c/busses/i2c-nforce2 F: Documentation/i2c/busses/i2c-piix4 F: Documentation/i2c/busses/i2c-sis5595 F: Documentation/i2c/busses/i2c-sis630 F: Documentation/i2c/busses/i2c-sis96x F: Documentation/i2c/busses/i2c-via F: Documentation/i2c/busses/i2c-viapro F: drivers/i2c/busses/i2c-ali1535.c F: drivers/i2c/busses/i2c-ali1563.c F: drivers/i2c/busses/i2c-ali15x3.c F: drivers/i2c/busses/i2c-amd756.c F: drivers/i2c/busses/i2c-amd756-s4882.c F: drivers/i2c/busses/i2c-amd8111.c F: drivers/i2c/busses/i2c-i801.c F: drivers/i2c/busses/i2c-isch.c F: drivers/i2c/busses/i2c-nforce2.c F: drivers/i2c/busses/i2c-nforce2-s4985.c F: drivers/i2c/busses/i2c-piix4.c F: drivers/i2c/busses/i2c-sis5595.c F: drivers/i2c/busses/i2c-sis630.c F: drivers/i2c/busses/i2c-sis96x.c F: drivers/i2c/busses/i2c-via.c F: drivers/i2c/busses/i2c-viapro.c I2C/SMBUS STUB DRIVER I2C/SMBUS STUB DRIVER M: "Mark M. Hoffman" <mhoffman@lightlink.com> M: "Mark M. Hoffman" <mhoffman@lightlink.com> L: linux-i2c@vger.kernel.org L: linux-i2c@vger.kernel.org Loading @@ -3605,9 +3648,8 @@ S: Maintained F: drivers/i2c/busses/i2c-stub.c F: drivers/i2c/busses/i2c-stub.c I2C SUBSYSTEM I2C SUBSYSTEM M: "Jean Delvare (PC drivers, core)" <khali@linux-fr.org> M: Wolfram Sang <w.sang@pengutronix.de> M: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org> M: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org> M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de> L: linux-i2c@vger.kernel.org L: linux-i2c@vger.kernel.org W: http://i2c.wiki.kernel.org/ W: http://i2c.wiki.kernel.org/ T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ Loading @@ -3618,6 +3660,13 @@ F: drivers/i2c/ F: include/linux/i2c.h F: include/linux/i2c.h F: include/linux/i2c-*.h F: include/linux/i2c-*.h I2C-TAOS-EVM DRIVER M: Jean Delvare <khali@linux-fr.org> L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-taos-evm F: drivers/i2c/busses/i2c-taos-evm.c I2C-TINY-USB DRIVER I2C-TINY-USB DRIVER M: Till Harbaum <till@harbaum.org> M: Till Harbaum <till@harbaum.org> L: linux-i2c@vger.kernel.org L: linux-i2c@vger.kernel.org Loading Loading @@ -7210,6 +7259,14 @@ L: linux-xtensa@linux-xtensa.org S: Maintained S: Maintained F: arch/xtensa/ F: arch/xtensa/ THERMAL M: Zhang Rui <rui.zhang@intel.com> L: linux-pm@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git S: Supported F: drivers/thermal/ F: include/linux/thermal.h THINKPAD ACPI EXTRAS DRIVER THINKPAD ACPI EXTRAS DRIVER M: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br> M: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br> L: ibm-acpi-devel@lists.sourceforge.net L: ibm-acpi-devel@lists.sourceforge.net Loading Loading @@ -7887,13 +7944,6 @@ M: Roger Luethi <rl@hellgate.ch> S: Maintained S: Maintained F: drivers/net/ethernet/via/via-rhine.c F: drivers/net/ethernet/via/via-rhine.c VIAPRO SMBUS DRIVER M: Jean Delvare <khali@linux-fr.org> L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-viapro F: drivers/i2c/busses/i2c-viapro.c VIA SD/MMC CARD CONTROLLER DRIVER VIA SD/MMC CARD CONTROLLER DRIVER M: Bruce Chang <brucechang@via.com.tw> M: Bruce Chang <brucechang@via.com.tw> M: Harald Welte <HaraldWelte@viatech.com> M: Harald Welte <HaraldWelte@viatech.com> Loading Makefile +1 −1 Original line number Original line Diff line number Diff line VERSION = 3 VERSION = 3 PATCHLEVEL = 7 PATCHLEVEL = 7 SUBLEVEL = 0 SUBLEVEL = 0 EXTRAVERSION = -rc5 EXTRAVERSION = -rc6 NAME = Terrified Chipmunk NAME = Terrified Chipmunk # *DOCUMENTATION* # *DOCUMENTATION* Loading Loading
Documentation/cgroups/memory.txt +4 −0 Original line number Original line Diff line number Diff line Loading @@ -466,6 +466,10 @@ Note: 5.3 swappiness 5.3 swappiness Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only. Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only. Please note that unlike the global swappiness, memcg knob set to 0 really prevents from any swapping even if there is a swap storage available. This might lead to memcg OOM killer if there are no file pages to reclaim. Following cgroups' swappiness can't be changed. Following cgroups' swappiness can't be changed. - root cgroup (uses /proc/sys/vm/swappiness). - root cgroup (uses /proc/sys/vm/swappiness). Loading
Documentation/filesystems/proc.txt +12 −4 Original line number Original line Diff line number Diff line Loading @@ -33,7 +33,7 @@ Table of Contents 2 Modifying System Parameters 2 Modifying System Parameters 3 Per-Process Parameters 3 Per-Process Parameters 3.1 /proc/<pid>/oom_score_adj - Adjust the oom-killer 3.1 /proc/<pid>/oom_adj & /proc/<pid>/oom_score_adj - Adjust the oom-killer score score 3.2 /proc/<pid>/oom_score - Display current oom-killer score 3.2 /proc/<pid>/oom_score - Display current oom-killer score 3.3 /proc/<pid>/io - Display the IO accounting fields 3.3 /proc/<pid>/io - Display the IO accounting fields Loading Loading @@ -1320,10 +1320,10 @@ of the kernel. CHAPTER 3: PER-PROCESS PARAMETERS CHAPTER 3: PER-PROCESS PARAMETERS ------------------------------------------------------------------------------ ------------------------------------------------------------------------------ 3.1 /proc/<pid>/oom_score_adj- Adjust the oom-killer score 3.1 /proc/<pid>/oom_adj & /proc/<pid>/oom_score_adj- Adjust the oom-killer score -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- This file can be used to adjust the badness heuristic used to select which These file can be used to adjust the badness heuristic used to select which process gets killed in out of memory conditions. process gets killed in out of memory conditions. The badness heuristic assigns a value to each candidate task ranging from 0 The badness heuristic assigns a value to each candidate task ranging from 0 Loading Loading @@ -1361,6 +1361,12 @@ same system, cpuset, mempolicy, or memory controller resources to use at least equivalent to discounting 50% of the task's allowed memory from being considered equivalent to discounting 50% of the task's allowed memory from being considered as scoring against the task. as scoring against the task. For backwards compatibility with previous kernels, /proc/<pid>/oom_adj may also be used to tune the badness score. Its acceptable values range from -16 (OOM_ADJUST_MIN) to +15 (OOM_ADJUST_MAX) and a special value of -17 (OOM_DISABLE) to disable oom killing entirely for that task. Its value is scaled linearly with /proc/<pid>/oom_score_adj. The value of /proc/<pid>/oom_score_adj may be reduced no lower than the last The value of /proc/<pid>/oom_score_adj may be reduced no lower than the last value set by a CAP_SYS_RESOURCE process. To reduce the value any lower value set by a CAP_SYS_RESOURCE process. To reduce the value any lower requires CAP_SYS_RESOURCE. requires CAP_SYS_RESOURCE. Loading @@ -1375,7 +1381,9 @@ minimal amount of work. ------------------------------------------------------------- ------------------------------------------------------------- This file can be used to check the current score used by the oom-killer is for This file can be used to check the current score used by the oom-killer is for any given <pid>. any given <pid>. Use it together with /proc/<pid>/oom_score_adj to tune which process should be killed in an out-of-memory situation. 3.3 /proc/<pid>/io - Display the IO accounting fields 3.3 /proc/<pid>/io - Display the IO accounting fields ------------------------------------------------------- ------------------------------------------------------- Loading
Documentation/networking/netdev-features.txt +1 −1 Original line number Original line Diff line number Diff line Loading @@ -164,4 +164,4 @@ read the CRC recorded by the NIC on receipt of the packet. This requests that the NIC receive all possible frames, including errored This requests that the NIC receive all possible frames, including errored frames (such as bad FCS, etc). This can be helpful when sniffing a link with frames (such as bad FCS, etc). This can be helpful when sniffing a link with bad packets on it. Some NICs may receive more packets if also put into normal bad packets on it. Some NICs may receive more packets if also put into normal PROMISC mdoe. PROMISC mode.
MAINTAINERS +59 −9 Original line number Original line Diff line number Diff line Loading @@ -3598,6 +3598,49 @@ F: drivers/hid/hid-hyperv.c F: drivers/net/hyperv/ F: drivers/net/hyperv/ F: drivers/staging/hv/ F: drivers/staging/hv/ I2C OVER PARALLEL PORT M: Jean Delvare <khali@linux-fr.org> L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-parport F: Documentation/i2c/busses/i2c-parport-light F: drivers/i2c/busses/i2c-parport.c F: drivers/i2c/busses/i2c-parport-light.c I2C/SMBUS CONTROLLER DRIVERS FOR PC M: Jean Delvare <khali@linux-fr.org> L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-ali1535 F: Documentation/i2c/busses/i2c-ali1563 F: Documentation/i2c/busses/i2c-ali15x3 F: Documentation/i2c/busses/i2c-amd756 F: Documentation/i2c/busses/i2c-amd8111 F: Documentation/i2c/busses/i2c-i801 F: Documentation/i2c/busses/i2c-nforce2 F: Documentation/i2c/busses/i2c-piix4 F: Documentation/i2c/busses/i2c-sis5595 F: Documentation/i2c/busses/i2c-sis630 F: Documentation/i2c/busses/i2c-sis96x F: Documentation/i2c/busses/i2c-via F: Documentation/i2c/busses/i2c-viapro F: drivers/i2c/busses/i2c-ali1535.c F: drivers/i2c/busses/i2c-ali1563.c F: drivers/i2c/busses/i2c-ali15x3.c F: drivers/i2c/busses/i2c-amd756.c F: drivers/i2c/busses/i2c-amd756-s4882.c F: drivers/i2c/busses/i2c-amd8111.c F: drivers/i2c/busses/i2c-i801.c F: drivers/i2c/busses/i2c-isch.c F: drivers/i2c/busses/i2c-nforce2.c F: drivers/i2c/busses/i2c-nforce2-s4985.c F: drivers/i2c/busses/i2c-piix4.c F: drivers/i2c/busses/i2c-sis5595.c F: drivers/i2c/busses/i2c-sis630.c F: drivers/i2c/busses/i2c-sis96x.c F: drivers/i2c/busses/i2c-via.c F: drivers/i2c/busses/i2c-viapro.c I2C/SMBUS STUB DRIVER I2C/SMBUS STUB DRIVER M: "Mark M. Hoffman" <mhoffman@lightlink.com> M: "Mark M. Hoffman" <mhoffman@lightlink.com> L: linux-i2c@vger.kernel.org L: linux-i2c@vger.kernel.org Loading @@ -3605,9 +3648,8 @@ S: Maintained F: drivers/i2c/busses/i2c-stub.c F: drivers/i2c/busses/i2c-stub.c I2C SUBSYSTEM I2C SUBSYSTEM M: "Jean Delvare (PC drivers, core)" <khali@linux-fr.org> M: Wolfram Sang <w.sang@pengutronix.de> M: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org> M: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org> M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de> L: linux-i2c@vger.kernel.org L: linux-i2c@vger.kernel.org W: http://i2c.wiki.kernel.org/ W: http://i2c.wiki.kernel.org/ T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ Loading @@ -3618,6 +3660,13 @@ F: drivers/i2c/ F: include/linux/i2c.h F: include/linux/i2c.h F: include/linux/i2c-*.h F: include/linux/i2c-*.h I2C-TAOS-EVM DRIVER M: Jean Delvare <khali@linux-fr.org> L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-taos-evm F: drivers/i2c/busses/i2c-taos-evm.c I2C-TINY-USB DRIVER I2C-TINY-USB DRIVER M: Till Harbaum <till@harbaum.org> M: Till Harbaum <till@harbaum.org> L: linux-i2c@vger.kernel.org L: linux-i2c@vger.kernel.org Loading Loading @@ -7210,6 +7259,14 @@ L: linux-xtensa@linux-xtensa.org S: Maintained S: Maintained F: arch/xtensa/ F: arch/xtensa/ THERMAL M: Zhang Rui <rui.zhang@intel.com> L: linux-pm@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git S: Supported F: drivers/thermal/ F: include/linux/thermal.h THINKPAD ACPI EXTRAS DRIVER THINKPAD ACPI EXTRAS DRIVER M: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br> M: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br> L: ibm-acpi-devel@lists.sourceforge.net L: ibm-acpi-devel@lists.sourceforge.net Loading Loading @@ -7887,13 +7944,6 @@ M: Roger Luethi <rl@hellgate.ch> S: Maintained S: Maintained F: drivers/net/ethernet/via/via-rhine.c F: drivers/net/ethernet/via/via-rhine.c VIAPRO SMBUS DRIVER M: Jean Delvare <khali@linux-fr.org> L: linux-i2c@vger.kernel.org S: Maintained F: Documentation/i2c/busses/i2c-viapro F: drivers/i2c/busses/i2c-viapro.c VIA SD/MMC CARD CONTROLLER DRIVER VIA SD/MMC CARD CONTROLLER DRIVER M: Bruce Chang <brucechang@via.com.tw> M: Bruce Chang <brucechang@via.com.tw> M: Harald Welte <HaraldWelte@viatech.com> M: Harald Welte <HaraldWelte@viatech.com> Loading
Makefile +1 −1 Original line number Original line Diff line number Diff line VERSION = 3 VERSION = 3 PATCHLEVEL = 7 PATCHLEVEL = 7 SUBLEVEL = 0 SUBLEVEL = 0 EXTRAVERSION = -rc5 EXTRAVERSION = -rc6 NAME = Terrified Chipmunk NAME = Terrified Chipmunk # *DOCUMENTATION* # *DOCUMENTATION* Loading
