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

Commit 638cbac8 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents f0554089 fc71fe40

Documentation/DocBook/kernel-api.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ X!Edrivers/pnp/system.c 


  <chapter id="blkdev">

     <title>Block Devices</title>

!Edrivers/block/ll_rw_blk.c

!Eblock/ll_rw_blk.c

  </chapter>



  <chapter id="miscdev">

Documentation/block/biodoc.txt

+2 −2
Original line number Diff line number Diff line
@@ -1063,8 +1063,8 @@ Aside: 
4.4 I/O contexts

I/O contexts provide a dynamically allocated per process data area. They may

be used in I/O schedulers, and in the block layer (could be used for IO statis,

priorities for example). See *io_context in drivers/block/ll_rw_blk.c, and

as-iosched.c for an example of usage in an i/o scheduler.

priorities for example). See *io_context in block/ll_rw_blk.c, and as-iosched.c

for an example of usage in an i/o scheduler.





5. Scalability related changes

Documentation/devices.txt

+6 −6
Original line number Diff line number Diff line
@@ -2903,14 +2903,14 @@ Your cooperation is appreciated. 
		196 = /dev/dvb/adapter3/video0    first video decoder of fourth card





216 char	USB BlueTooth devices

		  0 = /dev/ttyUB0		First USB BlueTooth device

		  1 = /dev/ttyUB1		Second USB BlueTooth device

216 char	Bluetooth RFCOMM TTY devices

		  0 = /dev/rfcomm0		First Bluetooth RFCOMM TTY device

		  1 = /dev/rfcomm1		Second Bluetooth RFCOMM TTY device

		    ...



217 char	USB BlueTooth devices (alternate devices)

		  0 = /dev/cuub0		Callout device for ttyUB0

		  1 = /dev/cuub1		Callout device for ttyUB1

217 char	Bluetooth RFCOMM TTY devices (alternate devices)

		  0 = /dev/curf0		Callout device for rfcomm0

		  1 = /dev/curf1		Callout device for rfcomm1

		    ...



218 char	The Logical Company bus Unibus/Qbus adapters

Documentation/feature-removal-schedule.txt

+19 −0
Original line number Diff line number Diff line
@@ -140,3 +140,22 @@ What: EXPORT_SYMBOL(lookup_hash) 
When:	January 2006

Why:	Too low-level interface.  Use lookup_one_len or lookup_create instead.

Who:	Christoph Hellwig <hch@lst.de>



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



What:	START_ARRAY ioctl for md

When:	July 2006

Files:	drivers/md/md.c

Why:	Not reliable by design - can fail when most needed.

	Alternatives exist

Who:	NeilBrown <neilb@suse.de>



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



What:	au1x00_uart driver

When:	January 2006

Why:	The 8250 serial driver now has the ability to deal with the differences

	between the standard 8250 family of UARTs and their slightly strange

	brother on Alchemy SOCs.  The loss of features is not considered an

	issue.

Who:	Ralf Baechle <ralf@linux-mips.org>

Documentation/oops-tracing.txt

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ the disk is not available then you have three options :- 
    has restarted.  Messy but it is the only option if you have not

    planned for a crash. Alternatively, you can take a picture of

    the screen with a digital camera - not nice, but better than

    nothing.

    nothing.  If the messages scroll off the top of the console, you

    may find that booting with a higher resolution (eg, vga=791)

    will allow you to read more of the text. (Caveat: This needs vesafb,

    so won't help for 'early' oopses)



(2) Boot with a serial console (see Documentation/serial-console.txt),

    run a null modem to a second machine and capture the output there