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

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

Merge branch 'akpm' (sundry from Andrew) 

Merge misc fixes from Andrew Morton:
 "One maintainer change and three bugfixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (4 commits)
  c/r: prctl: fix build error for no-MMU case
  lib/flex_proportions.c: fix corruption of denominator in flexible proportions
  checksyscalls: fix "here document" handling
  pwm-backlight: take over maintenance
parents 56d27adc be8cfc4a

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -5544,6 +5544,8 @@ F: Documentation/devicetree/bindings/pwm/ 
F:	include/linux/pwm.h

F:	include/linux/of_pwm.h

F:	drivers/pwm/

F:	drivers/video/backlight/pwm_bl.c

F:	include/linux/pwm_backlight.h



PXA2xx/PXA3xx SUPPORT

M:	Eric Miao <eric.y.miao@gmail.com>

include/linux/security.h

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ void reset_security_ops(void); 
extern unsigned long mmap_min_addr;

extern unsigned long dac_mmap_min_addr;

#else

#define mmap_min_addr		0UL

#define dac_mmap_min_addr	0UL

#endif

lib/flex_proportions.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ void fprop_global_destroy(struct fprop_global *p) 
 */

bool fprop_new_period(struct fprop_global *p, int periods)

{

	u64 events;

	s64 events;

	unsigned long flags;



	local_irq_save(flags);

scripts/checksyscalls.sh

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ EOF 
syscall_list() {

    grep '^[0-9]' "$1" | sort -n | (

	while read nr abi name entry ; do

	    echo <<EOF

	    cat <<EOF

#if !defined(__NR_${name}) && !defined(__IGNORE_${name})

#warning syscall ${name} not implemented

#endif