Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 185887
b: refs/heads/master
c: eebb111
h: refs/heads/master
i:
  185885: 3f0f376
  185883: c03ee0d
  185879: 15d9c18
  185871: 2f9149b
  185855: 38d116d
v: v3
  • Loading branch information
Herbert Xu committed Mar 2, 2010
1 parent 2205179 commit 21d9cc1
Show file tree
Hide file tree
Showing 2,429 changed files with 73,084 additions and 180,966 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1f63b9c15b17d5af360c180f5c71537e954d5d3b
refs/heads/master: eebb111f5f4aa7b91ffc046b84b24c1b75e391d1
11 changes: 0 additions & 11 deletions trunk/Documentation/ABI/testing/sysfs-bus-usb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,3 @@ Description:
device. This is useful to ensure auto probing won't
match the driver to the device. For example:
# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id

What: /sys/bus/usb/device/.../avoid_reset
Date: December 2009
Contact: Oliver Neukum <oliver@neukum.org>
Description:
Writing 1 to this file tells the kernel that this
device will morph into another mode when it is reset.
Drivers will not use reset for error handling for
such devices.
Users:
usb_modeswitch
12 changes: 6 additions & 6 deletions trunk/Documentation/ABI/testing/sysfs-platform-asus-laptop
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
What: /sys/devices/platform/asus_laptop/display
What: /sys/devices/platform/asus-laptop/display
Date: January 2007
KernelVersion: 2.6.20
Contact: "Corentin Chary" <corentincj@iksaif.net>
Expand All @@ -13,27 +13,27 @@ Description:
Ex: - 0 (0000b) means no display
- 3 (0011b) CRT+LCD.

What: /sys/devices/platform/asus_laptop/gps
What: /sys/devices/platform/asus-laptop/gps
Date: January 2007
KernelVersion: 2.6.20
Contact: "Corentin Chary" <corentincj@iksaif.net>
Description:
Control the gps device. 1 means on, 0 means off.
Users: Lapsus

What: /sys/devices/platform/asus_laptop/ledd
What: /sys/devices/platform/asus-laptop/ledd
Date: January 2007
KernelVersion: 2.6.20
Contact: "Corentin Chary" <corentincj@iksaif.net>
Description:
Some models like the W1N have a LED display that can be
used to display several informations.
To control the LED display, use the following :
echo 0x0T000DDD > /sys/devices/platform/asus_laptop/
echo 0x0T000DDD > /sys/devices/platform/asus-laptop/
where T control the 3 letters display, and DDD the 3 digits display.
The DDD table can be found in Documentation/laptops/asus-laptop.txt

What: /sys/devices/platform/asus_laptop/bluetooth
What: /sys/devices/platform/asus-laptop/bluetooth
Date: January 2007
KernelVersion: 2.6.20
Contact: "Corentin Chary" <corentincj@iksaif.net>
Expand All @@ -42,7 +42,7 @@ Description:
This may control the led, the device or both.
Users: Lapsus

What: /sys/devices/platform/asus_laptop/wlan
What: /sys/devices/platform/asus-laptop/wlan
Date: January 2007
KernelVersion: 2.6.20
Contact: "Corentin Chary" <corentincj@iksaif.net>
Expand Down
10 changes: 5 additions & 5 deletions trunk/Documentation/ABI/testing/sysfs-platform-eeepc-laptop
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
What: /sys/devices/platform/eeepc/disp
What: /sys/devices/platform/eeepc-laptop/disp
Date: May 2008
KernelVersion: 2.6.26
Contact: "Corentin Chary" <corentincj@iksaif.net>
Expand All @@ -9,21 +9,21 @@ Description:
- 3 = LCD+CRT
If you run X11, you should use xrandr instead.

What: /sys/devices/platform/eeepc/camera
What: /sys/devices/platform/eeepc-laptop/camera
Date: May 2008
KernelVersion: 2.6.26
Contact: "Corentin Chary" <corentincj@iksaif.net>
Description:
Control the camera. 1 means on, 0 means off.

What: /sys/devices/platform/eeepc/cardr
What: /sys/devices/platform/eeepc-laptop/cardr
Date: May 2008
KernelVersion: 2.6.26
Contact: "Corentin Chary" <corentincj@iksaif.net>
Description:
Control the card reader. 1 means on, 0 means off.

