Commit 5304d5fc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/core 



Merge reason: branch had an old upstream base (-rc1-ish), but also
              merge to avoid a conflict.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 54d35f29 78af08d9

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
*.gz

*.lzma

*.patch

*.gcno



#

# Top-level generic files

Documentation/DocBook/mac80211.tmpl

+0 −2
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ usage should require reading the full document. 
!Finclude/net/mac80211.h ieee80211_ctstoself_get

!Finclude/net/mac80211.h ieee80211_ctstoself_duration

!Finclude/net/mac80211.h ieee80211_generic_frame_duration

!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb

!Finclude/net/mac80211.h ieee80211_hdrlen

!Finclude/net/mac80211.h ieee80211_wake_queue

!Finclude/net/mac80211.h ieee80211_stop_queue

!Finclude/net/mac80211.h ieee80211_wake_queues

Documentation/block/data-integrity.txt

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ encouraged them to allow separation of the data and integrity metadata 
scatter-gather lists.



The controller will interleave the buffers on write and split them on

read.  This means that the Linux can DMA the data buffers to and from

read.  This means that Linux can DMA the data buffers to and from

host memory without changes to the page cache.



Also, the 16-bit CRC checksum mandated by both the SCSI and SATA specs
@@ -66,7 +66,7 @@ software RAID5). 


The IP checksum is weaker than the CRC in terms of detecting bit

errors.  However, the strength is really in the separation of the data

buffers and the integrity metadata.  These two distinct buffers much

buffers and the integrity metadata.  These two distinct buffers must

match up for an I/O to complete.



The separation of the data and integrity metadata buffers as well as

Documentation/cgroups/cpusets.txt

+12 −0
Original line number Diff line number Diff line
@@ -777,6 +777,18 @@ in cpuset directories: 
# /bin/echo 1-4 > cpus		-> set cpus list to cpus 1,2,3,4

# /bin/echo 1,2,3,4 > cpus	-> set cpus list to cpus 1,2,3,4



To add a CPU to a cpuset, write the new list of CPUs including the

CPU to be added. To add 6 to the above cpuset:



# /bin/echo 1-4,6 > cpus	-> set cpus list to cpus 1,2,3,4,6



Similarly to remove a CPU from a cpuset, write the new list of CPUs

without the CPU to be removed.



To remove all the CPUs:



# /bin/echo "" > cpus		-> clear cpus list



2.3 Setting flags

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

Documentation/driver-model/driver.txt

+2 −2
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ Attributes 
~~~~~~~~~~

struct driver_attribute {

        struct attribute        attr;

        ssize_t (*show)(struct device_driver *, char * buf, size_t count, loff_t off);

        ssize_t (*store)(struct device_driver *, const char * buf, size_t count, loff_t off);

        ssize_t (*show)(struct device_driver *driver, char *buf);

        ssize_t (*store)(struct device_driver *, const char * buf, size_t count);

};



Device drivers can export attributes via their sysfs directories.