Merge branch 'master' of ../netdev/ (52b9aca7) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/power/runtime_pm.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -431,8 +431,7 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h:

		void pm_runtime_irq_safe(struct device *dev);
		- set the power.irq_safe flag for the device, causing the runtime-PM
		suspend and resume callbacks (but not the idle callback) to be invoked
		with interrupts disabled
		callbacks to be invoked with interrupts off

		void pm_runtime_mark_last_busy(struct device *dev);
		- set the power.last_busy field to the current time

MAINTAINERS

+8 −9

Original line number	Diff line number	Diff line
		@@ -1278,7 +1278,6 @@ F: drivers/input/misc/ati_remote2.c
		ATLX ETHERNET DRIVERS
		M: Jay Cliburn <jcliburn@gmail.com>
		M: Chris Snook <chris.snook@gmail.com>
		M: Jie Yang <jie.yang@atheros.com>
		L: netdev@vger.kernel.org
		W: http://sourceforge.net/projects/atl1
		W: http://atl1.sourceforge.net
		@@ -1574,7 +1573,6 @@ F: drivers/scsi/bfa/

		BROCADE BNA 10 GIGABIT ETHERNET DRIVER
		M: Rasesh Mody <rmody@brocade.com>
		M: Debashis Dutt <ddutt@brocade.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/bna/
		@@ -1758,7 +1756,6 @@ F: Documentation/zh_CN/

		CISCO VIC ETHERNET NIC DRIVER
		M: Christian Benvenuti <benve@cisco.com>
		M: Vasanthy Kolluri <vkolluri@cisco.com>
		M: Roopa Prabhu <roprabhu@cisco.com>
		M: David Wang <dwang2@cisco.com>
		S: Supported
		@@ -1883,7 +1880,7 @@ S: Maintained
		F: drivers/connector/

		CONTROL GROUPS (CGROUPS)
		M: Paul Menage <menage@google.com>
		M: Paul Menage <paul@paulmenage.org>
		M: Li Zefan <lizf@cn.fujitsu.com>
		L: containers@lists.linux-foundation.org
		S: Maintained
		@@ -1932,7 +1929,7 @@ S: Maintained
		F: tools/power/cpupower

		CPUSETS
		M: Paul Menage <menage@google.com>
		M: Paul Menage <paul@paulmenage.org>
		W: http://www.bullopensource.org/cpuset/
		W: http://oss.sgi.com/projects/cpusets/
		S: Supported
		@@ -2649,11 +2646,11 @@ F: drivers/net/wan/dlci.c
		F: drivers/net/wan/sdla.c

		FRAMEBUFFER LAYER
		M: Paul Mundt <lethal@linux-sh.org>
		M: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
		L: linux-fbdev@vger.kernel.org
		W: http://linux-fbdev.sourceforge.net/
		Q: http://patchwork.kernel.org/project/linux-fbdev/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
		T: git git://github.com/schandinat/linux-2.6.git fbdev-next
		S: Maintained
		F: Documentation/fb/
		F: Documentation/devicetree/bindings/fb/
		@@ -4404,7 +4401,8 @@ L: netfilter@vger.kernel.org
		L: coreteam@netfilter.org
		W: http://www.netfilter.org/
		W: http://www.iptables.org/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git
		S: Supported
		F: include/linux/netfilter*
		F: include/linux/netfilter/
		@@ -5532,6 +5530,7 @@ F: include/media/7146

		SAMSUNG AUDIO (ASoC) DRIVERS
		M: Jassi Brar <jassisinghbrar@gmail.com>
		M: Sangbeom Kim <sbkim73@samsung.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Supported
		F: sound/soc/samsung
		@@ -7087,7 +7086,7 @@ S: Supported
		F: drivers/mmc/host/vub300.c

		W1 DALLAS'S 1-WIRE BUS
		M: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
		M: Evgeniy Polyakov <zbr@ioremap.net>
		S: Maintained
		F: Documentation/w1/
		F: drivers/w1/

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 1
		SUBLEVEL = 0
		EXTRAVERSION = -rc3
		EXTRAVERSION = -rc4
		NAME = "Divemaster Edition"

		# DOCUMENTATION

arch/alpha/include/asm/sysinfo.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -27,13 +27,4 @@
		#define UAC_NOFIX 2
		#define UAC_SIGBUS 4


		#ifdef __KERNEL__

		/* This is the shift that is applied to the UAC bits as stored in the
		per-thread flags. See thread_info.h. */
		#define UAC_SHIFT 6

		#endif

		#endif /* __ASM_ALPHA_SYSINFO_H */

arch/alpha/include/asm/thread_info.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -74,9 +74,9 @@ register struct thread_info *__current_thread_info __asm__("$8");
		#define TIF_NEED_RESCHED 3 /* rescheduling necessary */
		#define TIF_POLLING_NRFLAG 8 /* poll_idle is polling NEED_RESCHED */
		#define TIF_DIE_IF_KERNEL 9 /* dik recursion lock */
		#define TIF_UAC_NOPRINT 10 /* see sysinfo.h */
		#define TIF_UAC_NOFIX 11
		#define TIF_UAC_SIGBUS 12
		#define TIF_UAC_NOPRINT 10 /* ! Preserve sequence of following */
		#define TIF_UAC_NOFIX 11 /* ! flags as they match */
		#define TIF_UAC_SIGBUS 12 /* ! userspace part of 'osf_sysinfo' */
		#define TIF_MEMDIE 13 /* is terminating due to OOM killer */
		#define TIF_RESTORE_SIGMASK 14 /* restore signal mask in do_signal */
		#define TIF_FREEZE 16 /* is freezing for suspend */
		@@ -97,7 +97,7 @@ register struct thread_info *__current_thread_info __asm__("$8");
		#define _TIF_ALLWORK_MASK (_TIF_WORK_MASK \
		\| _TIF_SYSCALL_TRACE)

		#define ALPHA_UAC_SHIFT 10
		#define ALPHA_UAC_SHIFT TIF_UAC_NOPRINT
		#define ALPHA_UAC_MASK (1 << TIF_UAC_NOPRINT \| 1 << TIF_UAC_NOFIX \| \
		1 << TIF_UAC_SIGBUS)