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

Commit e16b396c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
parents 7fd23a24 e6e8dd50

Documentation/cgroups/cpusets.txt

+9 −8
Original line number Original line Diff line number Diff line
@@ -693,7 +693,7 @@ There are ways to query or modify cpusets: 
 - via the C library libcgroup.

 - via the C library libcgroup.

   (http://sourceforge.net/projects/libcg/)

   (http://sourceforge.net/projects/libcg/)

 - via the python application cset.

 - via the python application cset.

   (http://developer.novell.com/wiki/index.php/Cpuset)

   (http://code.google.com/p/cpuset/)





The sched_setaffinity calls can also be done at the shell prompt using

The sched_setaffinity calls can also be done at the shell prompt using

SGI's runon or Robert Love's taskset.  The mbind and set_mempolicy

SGI's runon or Robert Love's taskset.  The mbind and set_mempolicy
@@ -725,13 +725,14 @@ Now you want to do something with this cpuset. 




In this directory you can find several files:

In this directory you can find several files:

# ls

# ls

cpuset.cpu_exclusive       cpuset.memory_spread_slab

cgroup.clone_children  cpuset.memory_pressure

cpuset.cpus                cpuset.mems

cgroup.event_control   cpuset.memory_spread_page

cpuset.mem_exclusive       cpuset.sched_load_balance

cgroup.procs           cpuset.memory_spread_slab

cpuset.mem_hardwall        cpuset.sched_relax_domain_level

cpuset.cpu_exclusive   cpuset.mems

cpuset.memory_migrate      notify_on_release

cpuset.cpus            cpuset.sched_load_balance

cpuset.memory_pressure     tasks

cpuset.mem_exclusive   cpuset.sched_relax_domain_level

cpuset.memory_spread_page

cpuset.mem_hardwall    notify_on_release

cpuset.memory_migrate  tasks





Reading them will give you information about the state of this cpuset:

Reading them will give you information about the state of this cpuset:

the CPUs and Memory Nodes it can use, the processes that are using

the CPUs and Memory Nodes it can use, the processes that are using

Documentation/cgroups/memory.txt

+3 −2
Original line number Original line Diff line number Diff line
@@ -485,8 +485,9 @@ The feature can be disabled by 




# echo 0 > memory.use_hierarchy

# echo 0 > memory.use_hierarchy





NOTE1: Enabling/disabling will fail if the cgroup already has other

NOTE1: Enabling/disabling will fail if either the cgroup already has other

       cgroups created below it.

       cgroups created below it, or if the parent cgroup has use_hierarchy

       enabled.





NOTE2: When panic_on_oom is set to "2", the whole system will panic in

NOTE2: When panic_on_oom is set to "2", the whole system will panic in

       case of an OOM event in any cgroup.

       case of an OOM event in any cgroup.

Documentation/device-mapper/dm-crypt.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ Example scripts 
===============

===============

LUKS (Linux Unified Key Setup) is now the preferred way to set up disk

LUKS (Linux Unified Key Setup) is now the preferred way to set up disk

encryption with dm-crypt using the 'cryptsetup' utility, see

encryption with dm-crypt using the 'cryptsetup' utility, see

http://clemens.endorphin.org/cryptography

http://code.google.com/p/cryptsetup/





[[

[[

#!/bin/sh

#!/bin/sh

Documentation/filesystems/romfs.txt

+1 −2
Original line number Original line Diff line number Diff line
@@ -17,8 +17,7 @@ comparison, an actual rescue disk used up 3202 blocks with ext2, while 
with romfs, it needed 3079 blocks.

with romfs, it needed 3079 blocks.





To create such a file system, you'll need a user program named

To create such a file system, you'll need a user program named

genromfs.  It is available via anonymous ftp on sunsite.unc.edu and

genromfs. It is available on http://romfs.sourceforge.net/

its mirrors, in the /pub/Linux/system/recovery/ directory.





As the name suggests, romfs could be also used (space-efficiently) on

As the name suggests, romfs could be also used (space-efficiently) on

various read-only media, like (E)EPROM disks if someone will have the

various read-only media, like (E)EPROM disks if someone will have the

Documentation/kbuild/kbuild.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -146,7 +146,7 @@ INSTALL_MOD_STRIP 
INSTALL_MOD_STRIP, if defined, will cause modules to be

INSTALL_MOD_STRIP, if defined, will cause modules to be

stripped after they are installed.  If INSTALL_MOD_STRIP is '1', then

stripped after they are installed.  If INSTALL_MOD_STRIP is '1', then

the default option --strip-debug will be used.  Otherwise,

the default option --strip-debug will be used.  Otherwise,

INSTALL_MOD_STRIP will used as the options to the strip command.

INSTALL_MOD_STRIP value will be used as the options to the strip command.





INSTALL_FW_PATH

INSTALL_FW_PATH

--------------------------------------------------

--------------------------------------------------