Commit 54e514b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge third patchbomb from Andrew Morton:

 - various misc things

 - a couple of lib/ optimisations

 - provide DIV_ROUND_CLOSEST_ULL()

 - checkpatch updates

 - rtc tree

 - befs, nilfs2, hfs, hfsplus, fatfs, adfs, affs, bfs

 - ptrace fixes

 - fork() fixes

 - seccomp cleanups

 - more mmap_sem hold time reductions from Davidlohr

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (138 commits)
  proc: show locks in /proc/pid/fdinfo/X
  docs: add missing and new /proc/PID/status file entries, fix typos
  drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic
  Documentation/spi/spidev_test.c: fix warning
  drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type
  .gitignore: ignore *.tar
  MAINTAINERS: add Mediatek SoC mailing list
  tomoyo: reduce mmap_sem hold for mm->exe_file
  powerpc/oprofile: reduce mmap_sem hold for exe_file
  oprofile: reduce mmap_sem hold for mm->exe_file
  mips: ip32: add platform data hooks to use DS1685 driver
  lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
  x86: switch to using asm-generic for seccomp.h
  sparc: switch to using asm-generic for seccomp.h
  powerpc: switch to using asm-generic for seccomp.h
  parisc: switch to using asm-generic for seccomp.h
  mips: switch to using asm-generic for seccomp.h
  microblaze: use asm-generic for seccomp.h
  arm: use asm-generic for seccomp.h
  seccomp: allow COMPAT sigreturn overrides
  ...
parents 4fc8adcf 6c8c9031

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
*.order

*.elf

*.bin

*.tar

*.gz

*.bz2

*.lzma

Documentation/CodingStyle

+13 −0
Original line number Diff line number Diff line
@@ -659,6 +659,19 @@ macros using parameters. 
#define CONSTANT 0x4000

#define CONSTEXP (CONSTANT | 3)



5) namespace collisions when defining local variables in macros resembling

functions:



#define FOO(x)				\

({					\

	typeof(x) ret;			\

	ret = calc_ret(x);		\

	(ret);				\

)}



ret is a common name for a local variable - __foo_ret is less likely

to collide with an existing variable.



The cpp manual deals with macros exhaustively. The gcc internals manual also

covers RTL which is used frequently with assembly language in the kernel.

Documentation/SubmittingPatches

+2 −2
Original line number Diff line number Diff line
@@ -614,8 +614,8 @@ The canonical patch message body contains the following: 


  - An empty line.



  - The body of the explanation, which will be copied to the

    permanent changelog to describe this patch.

  - The body of the explanation, line wrapped at 75 columns, which will

    be copied to the permanent changelog to describe this patch.



  - The "Signed-off-by:" lines, described above, which will

    also go in the changelog.

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

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Conexant Digicolor Real Time Clock controller



This binding currently supports the CX92755 SoC.



Required properties:

- compatible: should be "cnxt,cx92755-rtc"

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

  region.

- interrupts: rtc alarm interrupt



Example:



	rtc@f0000c30 {

		compatible = "cnxt,cx92755-rtc";

		reg = <0xf0000c30 0x18>;

		interrupts = <25>;

	};

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

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@ Required properties: 
  region.

- interrupts: rtc alarm interrupt



Optional properties:

- stmp,crystal-freq: override crystal frequency as determined from fuse bits.

  Only <32000> and <32768> are possible for the hardware.  Use <0> for

  "no crystal".



Example:



rtc@80056000 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE