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

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

Merge branch 'akpm' (incoming fixes from Andrew) 

Merge misc fixes from Andrew Morton:
 "The audit fixes have been floating around for a while - Al and Eric
  aren't responding to either myself or Kees so I asked Kees to
  re-review them and here they are."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (22 commits)
  lib/rbtree.c: avoid the use of non-static __always_inline
  MAINTAINERS: Omar had moved
  mm: compaction: partially revert capture of suitable high-order page
  linux/audit.h: move ptrace.h include to kernel header
  kernel/audit.c: avoid negative sleep durations
  audit: catch possible NULL audit buffers
  audit: create explicit AUDIT_SECCOMP event type
  MAINTAINERS: fix a status pattern
  MAINTAINERS: fix arch/arm/plat-omap/include/plat/omap_hwmod.h
  mm: thp: acquire the anon_vma rwsem for write during split
  mm: mmap: annotate vm_lock_anon_vma locking properly for lockdep
  lockdep, rwsem: provide down_write_nest_lock()
  arch/mn10300/Kconfig: select CONFIG_GENERIC_ATOMIC64
  mm: bootmem: fix free_all_bootmem_core() with odd bitmap alignment
  mm: use aligned zone start for pfn_to_bitidx calculation
  fs/exec.c: work around icc miscompilation
  mm: compaction: fix echo 1 > compact_memory return error issue
  mm: memblock: fix wrong memmove size in memblock_merge_regions()
  drivers/video/ssd1307fb.c: fix bit order bug in the byte translation function
  mm: migrate: check page_count of THP before migrating
  ...
parents 93ccb391 3cb7a563

MAINTAINERS

+3 −4
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ F: arch/arm/ 


ARM SUB-ARCHITECTURES

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	MAINTAINED

S:	Maintained

F:	arch/arm/mach-*/

F:	arch/arm/plat-*/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
@@ -5507,8 +5507,7 @@ M: Benoît Cousson <b-cousson@ti.com> 
M:	Paul Walmsley <paul@pwsan.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod.c

F:	arch/arm/plat-omap/include/plat/omap_hwmod.h

F:	arch/arm/mach-omap2/omap_hwmod.*



OMAP HWMOD DATA FOR OMAP4-BASED DEVICES

M:	Benoît Cousson <b-cousson@ti.com>
@@ -7334,7 +7333,7 @@ S: Odd Fixes 
F:	drivers/staging/speakup/



STAGING - TI DSP BRIDGE DRIVERS

M:	Omar Ramirez Luna <omar.ramirez@ti.com>

M:	Omar Ramirez Luna <omar.ramirez@copitl.com>

S:	Odd Fixes

F:	drivers/staging/tidspbridge/

arch/mn10300/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config MN10300 
	select ARCH_WANT_IPC_PARSE_VERSION

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_KGDB

	select GENERIC_ATOMIC64

	select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER

	select GENERIC_CLOCKEVENTS

	select MODULES_USE_ELF_RELA

drivers/rtc/rtc-da9055.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static const struct rtc_class_ops da9055_rtc_ops = { 
	.alarm_irq_enable = da9055_rtc_alarm_irq_enable,

};



static int __init da9055_rtc_device_init(struct da9055 *da9055,

static int da9055_rtc_device_init(struct da9055 *da9055,

					struct da9055_pdata *pdata)

{

	int ret;

drivers/video/ssd1307fb.c

+2 −2
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ static void ssd1307fb_update_display(struct ssd1307fb_par *par) 
				u32 page_length = SSD1307FB_WIDTH * i;

				u32 index = page_length + (SSD1307FB_WIDTH * k + j) / 8;

				u8 byte = *(vmem + index);

				u8 bit = byte & (1 << (7 - (j % 8)));

				bit = bit >> (7 - (j % 8));

				u8 bit = byte & (1 << (j % 8));

				bit = bit >> (j % 8);

				buf |= bit << k;

			}

			ssd1307fb_write_data(par->client, buf);

fs/exec.c

+2 −1
Original line number Diff line number Diff line
@@ -434,8 +434,9 @@ static int count(struct user_arg_ptr argv, int max) 
			if (IS_ERR(p))

				return -EFAULT;



			if (i++ >= max)

			if (i >= max)

				return -E2BIG;

			++i;



			if (fatal_signal_pending(current))

				return -ERESTARTNOHAND;