What: /sys/devices/platform/eeepc/cpufv
What: /sys/devices/platform/eeepc-laptop/cpufv
Date: Jun 2009
KernelVersion: 2.6.31
Contact: "Corentin Chary" <corentincj@iksaif.net>
Expand All @@ -42,7 +42,7 @@ Description:
`------------ Availables modes
For example, 0x301 means: mode 1 selected, 3 available modes.

What: /sys/devices/platform/eeepc/available_cpufv
What: /sys/devices/platform/eeepc-laptop/available_cpufv
Date: Jun 2009
KernelVersion: 2.6.31
Contact: "Corentin Chary" <corentincj@iksaif.net>
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/device-drivers.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</sect1>

<sect1><title>Atomic and pointer manipulation</title>
!Iarch/x86/include/asm/atomic.h
!Iarch/x86/include/asm/atomic_32.h
!Iarch/x86/include/asm/unaligned.h
</sect1>

Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/deviceiobook.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ CPU B: spin_unlock_irqrestore(&amp;dev_lock, flags)

<chapter id="pubfunctions">
<title>Public Functions Provided</title>
!Iarch/x86/include/asm/io.h
!Iarch/x86/include/asm/io_32.h
!Elib/iomap.c
</chapter>

Expand Down
3 changes: 2 additions & 1 deletion trunk/Documentation/DocBook/mac80211.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ usage should require reading the full document.
this though and the recommendation to allow only a single
interface in STA mode at first!
</para>
!Finclude/net/mac80211.h ieee80211_vif
!Finclude/net/mac80211.h ieee80211_if_init_conf
</chapter>

<chapter id="rx-tx">
Expand Down Expand Up @@ -234,6 +234,7 @@ usage should require reading the full document.
<title>Multiple queues and QoS support</title>
<para>TBD</para>
!Finclude/net/mac80211.h ieee80211_tx_queue_params
!Finclude/net/mac80211.h ieee80211_tx_queue_stats
</chapter>

<chapter id="AP">
Expand Down
39 changes: 37 additions & 2 deletions trunk/Documentation/cdrom/ide-cd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,42 @@ two arguments: the CDROM device, and the slot number to which you wish
to change. If the slot number is -1, the drive is unloaded.


4. Common problems
4. Compilation options
----------------------

There are a few additional options which can be set when compiling the
driver. Most people should not need to mess with any of these; they
are listed here simply for completeness. A compilation option can be
enabled by adding a line of the form `#define <option> 1' to the top
of ide-cd.c. All these options are disabled by default.

VERBOSE_IDE_CD_ERRORS
If this is set, ATAPI error codes will be translated into textual
descriptions. In addition, a dump is made of the command which
provoked the error. This is off by default to save the memory used
by the (somewhat long) table of error descriptions.

STANDARD_ATAPI
If this is set, the code needed to deal with certain drives which do
not properly implement the ATAPI spec will be disabled. If you know
your drive implements ATAPI properly, you can turn this on to get a
slightly smaller kernel.

NO_DOOR_LOCKING
If this is set, the driver will never attempt to lock the door of
the drive.

CDROM_NBLOCKS_BUFFER
This sets the size of the buffer to be used for a CDROMREADAUDIO
ioctl. The default is 8.

TEST
This currently enables an additional ioctl which enables a user-mode
program to execute an arbitrary packet command. See the source for
details. This should be left off unless you know what you're doing.


5. Common problems
------------------

This section discusses some common problems encountered when trying to
Expand Down Expand Up @@ -336,7 +371,7 @@ f. Data corruption.
expense of low system performance.


5. cdchange.c
6. cdchange.c
-------------

