Commit b257c14c authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/core 



Merge reason: merge the latest fixes, update to -rc4.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 371fd7e7 2ba3abd8

Documentation/DocBook/tracepoint.tmpl

+13 −0
Original line number Diff line number Diff line
@@ -16,6 +16,15 @@ 
     </address>

    </affiliation>

   </author>

   <author>

    <firstname>William</firstname>

    <surname>Cohen</surname>

    <affiliation>

     <address>

      <email>wcohen@redhat.com</email>

     </address>

    </affiliation>

   </author>

  </authorgroup>



  <legalnotice>
@@ -91,4 +100,8 @@ 
!Iinclude/trace/events/signal.h

  </chapter>



  <chapter id="block">

   <title>Block IO</title>

!Iinclude/trace/events/block.h

  </chapter>

</book>

Documentation/block/biodoc.txt

+2 −2
Original line number Diff line number Diff line
@@ -1162,8 +1162,8 @@ where a driver received a request ala this before: 


As mentioned, there is no virtual mapping of a bio. For DMA, this is

not a problem as the driver probably never will need a virtual mapping.

Instead it needs a bus mapping (pci_map_page for a single segment or

use blk_rq_map_sg for scatter gather) to be able to ship it to the driver. For

Instead it needs a bus mapping (dma_map_page for a single segment or

use dma_map_sg for scatter gather) to be able to ship it to the driver. For

PIO drivers (or drivers that need to revert to PIO transfer once in a

while (IDE for example)), where the CPU is doing the actual data

transfer a virtual mapping is needed. If the driver supports highmem I/O,

Documentation/connector/cn_test.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/skbuff.h>

#include <linux/slab.h>

#include <linux/timer.h>



#include <linux/connector.h>

Documentation/fb/imacfb.txt→Documentation/fb/efifb.txt

+7 −7
Original line number Diff line number Diff line 


What is imacfb?

What is efifb?

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



This is a generic EFI platform driver for Intel based Apple computers.

Imacfb is only for EFI booted Intel Macs.

efifb is only for EFI booted Intel Macs.



Supported Hardware

==================
@@ -16,16 +16,16 @@ MacMini 
How to use it?

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



Imacfb does not have any kind of autodetection of your machine.

efifb does not have any kind of autodetection of your machine.

You have to add the following kernel parameters in your elilo.conf:

	Macbook :

		video=imacfb:macbook

		video=efifb:macbook

	MacMini :

		video=imacfb:mini

		video=efifb:mini

	Macbook Pro 15", iMac 17" :

		video=imacfb:i17

		video=efifb:i17

	Macbook Pro 17", iMac 20" :

		video=imacfb:i20

		video=efifb:i20



--

Edgar Hucek <gimli@dark-green.com>

Documentation/filesystems/9p.txt

+16 −2
Original line number Diff line number Diff line
@@ -37,6 +37,15 @@ For Plan 9 From User Space applications (http://swtch.com/plan9) 


	mount -t 9p `namespace`/acme /mnt/9 -o trans=unix,uname=$USER



For server running on QEMU host with virtio transport:



	mount -t 9p -o trans=virtio <mount_tag> /mnt/9



where mount_tag is the tag associated by the server to each of the exported

mount points. Each 9P export is seen by the client as a virtio device with an

associated "mount_tag" property. Available mount tags can be

seen by reading /sys/bus/virtio/drivers/9pnet_virtio/virtio<n>/mount_tag files.



OPTIONS

=======
@@ -47,7 +56,7 @@ OPTIONS 
			fd   	- used passed file descriptors for connection

                                (see rfdno and wfdno)

			virtio	- connect to the next virtio channel available

				(from lguest or KVM with trans_virtio module)

				(from QEMU with trans_virtio module)

			rdma	- connect to a specified RDMA channel



  uname=name	user name to attempt mount as on the remote server.  The
@@ -85,7 +94,12 @@ OPTIONS 


  port=n	port to connect to on the remote server



  noextend	force legacy mode (no 9p2000.u semantics)

  noextend	force legacy mode (no 9p2000.u or 9p2000.L semantics)



  version=name	Select 9P protocol version. Valid options are:

			9p2000          - Legacy mode (same as noextend)

			9p2000.u        - Use 9P2000.u protocol

			9p2000.L        - Use 9P2000.L protocol



  dfltuid	attempt to mount as a particular uid