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

Commit 123656d4 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge with Linus' kernel.

parents a62c80e5 0aec63e6

.gitignore

+2 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
*.a

*.a

*.s

*.s

*.ko

*.ko

*.so

*.mod.c

*.mod.c





#

#
@@ -23,6 +24,7 @@ Module.symvers 
# Generated include files

# Generated include files

#

#

include/asm

include/asm

include/asm-*/asm-offsets.h

include/config

include/config

include/linux/autoconf.h

include/linux/autoconf.h

include/linux/compile.h

include/linux/compile.h

CREDITS

+1 −0
Original line number Original line Diff line number Diff line
@@ -1883,6 +1883,7 @@ N: Jaya Kumar 
E: jayalk@intworks.biz

E: jayalk@intworks.biz

W: http://www.intworks.biz

W: http://www.intworks.biz

D: Arc monochrome LCD framebuffer driver, x86 reboot fixups

D: Arc monochrome LCD framebuffer driver, x86 reboot fixups

D: pirq addr, CS5535 alsa audio driver

S: Gurgaon, India

S: Gurgaon, India

S: Kuala Lumpur, Malaysia

S: Kuala Lumpur, Malaysia

Documentation/DocBook/usb.tmpl

+1 −0
Original line number Original line Diff line number Diff line
@@ -253,6 +253,7 @@ 
!Edrivers/usb/core/urb.c

!Edrivers/usb/core/urb.c

!Edrivers/usb/core/message.c

!Edrivers/usb/core/message.c

!Edrivers/usb/core/file.c

!Edrivers/usb/core/file.c

!Edrivers/usb/core/driver.c

!Edrivers/usb/core/usb.c

!Edrivers/usb/core/usb.c

!Edrivers/usb/core/hub.c

!Edrivers/usb/core/hub.c

    </chapter>

    </chapter>

Documentation/SubmittingPatches

+2 −2
Original line number Original line Diff line number Diff line
@@ -158,7 +158,7 @@ Even if the maintainer did not respond in step #4, make sure to ALWAYS 
copy the maintainer when you change their code.

copy the maintainer when you change their code.





For small patches you may want to CC the Trivial Patch Monkey

For small patches you may want to CC the Trivial Patch Monkey

trivial@rustcorp.com.au set up by Rusty Russell; which collects "trivial"

trivial@kernel.org managed by Adrian Bunk; which collects "trivial"

patches. Trivial patches must qualify for one of the following rules:

patches. Trivial patches must qualify for one of the following rules:

 Spelling fixes in documentation

 Spelling fixes in documentation

 Spelling fixes which could break grep(1).

 Spelling fixes which could break grep(1).
@@ -171,7 +171,7 @@ patches. Trivial patches must qualify for one of the following rules: 
 since people copy, as long as it's trivial)

 since people copy, as long as it's trivial)

 Any fix by the author/maintainer of the file. (ie. patch monkey

 Any fix by the author/maintainer of the file. (ie. patch monkey

 in re-transmission mode)

 in re-transmission mode)

URL: <http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/>

URL: <http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/>

Documentation/block/biodoc.txt

+3 −9
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ The following people helped with review comments and inputs for this 
document:

document:

	Christoph Hellwig <hch@infradead.org>

	Christoph Hellwig <hch@infradead.org>

	Arjan van de Ven <arjanv@redhat.com>

	Arjan van de Ven <arjanv@redhat.com>

	Randy Dunlap <rddunlap@osdl.org>

	Randy Dunlap <rdunlap@xenotime.net>

	Andre Hedrick <andre@linux-ide.org>

	Andre Hedrick <andre@linux-ide.org>





The following people helped with fixes/contributions to the bio patches

The following people helped with fixes/contributions to the bio patches
@@ -263,14 +263,8 @@ A flag in the bio structure, BIO_BARRIER is used to identify a barrier i/o. 
The generic i/o scheduler would make sure that it places the barrier request and

The generic i/o scheduler would make sure that it places the barrier request and

all other requests coming after it after all the previous requests in the

all other requests coming after it after all the previous requests in the

queue. Barriers may be implemented in different ways depending on the

queue. Barriers may be implemented in different ways depending on the

driver. A SCSI driver for example could make use of ordered tags to

driver. For more details regarding I/O barriers, please read barrier.txt

preserve the necessary ordering with a lower impact on throughput. For IDE

in this directory.

this might be two sync cache flush: a pre and post flush when encountering

a barrier write.



There is a provision for queues to indicate what kind of barriers they

can provide. This is as of yet unmerged, details will be added here once it

is in the kernel.





1.2.2 Request Priority/Latency

1.2.2 Request Priority/Latency