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

Commit 45b583b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge 'akpm' patch series 

* Merge akpm patch series: (122 commits)
  drivers/connector/cn_proc.c: remove unused local
  Documentation/SubmitChecklist: add RCU debug config options
  reiserfs: use hweight_long()
  reiserfs: use proper little-endian bitops
  pnpacpi: register disabled resources
  drivers/rtc/rtc-tegra.c: properly initialize spinlock
  drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time()
  drivers/rtc: add support for Qualcomm PMIC8xxx RTC
  drivers/rtc/rtc-s3c.c: support clock gating
  drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200
  init: skip calibration delay if previously done
  misc/eeprom: add eeprom access driver for digsy_mtc board
  misc/eeprom: add driver for microwire 93xx46 EEPROMs
  checkpatch.pl: update $logFunctions
  checkpatch: make utf-8 test --strict
  checkpatch.pl: add ability to ignore various messages
  checkpatch: add a "prefer __aligned" check
  checkpatch: validate signature styles and To: and Cc: lines
  checkpatch: add __rcu as a sparse modifier
  checkpatch: suggest using min_t or max_t
  ...

Did this as a merge because of (trivial) conflicts in
 - Documentation/feature-removal-schedule.txt
 - arch/xtensa/include/asm/uaccess.h
that were just easier to fix up in the merge than in the patch series.
parents 154dd78d f19da2ce

Documentation/ABI/obsolete/proc-pid-oom_adj

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Why: /proc/<pid>/oom_adj allows userspace to influence the oom killer's 


	A much more powerful interface, /proc/<pid>/oom_score_adj, was

	introduced with the oom killer rewrite that allows users to increase or

	decrease the badness() score linearly.  This interface will replace

	decrease the badness score linearly.  This interface will replace

	/proc/<pid>/oom_adj.



	A warning will be emitted to the kernel log if an application uses this

Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480

0 → 100644
+21 −0
Original line number Diff line number Diff line 
What:		/sys/bus/i2c/devices/.../device

Date:		February 2011

Contact:	Minkyu Kang <mk7.kang@samsung.com>

Description:

		show what device is attached

		NONE - no device

		USB - USB device is attached

		UART - UART is attached

		CHARGER - Charger is attaced

		JIG - JIG is attached



What:		/sys/bus/i2c/devices/.../switch

Date:		February 2011

Contact:	Minkyu Kang <mk7.kang@samsung.com>

Description:

		show or set the state of manual switch

		VAUDIO - switch to VAUDIO path

		UART - switch to UART path

		AUDIO - switch to AUDIO path

		DHOST - switch to DHOST path

		AUTO - switch automatically by device

Documentation/SubmitChecklist

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ kernel patches. 


12: Has been tested with CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT,

    CONFIG_DEBUG_SLAB, CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES,

    CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_ATOMIC_SLEEP all simultaneously

    enabled.

    CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_ATOMIC_SLEEP, CONFIG_PROVE_RCU

    and CONFIG_DEBUG_OBJECTS_RCU_HEAD all simultaneously enabled.



13: Has been build- and runtime tested with and without CONFIG_SMP and

    CONFIG_PREEMPT.

Documentation/feature-removal-schedule.txt

+1 −17
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ Why: /proc/<pid>/oom_adj allows userspace to influence the oom killer's 


	A much more powerful interface, /proc/<pid>/oom_score_adj, was

	introduced with the oom killer rewrite that allows users to increase or

	decrease the badness() score linearly.  This interface will replace

	decrease the badness score linearly.  This interface will replace

	/proc/<pid>/oom_adj.



	A warning will be emitted to the kernel log if an application uses this
@@ -518,22 +518,6 @@ Files: net/netfilter/xt_connlimit.c 


----------------------------



What:	noswapaccount kernel command line parameter

When:	3.0

Why:	The original implementation of memsw feature enabled by

	CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount

	kernel parameter (introduced in 2.6.29-rc1). Later on, this decision

	turned out to be not ideal because we cannot have the feature compiled

	in and disabled by default and let only interested to enable it

	(e.g. general distribution kernels might need it). Therefore we have

	added swapaccount[=0|1] parameter (introduced in 2.6.37) which provides

	the both possibilities. If we remove noswapaccount we will have

	less command line parameters with the same functionality and we

	can also cleanup the parameter handling a bit ().

Who:	Michal Hocko <mhocko@suse.cz>



----------------------------



What:	ipt_addrtype match include file

When:	2012

Why:	superseded by xt_addrtype

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3012,7 +3012,7 @@ F: kernel/hrtimer.c 
F:	kernel/time/clockevents.c

F:	kernel/time/tick*.*

F:	kernel/time/timer_*.c

F:	include/linux/clockevents.h

F:	include/linux/clockchips.h

F:	include/linux/hrtimer.h



HIGH-SPEED SCC DRIVER FOR AX.25