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

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

Merge branch 'akpm' (fixes from Andrew) 

Merge emailed fixes from Andrew Morton:
 "Bunch of fixes:

   - delayed IPC updates.  I held back on this because of some possible
     outstanding bug reports, but they appear to have been addressed in
     later versions

   - A bunch of MAINTAINERS updates

   - Yet Another RTC driver.  I'd held this back while a couple of
     little issues were being worked out.

  I'm expecting an intrusive-but-simple patchset from Joe Perches which
  splits up printk.c into kernel/printk/*.  That will be a pig to
  maintain for two months so if it passes testing I'd like to get it
  upstream after a week or so."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (35 commits)
  printk: fix incorrect length from print_time() when seconds > 99999
  drivers/rtc/rtc-vt8500.c: fix handling of data passed in struct rtc_time
  drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield
  rtc: add RTC driver for TPS6586x
  MAINTAINERS: fix drivers/staging/sm7xx/
  MAINTAINERS: remove include/linux/of_pwm.h
  MAINTAINERS: remove arch/*/lib/perf_event*.c
  MAINTAINERS: remove drivers/mmc/host/imxmmc.*
  MAINTAINERS: fix Documentation/mei/
  MAINTAINERS: remove arch/x86/platform/mrst/pmu.*
  MAINTAINERS: remove firmware/isci/
  MAINTAINERS: fix drivers/ieee802154/
  MAINTAINERS: fix .../plat-mxc/include/mach/imxfb.h
  MAINTAINERS: remove drivers/video/epson1355fb.c
  MAINTAINERS: fix drivers/media/usb/dvb-usb/cxusb*
  MAINTAINERS: adjust for UAPI
  MAINTAINERS: fix drivers/media/platform/atmel-isi.c
  MAINTAINERS: fix arch/arm/mach-at91/include/mach/at_hdmac.h
  MAINTAINERS: fix drivers/rtc/rtc-vt8500.c
  MAINTAINERS: remove arch/arm/plat-s5p/
  ...
parents de9ac5ce 35dac27c

Documentation/sysctl/kernel.txt

+32 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ show up in /proc/sys/kernel: 
- l2cr                        [ PPC only ]

- modprobe                    ==> Documentation/debugging-modules.txt

- modules_disabled

- msg_next_id		      [ sysv ipc ]

- msgmax

- msgmnb

- msgmni
@@ -62,7 +63,9 @@ show up in /proc/sys/kernel: 
- rtsig-max

- rtsig-nr

- sem

- sem_next_id		      [ sysv ipc ]

- sg-big-buff                 [ generic SCSI device (sg) ]

- shm_next_id		      [ sysv ipc ]

- shm_rmid_forced

- shmall

- shmmax                      [ sysv ipc ]
@@ -320,6 +323,22 @@ to false. 


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



msg_next_id, sem_next_id, and shm_next_id:



These three toggles allows to specify desired id for next allocated IPC

object: message, semaphore or shared memory respectively.



By default they are equal to -1, which means generic allocation logic.

Possible values to set are in range {0..INT_MAX}.



Notes:

1) kernel doesn't guarantee, that new object will have desired id. So,

it's up to userspace, how to handle an object with "wrong" id.

2) Toggle with non-default value will be set back to -1 by kernel after

successful IPC object allocation.



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



nmi_watchdog:



Enables/Disables the NMI watchdog on x86 systems. When the value is
@@ -542,6 +561,19 @@ are doing anyway :) 


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



shmall:



This parameter sets the total amount of shared memory pages that

can be used system wide. Hence, SHMALL should always be at least

ceil(shmmax/PAGE_SIZE).



If you are not sure what the default PAGE_SIZE is on your Linux

system, you can run the following command:



# getconf PAGE_SIZE



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



shmmax:



This value can be used to query and set the run time limit

MAINTAINERS

+124 −75

File changed.

Preview size limit exceeded, changes collapsed.

drivers/rtc/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -352,6 +352,14 @@ config RTC_DRV_TWL4030 
	  This driver can also be built as a module. If so, the module

	  will be called rtc-twl.



config RTC_DRV_TPS6586X

	tristate "TI TPS6586X RTC driver"

	depends on MFD_TPS6586X

	help

	  TI Power Managment IC TPS6586X supports RTC functionality

	  along with alarm. This driver supports the RTC driver for

	  the TPS6586X RTC module.



config RTC_DRV_TPS65910

	tristate "TI TPS65910 RTC driver"

	depends on RTC_CLASS && MFD_TPS65910

drivers/rtc/Makefile

+1 −0

File changed.

Preview size limit exceeded, changes collapsed.

drivers/rtc/rtc-tegra.c

+7 −0

File changed.

Preview size limit exceeded, changes collapsed.