Commit 76ca7d1c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (incoming from Andrew) 

Merge first patch-bomb from Andrew Morton:
 - Various misc bits
 - kmemleak fixes
 - small befs, codafs, cifs, efs, freexxfs, hfsplus, minixfs, reiserfs things
 - fanotify
 - I appear to have become SuperH maintainer
 - ocfs2 updates
 - direct-io tweaks
 - a bit of the MM queue
 - printk updates
 - MAINTAINERS maintenance
 - some backlight things
 - lib/ updates
 - checkpatch updates
 - the rtc queue
 - nilfs2 updates
 - Small Documentation/ updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (237 commits)
  Documentation/SubmittingPatches: remove references to patch-scripts
  Documentation/SubmittingPatches: update some dead URLs
  Documentation/filesystems/ntfs.txt: remove changelog reference
  Documentation/kmemleak.txt: updates
  fs/reiserfs/super.c: add __init to init_inodecache
  fs/reiserfs: move prototype declaration to header file
  fs/hfsplus/attributes.c: add __init to hfsplus_create_attr_tree_cache()
  fs/hfsplus/extents.c: fix concurrent acess of alloc_blocks
  fs/hfsplus/extents.c: remove unused variable in hfsplus_get_block
  nilfs2: update project's web site in nilfs2.txt
  nilfs2: update MAINTAINERS file entries fix
  nilfs2: verify metadata sizes read from disk
  nilfs2: add FITRIM ioctl support for nilfs2
  nilfs2: add nilfs_sufile_trim_fs to trim clean segs
  nilfs2: implementation of NILFS_IOCTL_SET_SUINFO ioctl
  nilfs2: add nilfs_sufile_set_suinfo to update segment usage
  nilfs2: add struct nilfs_suinfo_update and flags
  nilfs2: update MAINTAINERS file entries
  fs/coda/inode.c: add __init to init_inodecache()
  BEFS: logging cleanup
  ...
parents d0cb5f71 8d81e29f

CREDITS

+7 −0
Original line number Diff line number Diff line
@@ -2564,6 +2564,10 @@ N: Wolfgang Muees 
E: wolfgang@iksw-muees.de

D: Auerswald USB driver



N: Paul Mundt

E: paul.mundt@gmail.com

D: SuperH maintainer



N: Ian A. Murdock

E: imurdock@gnu.ai.mit.edu

D: Creator of Debian distribution
@@ -2707,6 +2711,9 @@ N: Greg Page 
E: gpage@sovereign.org

D: IPX development and support



N: Venkatesh Pallipadi (Venki)

D: x86/HPET



N: David Parsons

E: orc@pell.chi.il.us

D: improved memory detection code.

Documentation/SubmittingPatches

+32 −18
Original line number Diff line number Diff line
@@ -14,7 +14,10 @@ Read Documentation/SubmitChecklist for a list of items to check 
before submitting code.  If you are submitting a driver, also read

Documentation/SubmittingDrivers.





Many of these steps describe the default behavior of the git version

control system; if you use git to prepare your patches, you'll find much

of the mechanical work done for you, though you'll still need to prepare

and document a sensible set of patches.



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

SECTION 1 - CREATING AND SENDING YOUR CHANGE
@@ -25,7 +28,9 @@ SECTION 1 - CREATING AND SENDING YOUR CHANGE 
1) "diff -up"

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



Use "diff -up" or "diff -uprN" to create patches.

Use "diff -up" or "diff -uprN" to create patches.  git generates patches

in this form by default; if you're using git, you can skip this section

entirely.



All changes to the Linux kernel occur in the form of patches, as

generated by diff(1).  When creating your patch, make sure to create it
@@ -66,19 +71,14 @@ Make sure your patch does not include any extra files which do not 
belong in a patch submission.  Make sure to review your patch -after-

generated it with diff(1), to ensure accuracy.



If your changes produce a lot of deltas, you may want to look into

splitting them into individual patches which modify things in

logical stages.  This will facilitate easier reviewing by other

kernel developers, very important if you want your patch accepted.

There are a number of scripts which can aid in this:



Quilt:

http://savannah.nongnu.org/projects/quilt

If your changes produce a lot of deltas, you need to split them into

individual patches which modify things in logical stages; see section

#3.  This will facilitate easier reviewing by other kernel developers,

very important if you want your patch accepted.



Andrew Morton's patch scripts:

http://userweb.kernel.org/~akpm/stuff/patch-scripts.tar.gz

Instead of these scripts, quilt is the recommended patch management

tool (see above).

If you're using git, "git rebase -i" can help you with this process.  If

you're not using git, quilt <http://savannah.nongnu.org/projects/quilt>

