Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47a46942 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge second patchbomb from Andrew Morton:

 - most of the rest of MM

 - lots of misc things

 - procfs updates

 - printk feature work

 - updates to get_maintainer, MAINTAINERS, checkpatch

 - lib/ updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (96 commits)
  exit,stats: /* obey this comment */
  coredump: add __printf attribute to cn_*printf functions
  coredump: use from_kuid/kgid when formatting corename
  fs/reiserfs: remove unneeded cast
  NILFS2: support NFSv2 export
  fs/befs/btree.c: remove unneeded initializations
  fs/minix: remove unneeded cast
  init/do_mounts.c: add create_dev() failure log
  kasan: remove duplicate definition of the macro KASAN_FREE_PAGE
  fs/efs: femove unneeded cast
  checkpatch: emit "NOTE: <types>" message only once after multiple files
  checkpatch: emit an error when there's a diff in a changelog
  checkpatch: validate MODULE_LICENSE content
  checkpatch: add multi-line handling for PREFER_ETHER_A...
parents c13c8100 51229b49

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ Mayuresh Janorkar <mayur@ti.com> 
Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Mitesh shah <mshah@teja.com>

Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>

Morten Welinder <terra@gnome.org>

Morten Welinder <welinder@anemone.rentec.com>

Morten Welinder <welinder@darter.rentec.com>
@@ -95,10 +96,12 @@ Patrick Mochel <mochel@digitalimplant.org> 
Peter A Jonsson <pj@ludd.ltu.se>

Peter Oruba <peter@oruba.de>

Peter Oruba <peter.oruba@amd.com>

Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>

Rémi Denis-Courmont <rdenis@simphalempin.com>

Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>

Rudolf Marek <R.Marek@sh.cvut.cz>

Documentation/ABI/testing/configfs-spear-pcie-gadget

+1 −1
Original line number Diff line number Diff line 
What:		/config/pcie-gadget

Date:		Feb 2011

KernelVersion:	2.6.37

Contact:	Pratyush Anand <pratyush.anand@st.com>

Contact:	Pratyush Anand <pratyush.anand@gmail.com>

Description:



	Interface is used to configure selected dual mode PCIe controller

Documentation/ABI/testing/dev-kmsg

+9 −0
Original line number Diff line number Diff line
@@ -98,4 +98,13 @@ Description: The /dev/kmsg character device node provides userspace access 
		logic is used internally when messages are printed to the

		console, /proc/kmsg or the syslog() syscall.



		By default, kernel tries to avoid fragments by concatenating

		when it can and fragments are rare; however, when extended

		console support is enabled, the in-kernel concatenation is

		disabled and /dev/kmsg output will contain more fragments. If

		the log consumer performs concatenation, the end result

		should be the same. In the future, the in-kernel concatenation

		may be removed entirely and /dev/kmsg users are recommended to

		implement fragment handling.



Users:		dmesg(1), userspace kernel log consumers

Documentation/ABI/testing/sysfs-bus-usb-lvstest

+6 −6
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ driver is bound with root hub device. 


What:		/sys/bus/usb/devices/.../get_dev_desc

Date:		March 2014

Contact:	Pratyush Anand <pratyush.anand@st.com>

Contact:	Pratyush Anand <pratyush.anand@gmail.com>

Description:

		Write to this node to issue "Get Device Descriptor"

		for Link Layer Validation device. It is needed for TD.7.06.



What:		/sys/bus/usb/devices/.../u1_timeout

Date:		March 2014

Contact:	Pratyush Anand <pratyush.anand@st.com>

Contact:	Pratyush Anand <pratyush.anand@gmail.com>

Description:

		Set "U1 timeout" for the downstream port where Link Layer

		Validation device is connected. Timeout value must be between 0
@@ -19,7 +19,7 @@ Description: 


What:		/sys/bus/usb/devices/.../u2_timeout

Date:		March 2014

Contact:	Pratyush Anand <pratyush.anand@st.com>

Contact:	Pratyush Anand <pratyush.anand@gmail.com>

Description:

		Set "U2 timeout" for the downstream port where Link Layer

		Validation device is connected. Timeout value must be between 0
@@ -27,21 +27,21 @@ Description: 


What:		/sys/bus/usb/devices/.../hot_reset

Date:		March 2014

Contact:	Pratyush Anand <pratyush.anand@st.com>

Contact:	Pratyush Anand <pratyush.anand@gmail.com>

Description:

		Write to this node to issue "Reset" for Link Layer Validation

		device. It is needed for TD.7.29, TD.7.31, TD.7.34 and TD.7.35.



What:		/sys/bus/usb/devices/.../u3_entry

Date:		March 2014

Contact:	Pratyush Anand <pratyush.anand@st.com>

Contact:	Pratyush Anand <pratyush.anand@gmail.com>

Description:

		Write to this node to issue "U3 entry" for Link Layer

		Validation device. It is needed for TD.7.35 and TD.7.36.



What:		/sys/bus/usb/devices/.../u3_exit

Date:		March 2014

Contact:	Pratyush Anand <pratyush.anand@st.com>

Contact:	Pratyush Anand <pratyush.anand@gmail.com>

Description:

		Write to this node to issue "U3 exit" for Link Layer

		Validation device. It is needed for TD.7.36.

Documentation/ABI/testing/sysfs-class-zram

0 → 100644
+24 −0
Original line number Diff line number Diff line 
What:		/sys/class/zram-control/

Date:		August 2015

KernelVersion:	4.2

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The zram-control/ class sub-directory belongs to zram

		device class



What:		/sys/class/zram-control/hot_add

Date:		August 2015

KernelVersion:	4.2

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		RO attribute. Read operation will cause zram to add a new

		device and return its device id back to user (so one can

		use /dev/zram<id>), or error code.



What:		/sys/class/zram-control/hot_remove

Date:		August 2015

KernelVersion:	4.2

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		WO attribute. Remove a specific /dev/zramX device, where X

		is a device_id provided by user.