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

Commit d3b7737f authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

Merge commit '07068021' into stable/for-linus-fixes-3.3 

* commit '07068021': (50 commits)
  xen-balloon: convert sysdev_class to a regular subsystem
  clocksource: convert sysdev_class to a regular subsystem
  ibm_rtl: convert sysdev_class to a regular subsystem
  edac: convert sysdev_class to a regular subsystem
  rtmutex-tester: convert sysdev_class to a regular subsystem
  driver-core: implement 'sysdev' functionality for regular devices and buses
  kref: fix up the kfree build problems
  kref: Remove the memory barriers
  kref: Implement kref_put in terms of kref_sub
  kref: Inline all functions
  Drivers: hv: Get rid of an unnecessary check in hv.c
  Drivers: hv: Make the vmbus driver unloadable
  Drivers: hv: Fix a memory leak
  Documentation: Update stable address
  MAINTAINERS: stable: Update address
  w1: add fast search for single slave bus
  driver-core: skip uevent generation when nobody is listening
  drivers: hv: Don't OOPS when you cannot init vmbus
  firmware: google: fix gsmi.c build warning
  drivers_base: make argument to platform_device_register_full const
  ...
parents dc6821e0 07068021

Documentation/HOWTO

+2 −2
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ versions. 
If no 2.6.x.y kernel is available, then the highest numbered 2.6.x

kernel is the current stable kernel.



2.6.x.y are maintained by the "stable" team <stable@kernel.org>, and are

released as needs dictate.  The normal release period is approximately 

2.6.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and

are released as needs dictate.  The normal release period is approximately

two weeks, but it can be longer if there are no pressing problems.  A

security-related problem, instead, can cause a release to happen almost

instantly.

Documentation/development-process/5.Posting

+4 −4
Original line number Diff line number Diff line
@@ -271,10 +271,10 @@ copies should go to: 
   the linux-kernel list.



 - If you are fixing a bug, think about whether the fix should go into the

   next stable update.  If so, stable@kernel.org should get a copy of the

   patch.  Also add a "Cc: stable@kernel.org" to the tags within the patch

   itself; that will cause the stable team to get a notification when your

   fix goes into the mainline.

   next stable update.  If so, stable@vger.kernel.org should get a copy of

   the patch.  Also add a "Cc: stable@vger.kernel.org" to the tags within

   the patch itself; that will cause the stable team to get a notification

   when your fix goes into the mainline.



When selecting recipients for a patch, it is good to have an idea of who

you think will eventually accept the patch and get it merged.  While it

Documentation/driver-model/devres.txt

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ IOMAP 
  devm_ioremap()

  devm_ioremap_nocache()

  devm_iounmap()

  devm_request_and_ioremap() : checks resource, requests region, ioremaps

  pcim_iomap()

  pcim_iounmap()

  pcim_iomap_table()	: array of mapped addresses indexed by BAR

Documentation/filesystems/debugfs.txt

+31 −1
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ A read on the resulting file will yield either Y (for non-zero values) or 
N, followed by a newline.  If written to, it will accept either upper- or

lower-case values, or 1 or 0.  Any other input will be silently ignored.



Finally, a block of arbitrary binary data can be exported with:

Another option is exporting a block of arbitrary binary data, with

this structure and function:



    struct debugfs_blob_wrapper {

	void *data;
@@ -115,6 +116,35 @@ can be used to export binary information, but there does not appear to be 
any code which does so in the mainline.  Note that all files created with

debugfs_create_blob() are read-only.



If you want to dump a block of registers (something that happens quite

often during development, even if little such code reaches mainline.

Debugfs offers two functions: one to make a registers-only file, and

another to insert a register block in the middle of another sequential

file.



    struct debugfs_reg32 {

	char *name;

	unsigned long offset;

    };



    struct debugfs_regset32 {

	struct debugfs_reg32 *regs;

	int nregs;

	void __iomem *base;

    };



    struct dentry *debugfs_create_regset32(const char *name, mode_t mode,

				     struct dentry *parent,

				     struct debugfs_regset32 *regset);



    int debugfs_print_regs32(struct seq_file *s, struct debugfs_reg32 *regs,

			 int nregs, void __iomem *base, char *prefix);



The "base" argument may be 0, but you may want to build the reg32 array

using __stringify, and a number of register names (macros) are actually

byte offsets over a base for the register block.





There are a couple of other directory-oriented helper functions:



    struct dentry *debugfs_rename(struct dentry *old_dir,

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6261,7 +6261,7 @@ F: arch/alpha/kernel/srm_env.c 


STABLE BRANCH

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

L:	stable@kernel.org

L:	stable@vger.kernel.org

S:	Maintained



STAGING SUBSYSTEM