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

Commit 29f147d7 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'merge'

parents 916a3d57 6fb8f3ac
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -603,7 +603,8 @@ start exactly where you are now.


----------
Thanks to Paolo Ciarrocchi who allowed the "Development Process" section
Thanks to Paolo Ciarrocchi who allowed the "Development Process"
(http://linux.tar.bz/articles/2.6-development_process) section
to be based on text he had written, and to Randy Dunlap and Gerrit
Huizenga for some of the list of things you should and should not say.
Also thanks to Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,
+5 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ class/
devices/
firmware/
net/
fs/

devices/ contains a filesystem representation of the device tree. It maps
directly to the internal kernel device tree, which is a hierarchy of
@@ -264,6 +265,10 @@ drivers/ contains a directory for each device driver that is loaded
for devices on that particular bus (this assumes that drivers do not
span multiple bus types).

fs/ contains a directory for some filesystems.  Currently each
filesystem wanting to export attributes must create its own hierarchy
below fs/ (see ./fuse.txt for an example).


More information can driver-model specific features can be found in
Documentation/driver-model/. 
+11 −1
Original line number Diff line number Diff line
@@ -259,7 +259,17 @@ on the bus need to be capable of doing it, so this is something which needs
to be handled by platform and generic code, not individual drivers.


8. Obsolete functions
8. Vendor and device identifications
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
For the future, let's avoid adding device ids to include/linux/pci_ids.h.

PCI_VENDOR_ID_xxx for vendors, and a hex constant for device ids.

Rationale:  PCI_VENDOR_ID_xxx constants are re-used, but device ids are not.
    Further, device ids are arbitrary hex numbers, normally used only in a
    single location, the pci_device_id table.

9. Obsolete functions
~~~~~~~~~~~~~~~~~~~~~
There are several functions which you might come across when trying to
port an old driver to the new PCI interface.  They are no longer present
+12 −0
Original line number Diff line number Diff line
@@ -421,6 +421,14 @@ L: linux-hams@vger.kernel.org
W:	http://www.baycom.org/~tom/ham/ham.html
S:	Maintained

BCM43XX WIRELESS DRIVER
P:	Michael Buesch
M:	mb@bu3sch.de
P:	Stefano Brivio
M:	st3@riseup.net
W:	http://bcm43xx.berlios.de/
S:	Maintained

BEFS FILE SYSTEM
P:	Sergey S. Kostyliov
M:	rathamahata@php4.ru
@@ -2065,8 +2073,12 @@ P: Matthew Wilcox
M:	matthew@wil.cx
P:	Grant Grundler
M:	grundler@parisc-linux.org
P:	Kyle McMartin
M:	kyle@parisc-linux.org
L:	parisc-linux@parisc-linux.org
W:	http://www.parisc-linux.org/
T:	git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
T:	cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
S:	Maintained

PCI ERROR RECOVERY
+1 −1
Original line number Diff line number Diff line
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 17
EXTRAVERSION =-rc2
EXTRAVERSION =-rc3
NAME=Sliding Snow Leopard

# *DOCUMENTATION*
Loading