Commit e1015418 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (62 commits)
  msi-laptop: depends on RFKILL
  msi-laptop: Detect 3G device exists by standard ec command
  msi-laptop: Add resume method for set the SCM load again
  msi-laptop: Support some MSI 3G netbook that is need load SCM
  msi-laptop: Add threeg sysfs file for support query 3G state by standard 66/62 ec command
  msi-laptop: Support standard ec 66/62 command on MSI notebook and nebook
  Driver core: create lock/unlock functions for struct device
  sysfs: fix for thinko with sysfs_bin_attr_init()
  sysfs: Kill unused sysfs_sb variable.
  sysfs: Pass super_block to sysfs_get_inode
  driver core: Use sysfs_rename_link in device_rename
  sysfs: Implement sysfs_rename_link
  sysfs: Pack sysfs_dirent more tightly.
  sysfs: Serialize updates to the vfs inode
  sysfs: windfarm: init sysfs attributes
  sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on module dynamic attributes
  sysfs: Document sysfs_attr_init and sysfs_bin_attr_init
  sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on dynamic attributes
  sysfs: Use one lockdep class per sysfs attribute.
  sysfs: Only take active references on attributes.
  ...
parents d4bab1b0 410c1765

Documentation/HOWTO

+36 −77
Original line number Diff line number Diff line
@@ -221,8 +221,8 @@ branches. These different branches are: 
  - main 2.6.x kernel tree

  - 2.6.x.y -stable kernel tree

  - 2.6.x -git kernel patches

  - 2.6.x -mm kernel patches

  - subsystem specific kernel trees and patches

  - the 2.6.x -next kernel tree for integration tests



2.6.x kernel tree