is another popular alternative.
@@ -106,8 +106,21 @@ I.e., the patch (series) and its description should be self-contained. 
This benefits both the patch merger(s) and reviewers.  Some reviewers

probably didn't even receive earlier versions of the patch.



Describe your changes in imperative mood, e.g. "make xyzzy do frotz"

instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy

to do frotz", as if you are giving orders to the codebase to change

its behaviour.



If the patch fixes a logged bug entry, refer to that bug entry by

number and URL.

number and URL.  If the patch follows from a mailing list discussion,

give a URL to the mailing list archive; use the https://lkml.kernel.org/

redirector with a Message-Id, to ensure that the links cannot become

stale.



However, try to make your explanation understandable without external

resources.  In addition to giving a URL to a mailing list archive or

bug, summarize the relevant points of the discussion that led to the

patch as submitted.



If you want to refer to a specific commit, don't just refer to the

SHA-1 ID of the commit. Please also include the oneline summary of
@@ -594,7 +607,8 @@ patch. 
If you are going to include a diffstat after the "---" marker, please

use diffstat options "-p 1 -w 70" so that filenames are listed from

the top of the kernel source tree and don't use too much horizontal

space (easily fit in 80 columns, maybe with some indentation).

space (easily fit in 80 columns, maybe with some indentation).  (git

generates appropriate diffstats by default.)



See more details on the proper patch format in the following

references.
@@ -725,7 +739,7 @@ SECTION 3 - REFERENCES 
----------------------



Andrew Morton, "The perfect patch" (tpp).

  <http://userweb.kernel.org/~akpm/stuff/tpp.txt>

  <http://www.ozlabs.org/~akpm/stuff/tpp.txt>



Jeff Garzik, "Linux kernel patch submission format".

  <http://linux.yyz.us/patch-format.html>
@@ -738,7 +752,7 @@ Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer". 
  <http://www.kroah.com/log/linux/maintainer-05.html>



NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!

  <http://marc.theaimsgroup.com/?l=linux-kernel&m=112112749912944&w=2>

  <https://lkml.org/lkml/2005/7/11/336>



Kernel Documentation/CodingStyle:

  <http://users.sosdg.org/~qiyong/lxr/source/Documentation/CodingStyle>

Documentation/devicetree/bindings/rtc/sunxi-rtc.txt

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
RTC controller for the Allwinner A10/A20



Required properties:

- compatible : Should be "allwinner,sun4i-rtc" or "allwinner,sun7i-a20-rtc"

- compatible : Should be "allwinner,sun4i-a10-rtc" or "allwinner,sun7i-a20-rtc"

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: IRQ line for the RTC.
@@ -11,7 +11,7 @@ Required properties: 
Example:



rtc: rtc@01c20d00 {

	compatible = "allwinner,sun4i-rtc";

	compatible = "allwinner,sun4i-a10-rtc";

	reg = <0x01c20d00 0x20>;

	interrupts = <24>;

};

Documentation/filesystems/nilfs2.txt

+9 −3
Original line number Diff line number Diff line
@@ -25,9 +25,8 @@ available from the following download page. At least "mkfs.nilfs2", 
cleaner or garbage collector) are required.  Details on the tools are

described in the man pages included in the package.



Project web page:    http://www.nilfs.org/en/

Download page:       http://www.nilfs.org/en/download.html

Git tree web page:   http://www.nilfs.org/git/

Project web page:    http://nilfs.sourceforge.net/

Download page:       http://nilfs.sourceforge.net/en/download.html

List info:           http://vger.kernel.org/vger-lists.html#linux-nilfs



Caveats
@@ -111,6 +110,13 @@ Table of NILFS2 specific ioctls 
			        nilfs_resize utilities and by nilfs_cleanerd

			        daemon.



 NILFS_IOCTL_SET_SUINFO         Modify segment usage info of requested

				segments. This ioctl is used by

				nilfs_cleanerd daemon to skip unnecessary

				cleaning operation of segments and reduce

				performance penalty or wear of flash device

				due to redundant move of in-use blocks.



 NILFS_IOCTL_GET_SUSTAT         Return segment usage statistics. This ioctl

			        is used in lssu, nilfs_resize utilities and

			        by nilfs_cleanerd daemon.

Documentation/filesystems/ntfs.txt

+0 −2
Original line number Diff line number Diff line
@@ -455,8 +455,6 @@ not have this problem with odd numbers of sectors. 
ChangeLog

=========



Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.



2.1.30:

	- Fix writev() (it kept writing the first segment over and over again

	  instead of moving onto subsequent segments).

CRA Git | Maintained and supported by SUSTech CRA and CCSE