Commit 5b8b9d0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge yet more updates from Andrew Morton:

 - Almost all of the rest of MM (memcg, slab-generic, slab, pagealloc,
   gup, hugetlb, pagemap, memremap)

 - Various other things (hfs, ocfs2, kmod, misc, seqfile)

* akpm: (34 commits)
  ipc/util.c: sysvipc_find_ipc() should increase position index
  kernel/gcov/fs.c: gcov_seq_next() should increase position index
  fs/seq_file.c: seq_read(): add info message about buggy .next functions
  drivers/dma/tegra20-apb-dma.c: fix platform_get_irq.cocci warnings
  change email address for Pali Rohár
  selftests: kmod: test disabling module autoloading
  selftests: kmod: fix handling test numbers above 9
  docs: admin-guide: document the kernel.modprobe sysctl
  fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once()
  kmod: make request_module() return an error when autoloading is disabled
  mm/memremap: set caching mode for PCI P2PDMA memory to WC
  mm/memory_hotplug: add pgprot_t to mhp_params
  powerpc/mm: thread pgprot_t through create_section_mapping()
  x86/mm: introduce __set_memory_prot()
  x86/mm: thread pgprot_t through init_memory_mapping()
  mm/memory_hotplug: rename mhp_restrictions to mhp_params
  mm/memory_hotplug: drop the flags field from struct mhp_restrictions
  mm/special: create generic fallbacks for pte_special() and pte_mkspecial()
  mm/vma: introduce VM_ACCESS_FLAGS
  mm/vma: define a default value for VM_DATA_DEFAULT_FLAGS
  ...
parents ca6151a9 89163f93

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com> 
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>

Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>

Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Patrick Mochel <mochel@digitalimplant.org>

Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>

Documentation/ABI/testing/sysfs-platform-dell-laptop

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ What: /sys/class/leds/dell::kbd_backlight/als_enabled 
Date:		December 2014

KernelVersion:	3.19

Contact:	Gabriele Mazzotta <gabriele.mzt@gmail.com>,

		Pali Rohár <pali.rohar@gmail.com>

		Pali Rohár <pali@kernel.org>

Description:

		This file allows to control the automatic keyboard

		illumination mode on some systems that have an ambient
@@ -13,7 +13,7 @@ What: /sys/class/leds/dell::kbd_backlight/als_setting 
Date:		December 2014

KernelVersion:	3.19

Contact:	Gabriele Mazzotta <gabriele.mzt@gmail.com>,

		Pali Rohár <pali.rohar@gmail.com>

		Pali Rohár <pali@kernel.org>

Description:

		This file allows to specifiy the on/off threshold value,

		as reported by the ambient light sensor.
@@ -22,7 +22,7 @@ What: /sys/class/leds/dell::kbd_backlight/start_triggers 
Date:		December 2014

KernelVersion:	3.19

Contact:	Gabriele Mazzotta <gabriele.mzt@gmail.com>,

		Pali Rohár <pali.rohar@gmail.com>

		Pali Rohár <pali@kernel.org>

Description:

		This file allows to control the input triggers that

		turn on the keyboard backlight illumination that is
@@ -45,7 +45,7 @@ What: /sys/class/leds/dell::kbd_backlight/stop_timeout 
Date:		December 2014

KernelVersion:	3.19

Contact:	Gabriele Mazzotta <gabriele.mzt@gmail.com>,

		Pali Rohár <pali.rohar@gmail.com>

		Pali Rohár <pali@kernel.org>

Description:

		This file allows to specify the interval after which the

		keyboard illumination is disabled because of inactivity.

Documentation/admin-guide/kernel-parameters.txt

+8 −0
Original line number Diff line number Diff line
@@ -1471,6 +1471,14 @@ 
	hpet_mmap=	[X86, HPET_MMAP] Allow userspace to mmap HPET

			registers.  Default set by CONFIG_HPET_MMAP_DEFAULT.



	hugetlb_cma=	[HW] The size of a cma area used for allocation

			of gigantic hugepages.

			Format: nn[KMGTPE]



			Reserve a cma area of given size and allocate gigantic

			hugepages using the cma allocator. If enabled, the

			boot-time allocation of gigantic hugepages is skipped.



	hugepages=	[HW,X86-32,IA-64] HugeTLB pages to allocate at boot.

	hugepagesz=	[HW,IA-64,PPC,X86-64] The size of the HugeTLB pages.

			On x86-64 and powerpc, this option can be specified

Documentation/admin-guide/sysctl/kernel.rst

+21 −0
Original line number Diff line number Diff line
@@ -446,6 +446,27 @@ Notes: 
     successful IPC object allocation. If an IPC object allocation syscall

     fails, it is undefined if the value remains unmodified or is reset to -1.



modprobe:

=========



The path to the usermode helper for autoloading kernel modules, by

default "/sbin/modprobe".  This binary is executed when the kernel

requests a module.  For example, if userspace passes an unknown

filesystem type to mount(), then the kernel will automatically request

the corresponding filesystem module by executing this usermode helper.

This usermode helper should insert the needed module into the kernel.



This sysctl only affects module autoloading.  It has no effect on the

ability to explicitly insert modules.



If this sysctl is set to the empty string, then module autoloading is

completely disabled.  The kernel will not try to execute a usermode

helper at all, nor will it call the kernel_module_request LSM hook.



If CONFIG_STATIC_USERMODEHELPER=y is set in the kernel configuration,

then the configured static usermode helper overrides this sysctl,

except that the empty string is still accepted to completely disable

module autoloading as described above.



nmi_watchdog

============

MAINTAINERS

+8 −8
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ L: linux-alpha@vger.kernel.org 
F:	arch/alpha/















ALPS PS/2 TOUCHPAD DRIVER













R:	Pali Rohár <pali.rohar@gmail.com>













R:	Pali Rohár <pali@kernel.org>















F:	drivers/input/mouse/alps.*





























ALTERA I2C CONTROLLER DRIVER










@@ -4774,23 +4774,23 @@ F:	drivers/net/fddi/defza.*



























DELL LAPTOP DRIVER















M:	Matthew Garrett <mjg59@srcf.ucam.org>













M:	Pali Rohár <pali.rohar@gmail.com>













M:	Pali Rohár <pali@kernel.org>















L:	platform-driver-x86@vger.kernel.org















S:	Maintained















F:	drivers/platform/x86/dell-laptop.c





























DELL LAPTOP FREEFALL DRIVER













M:	Pali Rohár <pali.rohar@gmail.com>













M:	Pali Rohár <pali@kernel.org>















S:	Maintained















F:	drivers/platform/x86/dell-smo8800.c





























DELL LAPTOP RBTN DRIVER













M:	Pali Rohár <pali.rohar@gmail.com>













M:	Pali Rohár <pali@kernel.org>















S:	Maintained















F:	drivers/platform/x86/dell-rbtn.*





























DELL LAPTOP SMM DRIVER













M:	Pali Rohár <pali.rohar@gmail.com>













M:	Pali Rohár <pali@kernel.org>















S:	Maintained















F:	drivers/hwmon/dell-smm-hwmon.c















F:	include/uapi/linux/i8k.h









@@ -4802,7 +4802,7 @@ S:	Maintained













F:	drivers/platform/x86/dell_rbu.c





























DELL SMBIOS DRIVER













M:	Pali Rohár <pali.rohar@gmail.com>













M:	Pali Rohár <pali@kernel.org>















M:	Mario Limonciello <mario.limonciello@dell.com>















L:	platform-driver-x86@vger.kernel.org















S:	Maintained










@@ -4835,7 +4835,7 @@ F:	drivers/platform/x86/dell-wmi-descriptor.c



























DELL WMI NOTIFICATIONS DRIVER















M:	Matthew Garrett <mjg59@srcf.ucam.org>













M:	Pali Rohár <pali.rohar@gmail.com>













M:	Pali Rohár <pali@kernel.org>















S:	Maintained















F:	drivers/platform/x86/dell-wmi.c
























@@ -11950,7 +11950,7 @@ F:	drivers/media/i2c/et8ek8













F:	drivers/media/i2c/ad5820.c





























NOKIA N900 POWER SUPPLY DRIVERS













R:	Pali Rohár <pali.rohar@gmail.com>













R:	Pali Rohár <pali@kernel.org>















F:	include/linux/power/bq2415x_charger.h















F:	include/linux/power/bq27xxx_battery.h















F:	drivers/power/supply/bq2415x_charger.c









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE