Commit 602cada8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6: (22 commits)
  [PATCH] devfs: Remove it from the feature_removal.txt file
  [PATCH] devfs: Last little devfs cleanups throughout the kernel tree.
  [PATCH] devfs: Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEV
  [PATCH] devfs: Remove the tty_driver devfs_name field as it's no longer needed
  [PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed
  [PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed
  [PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed
  [PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed
  [PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree
  [PATCH] devfs: Remove devfs_remove() function from the kernel tree
  [PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree
  [PATCH] devfs: Remove devfs_mk_bdev() function from the kernel tree
  [PATCH] devfs: Remove devfs_mk_symlink() function from the kernel tree
  [PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree
  [PATCH] devfs: Remove devfs_*_tape() functions from the kernel tree
  [PATCH] devfs: Remove devfs support from the sound subsystem
  [PATCH] devfs: Remove devfs support from the ide subsystem.
  [PATCH] devfs: Remove devfs support from the serial subsystem
  [PATCH] devfs: Remove devfs from the init code
  [PATCH] devfs: Remove devfs from the partition code
  ...
parents 82991c6f fee68d1c

Documentation/Changes

+6 −9
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ Intel IA32 microcode 
--------------------



A driver has been added to allow updating of Intel IA32 microcode,

accessible as both a devfs regular file and as a normal (misc)

character device.  If you are not using devfs you may need to:

accessible as a normal (misc) character device.  If you are not using

udev you may need to:



mkdir /dev/cpu

mknod /dev/cpu/microcode c 10 184
@@ -201,7 +201,9 @@ with programs using shared memory. 
udev

----

udev is a userspace application for populating /dev dynamically with

only entries for devices actually present. udev replaces devfs.

only entries for devices actually present.  udev replaces the basic

functionality of devfs, while allowing persistant device naming for

devices.



FUSE

----
@@ -231,18 +233,13 @@ The PPP driver has been restructured to support multilink and to 
enable it to operate over diverse media layers.  If you use PPP,

upgrade pppd to at least 2.4.0.



If you are not using devfs, you must have the device file /dev/ppp

If you are not using udev, you must have the device file /dev/ppp

which can be made by:



mknod /dev/ppp c 108 0



as root.



If you use devfsd and build ppp support as modules, you will need

the following in your /etc/devfsd.conf file:



LOOKUP	PPP	MODLOAD



Isdn4k-utils

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

Documentation/DocBook/kernel-api.tmpl

+0 −5
Original line number Diff line number Diff line
@@ -348,11 +348,6 @@ X!Earch/i386/kernel/mca.c 
     </sect1>

  </chapter>



  <chapter id="devfs">

     <title>The Device File System</title>

!Efs/devfs/base.c

  </chapter>



  <chapter id="sysfs">

     <title>The Filesystem for Exporting Kernel Objects</title>

!Efs/sysfs/file.c

Documentation/README.DAC960

+3 −3
Original line number Diff line number Diff line
@@ -78,9 +78,9 @@ also known as "System Drives", and Drive Groups are also called "Packs". Both 
terms are in use in the Mylex documentation; I have chosen to standardize on

the more generic "Logical Drive" and "Drive Group".



DAC960 RAID disk devices are named in the style of the Device File System

(DEVFS).  The device corresponding to Logical Drive D on Controller C is

referred to as /dev/rd/cCdD, and the partitions are called /dev/rd/cCdDp1

DAC960 RAID disk devices are named in the style of the obsolete Device File

System (DEVFS).  The device corresponding to Logical Drive D on Controller C

is referred to as /dev/rd/cCdD, and the partitions are called /dev/rd/cCdDp1

through /dev/rd/cCdDp7.  For example, partition 3 of Logical Drive 5 on

Controller 2 is referred to as /dev/rd/c2d5p3.  Note that unlike with SCSI

disks the device names will not change in the event of a disk drive failure.

Documentation/feature-removal-schedule.txt

+0 −11
Original line number Diff line number Diff line
@@ -6,17 +6,6 @@ be removed from this file. 


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



What:	devfs

When:	July 2005

Files:	fs/devfs/*, include/linux/devfs_fs*.h and assorted devfs

	function calls throughout the kernel tree

Why:	It has been unmaintained for a number of years, has unfixable

	races, contains a naming policy within the kernel that is

	against the LSB, and can be replaced by using udev.

Who:	Greg Kroah-Hartman <greg@kroah.com>



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



What:	RAW driver (CONFIG_RAW_DRIVER)

When:	December 2005

Why:	declared obsolete since kernel 2.6.3

Documentation/filesystems/devfs/ChangeLog

deleted100644 → 0
+0 −1977

File deleted.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE