Commit b00f4dc5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'master' into pm-sleep 

* master: (848 commits)
  SELinux: Fix RCU deref check warning in sel_netport_insert()
  binary_sysctl(): fix memory leak
  mm/vmalloc.c: remove static declaration of va from __get_vm_area_node
  ipmi_watchdog: restore settings when BMC reset
  oom: fix integer overflow of points in oom_badness
  memcg: keep root group unchanged if creation fails
  nilfs2: potential integer overflow in nilfs_ioctl_clean_segments()
  nilfs2: unbreak compat ioctl
  cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask
  evm: prevent racing during tfm allocation
  evm: key must be set once during initialization
  mmc: vub300: fix type of firmware_rom_wait_states module parameter
  Revert "mmc: enable runtime PM by default"
  mmc: sdhci: remove "state" argument from sdhci_suspend_host
  x86, dumpstack: Fix code bytes breakage due to missing KERN_CONT
  IB/qib: Correct sense on freectxts increment and decrement
  RDMA/cma: Verify private data length
  cgroups: fix a css_set not found bug in cgroup_attach_proc
  oprofile: Fix uninitialized memory access when writing to writing to oprofilefs
  Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"
  ...

Conflicts:
	kernel/cgroup_freezer.c
parents 1eac8111 b9e26dfd

CREDITS

+6 −3
Original line number Diff line number Diff line
@@ -688,10 +688,13 @@ S: Oxfordshire, UK. 


N: Kees Cook

E: kees@outflux.net

W: http://outflux.net/

P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30  1975 1FFF 4BA9 1706 3E6D

D: Minor updates to SCSI types, added /proc/pid/maps protection

E: kees@ubuntu.com

E: keescook@chromium.org

W: http://outflux.net/blog/

P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E  6E13 8972 F4DF DC6D C026

D: Various security things, bug fixes, and documentation.

S: (ask for current address)

S: Portland, Oregon

S: USA



N: Robin Cornelius

Documentation/ABI/testing/sysfs-bus-rbd

+0 −7
Original line number Diff line number Diff line
@@ -57,13 +57,6 @@ create_snap 


	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create



rollback_snap



	Rolls back data to the specified snapshot. This goes over the entire

	list of rados blocks and sends a rollback command to each.



	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback



snap_*



	A directory per each snapshot

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ qcom Qualcomm, Inc. 
ramtron	Ramtron International

samsung	Samsung Semiconductor

schindler	Schindler

sil	Silicon Image

simtek

sirf	SiRF Technology, Inc.

stericsson	ST-Ericsson

Documentation/filesystems/btrfs.txt

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ IRC network. 
Userspace tools for creating and manipulating Btrfs file systems are

available from the git repository at the following location:



 http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs-unstable.git

 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git

 http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs.git

 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git



These include the following tools:

Documentation/kernel-parameters.txt

+3 −3
Original line number Diff line number Diff line
@@ -315,12 +315,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			CPU-intensive style benchmark, and it can vary highly in

			a microbenchmark depending on workload and compiler.



			1: only for 32-bit processes

			2: only for 64-bit processes

			32: only for 32-bit processes

			64: only for 64-bit processes

			on: enable for both 32- and 64-bit processes

			off: disable for both 32- and 64-bit processes



	amd_iommu=	[HW,X86-84]

	amd_iommu=	[HW,X86-64]

			Pass parameters to the AMD IOMMU driver in the system.

			Possible values are:

			fullflush - enable flushing of IO/TLB entries when

CRA Git | Maintained and supported by SUSTech CRA and CCSE