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

Merge branch 'akpm' (patches from Andrew) 

Merge yet more updates from Andrew Morton:

 - the rest of ocfs2

 - various hotfixes, mainly MM

 - quite a bit of misc stuff - drivers, fork, exec, signals, etc.

 - printk updates

 - firmware

 - checkpatch

 - nilfs2

 - more kexec stuff than usual

 - rapidio updates

 - w1 things

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (111 commits)
  ipc: delete "nr_ipc_ns"
  kcov: allow more fine-grained coverage instrumentation
  init/Kconfig: add clarification for out-of-tree modules
  config: add android config fragments
  init/Kconfig: ban CONFIG_LOCALVERSION_AUTO with allmodconfig
  relay: add global mode support for buffer-only channels
  init: allow blacklisting of module_init functions
  w1:omap_hdq: fix regression
  w1: add helper macro module_w1_family
  w1: remove need for ida and use PLATFORM_DEVID_AUTO
  rapidio/switches: add driver for IDT gen3 switches
  powerpc/fsl_rio: apply changes for RIO spec rev 3
  rapidio: modify for rev.3 specification changes
  rapidio: change inbound window size type to u64
  rapidio/idt_gen2: fix locking warning
  rapidio: fix error handling in mbox request/release functions
  rapidio/tsi721_dma: advance queue processing from transfer submit call
  rapidio/tsi721: add messaging mbox selector parameter
  rapidio/tsi721: add PCIe MRRS override parameter
  rapidio/tsi721_dma: add channel mask and queue size parameters
  ...
parents 8cbdd85b 3bd080e4

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com> 
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Mark Brown <broonie@sirena.org.uk>

Matthieu CASTET <castet.matthieu@free.fr>

Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>

Documentation/filesystems/nilfs2.txt

+2 −1
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ among NILFS2 files can be depicted as follows: 
                                  `-- file (ino=yy)

                                    ( regular file, directory, or symlink )



For detail on the format of each file, please see include/linux/nilfs2_fs.h.

For detail on the format of each file, please see nilfs2_ondisk.h

located at include/uapi/linux directory.



There are no patents or other intellectual property that we protect

with regard to the design of NILFS2.  It is allowed to replicate the

Documentation/ioctl/ioctl-number.txt

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ Code Seq#(hex) Include File Comments 
'm'	00	drivers/scsi/megaraid/megaraid_ioctl.h	conflict!

'm'	00-1F	net/irda/irmod.h	conflict!

'n'	00-7F	linux/ncp_fs.h and fs/ncpfs/ioctl.c

'n'	80-8F	linux/nilfs2_fs.h	NILFS2

'n'	80-8F	uapi/linux/nilfs2_api.h	NILFS2

'n'	E0-FF	linux/matroxfb.h	matroxfb

'o'	00-1F	fs/ocfs2/ocfs2_fs.h	OCFS2

'o'     00-03   mtd/ubi-user.h		conflict! (OCFS2 and UBI overlaps)

Documentation/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -3182,6 +3182,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			Format: <bool>  (1/Y/y=enable, 0/N/n=disable)

			default: disabled



	printk.devkmsg={on,off,ratelimit}

			Control writing to /dev/kmsg.

			on - unlimited logging to /dev/kmsg from userspace

			off - logging to /dev/kmsg disabled

			ratelimit - ratelimit the logging

			Default: ratelimit



	printk.time=	Show timing data prefixed to each printk message line

			Format: <bool>  (1/Y/y=enable, 0/N/n=disable)

Documentation/rapidio/mport_cdev.txt

+1 −2
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ III. Module parameters 


- 'dbg_level' - This parameter allows to control amount of debug information

        generated by this device driver. This parameter is formed by set of

        This parameter can be changed bit masks that correspond to the specific

        functional block.

        bit masks that correspond to the specific functional blocks.

        For mask definitions see 'drivers/rapidio/devices/rio_mport_cdev.c'

        This parameter can be changed dynamically.

        Use CONFIG_RAPIDIO_DEBUG=y to enable debug output at the top level.

CRA Git | Maintained and supported by SUSTech CRA and CCSE