Commit 848b8141 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Andrew's patch-bomb) 

Merge misc patches from Andrew Morton:
 "Incoming:

   - lots of misc stuff

   - backlight tree updates

   - lib/ updates

   - Oleg's percpu-rwsem changes

   - checkpatch

   - rtc

   - aoe

   - more checkpoint/restart support

  I still have a pile of MM stuff pending - Pekka should be merging
  later today after which that is good to go.  A number of other things
  are twiddling thumbs awaiting maintainer merges."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (180 commits)
  scatterlist: don't BUG when we can trivially return a proper error.
  docs: update documentation about /proc/<pid>/fdinfo/<fd> fanotify output
  fs, fanotify: add @mflags field to fanotify output
  docs: add documentation about /proc/<pid>/fdinfo/<fd> output
  fs, notify: add procfs fdinfo helper
  fs, exportfs: add exportfs_encode_inode_fh() helper
  fs, exportfs: escape nil dereference if no s_export_op present
  fs, epoll: add procfs fdinfo helper
  fs, eventfd: add procfs fdinfo helper
  procfs: add ability to plug in auxiliary fdinfo providers
  tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test
  breakpoint selftests: print failure status instead of cause make error
  kcmp selftests: print fail status instead of cause make error
  kcmp selftests: make run_tests fix
  mem-hotplug selftests: print failure status instead of cause make error
  cpu-hotplug selftests: print failure status instead of cause make error
  mqueue selftests: print failure status instead of cause make error
  vm selftests: print failure status instead of cause make error
  ubifs: use prandom_bytes
  mtd: nandsim: use prandom_bytes
  ...
parents 99295618 6fd59a83

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ modules.builtin 
# Generated include files

#

include/config

include/linux/version.h

include/generated

arch/*/include/generated

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -136,8 +136,6 @@ fault-injection/ 
	- dir with docs about the fault injection capabilities infrastructure.

fb/

	- directory with info on the frame buffer graphics abstraction layer.

feature-removal-schedule.txt

	- list of files and features that are going to be removed.

filesystems/

	- info on the vfs and the various filesystems that Linux supports.

firmware_class/

Documentation/ABI/README

+0 −3
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ The different levels of stability are: 
	the kernel, but are marked to be removed at some later point in

	time.  The description of the interface will document the reason

	why it is obsolete and when it can be expected to be removed.

	The file Documentation/feature-removal-schedule.txt may describe

	some of these interfaces, giving a schedule for when they will

	be removed.



  removed/

	This directory contains a list of the old interfaces that have

Documentation/DocBook/kernel-api.tmpl

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ 


     <sect1><title>String Conversions</title>

!Elib/vsprintf.c

!Finclude/linux/kernel.h kstrtol

!Finclude/linux/kernel.h kstrtoul

!Elib/kstrtox.c

     </sect1>

     <sect1><title>String Manipulation</title>

<!-- All functions are exported at now

Documentation/aoe/aoe.txt

+3 −1
Original line number Diff line number Diff line
@@ -125,7 +125,9 @@ DRIVER OPTIONS 
  The aoe_deadsecs module parameter determines the maximum number of

  seconds that the driver will wait for an AoE device to provide a

  response to an AoE command.  After aoe_deadsecs seconds have

  elapsed, the AoE device will be marked as "down".

  elapsed, the AoE device will be marked as "down".  A value of zero

  is supported for testing purposes and makes the aoe driver keep

  trying AoE commands forever.



  The aoe_maxout module parameter has a default of 128.  This is the

  maximum number of unresponded packets that will be sent to an AoE

CRA Git | Maintained and supported by SUSTech CRA and CCSE