/*
Expand Down
43 changes: 24 additions & 19 deletions trunk/Documentation/feature-removal-schedule.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,27 @@ Who: Luis R. Rodriguez <lrodriguez@atheros.com>

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

What: CONFIG_WIRELESS_OLD_REGULATORY - old static regulatory information
When: March 2010 / desktop catchup

Why: The old regulatory infrastructure has been replaced with a new one
which does not require statically defined regulatory domains. We do
not want to keep static regulatory domains in the kernel due to the
the dynamic nature of regulatory law and localization. We kept around
the old static definitions for the regulatory domains of:

* US
* JP
* EU

and used by default the US when CONFIG_WIRELESS_OLD_REGULATORY was
set. We will remove this option once the standard Linux desktop catches
up with the new userspace APIs we have implemented.

Who: Luis R. Rodriguez <lrodriguez@atheros.com>

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

What: dev->power.power_state
When: July 2007
Why: Broken design for runtime control over driver power states, confusing
Expand Down Expand Up @@ -117,25 +138,19 @@ Who: Mauro Carvalho Chehab <mchehab@infradead.org>
---------------------------

What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
When: 2.6.35/2.6.36
When: November 2005
Files: drivers/pcmcia/: pcmcia_ioctl.c
Why: With the 16-bit PCMCIA subsystem now behaving (almost) like a
normal hotpluggable bus, and with it using the default kernel
infrastructure (hotplug, driver core, sysfs) keeping the PCMCIA
control ioctl needed by cardmgr and cardctl from pcmcia-cs is
unnecessary and potentially harmful (it does not provide for
proper locking), and makes further cleanups and integration of the
unnecessary, and makes further cleanups and integration of the
PCMCIA subsystem into the Linux kernel device driver model more
difficult. The features provided by cardmgr and cardctl are either
handled by the kernel itself now or are available in the new
pcmciautils package available at
http://kernel.org/pub/linux/utils/kernel/pcmcia/

For all architectures except ARM, the associated config symbol
has been removed from kernel 2.6.34; for ARM, it will be likely
be removed from kernel 2.6.35. The actual code will then likely
be removed from kernel 2.6.36.
Who: Dominik Brodowski <linux@dominikbrodowski.net>
Who: Dominik Brodowski <linux@brodo.de>

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

Expand Down Expand Up @@ -546,13 +561,3 @@ Why: The corgi touchscreen is now deprecated in favour of the generic
ads7846 driver now. Provided that the original driver is not generic
and is difficult to maintain, it will be removed later.
Who: Eric Miao <eric.y.miao@gmail.com>

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

What: capifs
When: February 2011
Files: drivers/isdn/capi/capifs.*
Why: udev fully replaces this special file system that only contains CAPI
NCCI TTY device nodes. User space (pppdcapiplugin) works without
noticing the difference.
Who: Jan Kiszka <jan.kiszka@web.de>
3 changes: 0 additions & 3 deletions trunk/Documentation/filesystems/nilfs2.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ norecovery Disable recovery of the filesystem on mount.
This disables every write access on the device for
read-only mounts or snapshots. This option will fail
for r/w mounts on an unclean volume.
discard Issue discard/TRIM commands to the underlying block
device when blocks are freed. This is useful for SSD
devices and sparse/thinly-provisioned LUNs.

NILFS2 usage
============
Expand Down
16 changes: 1 addition & 15 deletions trunk/Documentation/filesystems/sharedsubtree.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -837,9 +837,6 @@ replicas continue to be exactly same.
individual lists does not affect propagation or the way propagation
tree is modified by operations.

All vfsmounts in a peer group have the same ->mnt_master. If it is
non-NULL, they form a contiguous (ordered) segment of slave list.

A example propagation tree looks as shown in the figure below.
[ NOTE: Though it looks like a forest, if we consider all the shared
mounts as a conceptual entity called 'pnode', it becomes a tree]
Expand Down Expand Up @@ -877,19 +874,8 @@ replicas continue to be exactly same.

NOTE: The propagation tree is orthogonal to the mount tree.

8B Locking:

->mnt_share, ->mnt_slave, ->mnt_slave_list, ->mnt_master are protected
by namespace_sem (exclusive for modifications, shared for reading).

Normally we have ->mnt_flags modifications serialized by vfsmount_lock.
There are two exceptions: do_add_mount() and clone_mnt().
The former modifies a vfsmount that has not been visible in any shared
data structures yet.
The latter holds namespace_sem and the only references to vfsmount
are in lists that can't be traversed without namespace_sem.

8C Algorithm:
8B Algorithm:

The crux of the implementation resides in rbind/move operation.

Expand Down
3 changes: 1 addition & 2 deletions trunk/Documentation/i2c/busses/i2c-i801
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ Supported adapters:
* Intel 82801I (ICH9)
* Intel EP80579 (Tolapai)
* Intel 82801JI (ICH10)
* Intel 3400/5 Series (PCH)
* Intel Cougar Point (PCH)
* Intel PCH
Datasheets: Publicly available at the Intel website

Authors:
Expand Down
3 changes: 0 additions & 3 deletions trunk/Documentation/i2c/busses/i2c-parport
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ can be easily added when needed.
Earlier kernels defaulted to type=0 (Philips). But now, if the type
parameter is missing, the driver will simply fail to initialize.

SMBus alert support is available on adapters which have this line properly
connected to the parallel port's interrupt pin.


Building your own adapter
-------------------------
Expand Down
11 changes: 0 additions & 11 deletions trunk/Documentation/i2c/busses/i2c-parport-light
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,3 @@ parport handling is not an option. The drawback is a reduced portability
and the impossibility to daisy-chain other parallel port devices.

Please see i2c-parport for documentation.

Module parameters:

* type: type of adapter (see i2c-parport or modinfo)

* base: base I/O address
Default is 0x378 which is fairly common for parallel ports, at least on PC.

* irq: optional IRQ
This must be passed if you want SMBus alert support, assuming your adapter
actually supports this.
16 changes: 0 additions & 16 deletions trunk/Documentation/i2c/smbus-protocol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,22 +185,6 @@ the protocol. All ARP communications use slave address 0x61 and
require PEC checksums.


SMBus Alert
===========

SMBus Alert was introduced in Revision 1.0 of the specification.

The SMBus alert protocol allows several SMBus slave devices to share a
single interrupt pin on the SMBus master, while still allowing the master
to know which slave triggered the interrupt.

This is implemented the following way in the Linux kernel:
* I2C bus drivers which support SMBus alert should call
i2c_setup_smbus_alert() to setup SMBus alert support.
* I2C drivers for devices which can trigger SMBus alerts should implement
the optional alert() callback.


I2C Block Transactions
======================

Expand Down
5 changes: 2 additions & 3 deletions trunk/Documentation/i2c/writing-clients
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,8 @@ Plain I2C communication
These routines read and write some bytes from/to a client. The client
contains the i2c address, so you do not have to include it. The second
parameter contains the bytes to read/write, the third the number of bytes
to read/write (must be less than the length of the buffer, also should be
less than 64k since msg.len is u16.) Returned is the actual number of bytes
read/written.
to read/write (must be less than the length of the buffer.) Returned is
the actual number of bytes read/written.

int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg,
int num);
Expand Down
1 change: 1 addition & 0 deletions trunk/Documentation/ioctl/ioctl-number.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ Code Seq#(hex) Include File Comments
'K' all linux/kd.h
'L' 00-1F linux/loop.h conflict!
'L' 10-1F drivers/scsi/mpt2sas/mpt2sas_ctl.h conflict!
'L' 20-2F linux/usb/vstusb.h
'L' E0-FF linux/ppdd.h encrypted disk device driver
<http://linux01.gwdg.de/~alatham/ppdd.html>
'M' all linux/soundcard.h conflict!
Expand Down
9 changes: 4 additions & 5 deletions trunk/Documentation/isdn/INTERFACE.CAPI
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,10 @@ char *(*procinfo)(struct capi_ctr *ctrlr)
pointer to a callback function returning the entry for the device in
the CAPI controller info table, /proc/capi/controller

const struct file_operations *proc_fops
pointers to callback functions for the device's proc file
system entry, /proc/capi/controllers/<n>; pointer to the device's
capi_ctr structure is available from struct proc_dir_entry::data
which is available from struct inode.
read_proc_t *ctr_read_proc
pointer to the read_proc callback function for the device's proc file
system entry, /proc/capi/controllers/<n>; will be called with a
pointer to the device's capi_ctr structure as the last (data) argument

Note: Callback functions except send_message() are never called in interrupt
context.
Expand Down
Loading

0 comments on commit 21d9cc1

Please sign in to comment.