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

Commit 19788a90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge more patches from Andrew Morton:
 "A bunch of fixes.

  Plus Joe's printk move and rework.  It's not a -rc3 thing but now
  would be a nice time to offload it, while things are quiet.  I've been
  sitting on it all for a couple of weeks, no issues"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  vmpressure: make sure there are no events queued after memcg is offlined
  vmpressure: do not check for pending work to prevent from new work
  vmpressure: change vmpressure::sr_lock to spinlock
  printk: rename struct log to struct printk_log
  printk: use pointer for console_cmdline indexing
  printk: move braille console support into separate braille.[ch] files
  printk: add console_cmdline.h
  printk: move to separate directory for easier modification
  drivers/rtc/rtc-twl.c: fix: rtcX/wakealarm attribute isn't created
  mm: zbud: fix condition check on allocation size
  thp, mm: avoid PageUnevictable on active/inactive lru lists
  mm/swap.c: clear PageActive before adding pages onto unevictable list
  arch/x86/platform/ce4100/ce4100.c: include reboot.h
  mm: sched: numa: fix NUMA balancing when !SCHED_DEBUG
  rapidio: fix use after free in rio_unregister_scan()
  .gitignore: ignore *.lz4 files
  MAINTAINERS: dynamic debug: Jason's not there...
  dmi_scan: add comments on dmi_present() and the loop in dmi_scan_machine()
  ocfs2/refcounttree: add the missing NULL check of the return value of find_or_create_page()
  mm: mempolicy: fix mbind_range() && vma_adjust() interaction
parents 06693f30 33cb876e

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ modules.builtin 
*.bz2

*.lzma

*.xz

*.lz4

*.lzo

*.patch

*.gcno

Documentation/DocBook/device-drivers.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ X!Iinclude/linux/kobject.h 


     <sect1><title>Kernel utility functions</title>

!Iinclude/linux/kernel.h

!Ekernel/printk.c

!Ekernel/printk/printk.c

!Ekernel/panic.c

!Ekernel/sys.c

!Ekernel/rcupdate.c

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2871,7 +2871,7 @@ F: drivers/media/usb/dvb-usb-v2/dvb_usb* 
F:	drivers/media/usb/dvb-usb-v2/usb_urb.c



DYNAMIC DEBUG

M:	Jason Baron <jbaron@redhat.com>

M:	Jason Baron <jbaron@akamai.com>

S:	Maintained

F:	lib/dynamic_debug.c

F:	include/linux/dynamic_debug.h

arch/x86/platform/ce4100/ce4100.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/kernel.h>

#include <linux/irq.h>

#include <linux/module.h>

#include <linux/reboot.h>

#include <linux/serial_reg.h>

#include <linux/serial_8250.h>

#include <linux/reboot.h>

drivers/accessibility/braille/braille_console.c

+7 −2
Original line number Diff line number Diff line
@@ -359,6 +359,9 @@ int braille_register_console(struct console *console, int index, 
		char *console_options, char *braille_options)

{

	int ret;



	if (!(console->flags & CON_BRL))

		return 0;

	if (!console_options)

		/* Only support VisioBraille for now */

		console_options = "57600o8";
@@ -374,15 +377,17 @@ int braille_register_console(struct console *console, int index, 
	braille_co = console;

	register_keyboard_notifier(&keyboard_notifier_block);

	register_vt_notifier(&vt_notifier_block);

	return 0;

	return 1;

}



int braille_unregister_console(struct console *console)

{

	if (braille_co != console)

		return -EINVAL;

	if (!(console->flags & CON_BRL))

		return 0;

	unregister_keyboard_notifier(&keyboard_notifier_block);

	unregister_vt_notifier(&vt_notifier_block);

	braille_co = NULL;

	return 0;

	return 1;

}