-----------------
@@ -232,7 +232,7 @@ process is as follows: 
  - As soon as a new kernel is released a two weeks window is open,

    during this period of time maintainers can submit big diffs to

    Linus, usually the patches that have already been included in the

    -mm kernel for a few weeks.  The preferred way to submit big changes

    -next kernel for a few weeks.  The preferred way to submit big changes

    is using git (the kernel's source management tool, more information

    can be found at http://git.or.cz/) but plain patches are also just

    fine.
@@ -293,84 +293,43 @@ daily and represent the current state of Linus' tree. They are more 
experimental than -rc kernels since they are generated automatically

without even a cursory glance to see if they are sane.



2.6.x -mm kernel patches

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

These are experimental kernel patches released by Andrew Morton.  Andrew

takes all of the different subsystem kernel trees and patches and mushes

them together, along with a lot of patches that have been plucked from

the linux-kernel mailing list.  This tree serves as a proving ground for

new features and patches.  Once a patch has proved its worth in -mm for

a while Andrew or the subsystem maintainer pushes it on to Linus for

inclusion in mainline.



It is heavily encouraged that all new patches get tested in the -mm tree

before they are sent to Linus for inclusion in the main kernel tree.  Code

which does not make an appearance in -mm before the opening of the merge

window will prove hard to merge into the mainline.



These kernels are not appropriate for use on systems that are supposed

to be stable and they are more risky to run than any of the other

branches.



If you wish to help out with the kernel development process, please test

and use these kernel releases and provide feedback to the linux-kernel

mailing list if you have any problems, and if everything works properly.



In addition to all the other experimental patches, these kernels usually

also contain any changes in the mainline -git kernels available at the

time of release.



The -mm kernels are not released on a fixed schedule, but usually a few

-mm kernels are released in between each -rc kernel (1 to 3 is common).



Subsystem Specific kernel trees and patches

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

A number of the different kernel subsystem developers expose their

development trees so that others can see what is happening in the

different areas of the kernel.  These trees are pulled into the -mm

kernel releases as described above.



Here is a list of some of the different kernel trees available:

  git trees:

    - Kbuild development tree, Sam Ravnborg <sam@ravnborg.org>

	git.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git



    - ACPI development tree, Len Brown <len.brown@intel.com>

	git.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git



    - Block development tree, Jens Axboe <jens.axboe@oracle.com>

	git.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git



    - DRM development tree, Dave Airlie <airlied@linux.ie>

	git.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git



    - ia64 development tree, Tony Luck <tony.luck@intel.com>

	git.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git



    - infiniband, Roland Dreier <rolandd@cisco.com>

	git.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git



    - libata, Jeff Garzik <jgarzik@pobox.com>

	git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git



    - network drivers, Jeff Garzik <jgarzik@pobox.com>

	git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git



    - pcmcia, Dominik Brodowski <linux@dominikbrodowski.net>

	git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git



    - SCSI, James Bottomley <James.Bottomley@hansenpartnership.com>

	git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git



    - x86, Ingo Molnar <mingo@elte.hu>

	git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git



  quilt trees:

    - USB, Driver Core, and I2C, Greg Kroah-Hartman <gregkh@suse.de>

	kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/

The maintainers of the various kernel subsystems --- and also many

kernel subsystem developers --- expose their current state of

development in source repositories.  That way, others can see what is

happening in the different areas of the kernel.  In areas where

development is rapid, a developer may be asked to base his submissions

onto such a subsystem kernel tree so that conflicts between the

submission and other already ongoing work are avoided.



Most of these repositories are git trees, but there are also other SCMs

in use, or patch queues being published as quilt series.  Addresses of

these subsystem repositories are listed in the MAINTAINERS file.  Many

of them can be browsed at http://git.kernel.org/.



Before a proposed patch is committed to such a subsystem tree, it is

subject to review which primarily happens on mailing lists (see the

respective section below).  For several kernel subsystems, this review

process is tracked with the tool patchwork.  Patchwork offers a web

interface which shows patch postings, any comments on a patch or

revisions to it, and maintainers can mark patches as under review,

accepted, or rejected.  Most of these patchwork sites are listed at

http://patchwork.kernel.org/ or http://patchwork.ozlabs.org/.



2.6.x -next kernel tree for integration tests

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

Before updates from subsystem trees are merged into the mainline 2.6.x

tree, they need to be integration-tested.  For this purpose, a special

testing repository exists into which virtually all subsystem trees are

pulled on an almost daily basis:

	http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git

	http://linux.f-seidel.de/linux-next/pmwiki/



This way, the -next kernel gives a summary outlook onto what will be

expected to go into the mainline kernel at the next merge period.

Adventurous testers are very welcome to runtime-test the -next kernel.



  Other kernel trees can be found listed at http://git.kernel.org/ and in

  the MAINTAINERS file.



Bug Reporting

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

Documentation/kobject.txt

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ kobj_type: 


    struct kobj_type {

	    void (*release)(struct kobject *);

	    struct sysfs_ops	*sysfs_ops;

	    const struct sysfs_ops *sysfs_ops;

	    struct attribute	**default_attrs;

    };

arch/arm/mach-pxa/corgi_ssp.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ void __init corgi_ssp_set_machinfo(struct corgissp_machinfo *machinfo) 
	ssp_machinfo = machinfo;

}



static int __init corgi_ssp_probe(struct platform_device *dev)

static int __devinit corgi_ssp_probe(struct platform_device *dev)

{

	int ret;

arch/arm/mach-pxa/sharpsl_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ static struct platform_suspend_ops sharpsl_pm_ops = { 
};

#endif



static int __init sharpsl_pm_probe(struct platform_device *pdev)

static int __devinit sharpsl_pm_probe(struct platform_device *pdev)

{

	int ret;

arch/arm/mach-s3c2410/h1940-bluetooth.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static const struct rfkill_ops h1940bt_rfkill_ops = { 
	.set_block = h1940bt_set_block,

};



static int __init h1940bt_probe(struct platform_device *pdev)

static int __devinit h1940bt_probe(struct platform_device *pdev)

{

	struct rfkill *rfk;

	int ret = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE