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

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

Merge branch 'akpm' (patches from Andrew Morton) 

Merge misc fixes from Andrew Morton.

* emailed patches from Andrew Morton akpm@linux-foundation.org>:
  MAINTAINERS: change mailing list address for Altera UART drivers
  Makefile: fix build with make 3.80 again
  MAINTAINERS: update L: misuses
  Makefile: fix extra parenthesis typo when CC_STACKPROTECTOR_REGULAR is enabled
  ipc,mqueue: remove limits for the amount of system-wide queues
  memcg: change oom_info_lock to mutex
  mm, thp: fix infinite loop on memcg OOM
  drivers/fmc/fmc-write-eeprom.c: fix decimal permissions
  drivers/iommu/omap-iommu-debug.c: fix decimal permissions
  mm, hwpoison: release page on PageHWPoison() in __do_fault()
parents 6dba6ecb 61bd0943

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ F: arch/alpha/ 
ALTERA UART/JTAG UART SERIAL DRIVERS

M:	Tobias Klauser <tklauser@distanz.ch>

L:	linux-serial@vger.kernel.org

L:	nios2-dev@sopc.et.ntust.edu.tw (moderated for non-subscribers)

L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/tty/serial/altera_uart.c

F:	drivers/tty/serial/altera_jtaguart.c
@@ -2611,9 +2611,9 @@ DC395x SCSI driver 
M:	Oliver Neukum <oliver@neukum.org>

M:	Ali Akcaagac <aliakc@web.de>

M:	Jamie Lenehan <lenehan@twibble.org>

W:	http://twibble.org/dist/dc395x/

L:	dc395x@twibble.org

L:	http://lists.twibble.org/mailman/listinfo/dc395x/

W:	http://twibble.org/dist/dc395x/

W:	http://lists.twibble.org/mailman/listinfo/dc395x/

S:	Maintained

F:	Documentation/scsi/dc395x.txt

F:	drivers/scsi/dc395x.*
@@ -8443,8 +8443,8 @@ TARGET SUBSYSTEM 
M:	Nicholas A. Bellinger <nab@linux-iscsi.org>

L:	linux-scsi@vger.kernel.org

L:	target-devel@vger.kernel.org

L:	http://groups.google.com/group/linux-iscsi-target-dev

W:	http://www.linux-iscsi.org

W:	http://groups.google.com/group/linux-iscsi-target-dev

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master

S:	Supported

F:	drivers/target/

Makefile

+5 −3
Original line number Diff line number Diff line
@@ -605,10 +605,11 @@ endif 
ifdef CONFIG_CC_STACKPROTECTOR_REGULAR

  stackp-flag := -fstack-protector

  ifeq ($(call cc-option, $(stackp-flag)),)

    $(warning Cannot use CONFIG_CC_STACKPROTECTOR: \

	      -fstack-protector not supported by compiler))

    $(warning Cannot use CONFIG_CC_STACKPROTECTOR_REGULAR: \

             -fstack-protector not supported by compiler)

  endif

else ifdef CONFIG_CC_STACKPROTECTOR_STRONG

else

ifdef CONFIG_CC_STACKPROTECTOR_STRONG

  stackp-flag := -fstack-protector-strong

  ifeq ($(call cc-option, $(stackp-flag)),)

    $(warning Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: \
@@ -618,6 +619,7 @@ else 
  # Force off for distro compilers that enable stack protector by default.

  stackp-flag := $(call cc-option, -fno-stack-protector)

endif

endif

KBUILD_CFLAGS += $(stackp-flag)



# This warning generated too much noise in a regular build.

drivers/fmc/fmc-write-eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ FMC_PARAM_BUSID(fwe_drv); 
/* The "file=" is like the generic "gateware=" used elsewhere */

static char *fwe_file[FMC_MAX_CARDS];

static int fwe_file_n;

module_param_array_named(file, fwe_file, charp, &fwe_file_n, 444);

module_param_array_named(file, fwe_file, charp, &fwe_file_n, 0444);



static int fwe_run_tlv(struct fmc_device *fmc, const struct firmware *fw,

	int write)

drivers/iommu/omap-iommu-debug.c

+2 −2
Original line number Diff line number Diff line
@@ -354,8 +354,8 @@ DEBUG_FOPS(mem); 
			return -ENOMEM;					\

	}



#define DEBUG_ADD_FILE(name) __DEBUG_ADD_FILE(name, 600)

#define DEBUG_ADD_FILE_RO(name) __DEBUG_ADD_FILE(name, 400)

#define DEBUG_ADD_FILE(name) __DEBUG_ADD_FILE(name, 0600)

#define DEBUG_ADD_FILE_RO(name) __DEBUG_ADD_FILE(name, 0400)



static int iommu_debug_register(struct device *dev, void *data)

{

include/linux/ipc_namespace.h

+0 −2
Original line number Diff line number Diff line
@@ -118,9 +118,7 @@ extern int mq_init_ns(struct ipc_namespace *ns); 
 *     the new maximum will handle anyone else.  I may have to revisit this

 *     in the future.

 */

#define MIN_QUEUESMAX			1

#define DFLT_QUEUESMAX		      256

#define HARD_QUEUESMAX		     1024

#define MIN_MSGMAX			1

#define DFLT_MSG		       10U

#define DFLT_MSGMAX		       10