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

Commit a9c55d8c authored by Ian Maund's avatar Ian Maund
Browse files

Merge google-common commits into msm-3.10 

* (57 commits)
  power: Add property CHARGE_COUNTER_EXT and 64-bit precision properties
  prctl: adds the capable(CAP_SYS_NICE) check to PR_SET_TIMERSLACK_PID.
  netfilter: fix seq_printf type mismatch warning
  arm64: Fix correct dtb clean-files location
  futex: Make lookup_pi_state more robust
  futex: Always cleanup owner tid in unlock_pi
  futex: Validate atomic acquisition in futex_lock_pi_atomic()
  futex-prevent-requeue-pi-on-same-futex.patch futex: Forbid uaddr == uaddr2 in futex_requeue(..., requeue_pi=1)
  android: base-cfg: disable LOGGER
  net: support marking accepting TCP sockets
  net: Use fwmark reflection in PMTU discovery.
  net: add a sysctl to reflect the fwmark on replies
  net: ipv6: autoconf routes into per-device tables
  net: ipv6: ping: Use socket mark in routing lookup
  input: Changed keyreset to act as a wrapper for keycombo.
  input: add keycombo, a general key combo driver.
  fiq_debugger: Add fiq_watchdog_triggered api
  pstore/ram: Add ramoops_console_write_buf api
  fiq_debugger: Call fiq_debugger_printf through a function pointer from cpu specific code
  video: adf: fbdev: add stubs for kernels without ADF_FBDEV
  ...

Git-Repo: https://android.googlesource.com/kernel/common.git


Change-Id: I50af0376aeb20f06a0e75e040c91ebafe77be925
Signed-off-by: default avatarIan Maund <imaund@codeaurora.org>
parents a2b0f946 1e324f88

Documentation/networking/ip-sysctl.txt

+28 −0
Original line number Diff line number Diff line
@@ -22,6 +22,15 @@ ip_no_pmtu_disc - BOOLEAN 
min_pmtu - INTEGER

	default 552 - minimum discovered Path MTU



fwmark_reflect - BOOLEAN

	Controls the fwmark of kernel-generated IPv4 reply packets that are not

	associated with a socket for example, TCP RSTs or ICMP echo replies).

	If unset, these packets have a fwmark of zero. If set, they have the

	fwmark of the packet they are replying to. Similarly affects the fwmark

	used by internal routing lookups triggered by incoming packets, such as

	the ones used for Path MTU Discovery.

	Default: 0



route/max_size - INTEGER

	Maximum number of routes allowed in the kernel.  Increase

	this when using large numbers of interfaces and/or routes.
@@ -468,6 +477,16 @@ tcp_fastopen - INTEGER 


	See include/net/tcp.h and the code for more details.



tcp_fwmark_accept - BOOLEAN

	If set, incoming connections to listening sockets that do not have a

	socket mark will set the mark of the accepting socket to the fwmark of

	the incoming SYN packet. This will cause all packets on that connection

	(starting from the first SYNACK) to be sent with that fwmark. The

	listening socket's mark is unchanged. Listening sockets that already

	have a fwmark set via setsockopt(SOL_SOCKET, SO_MARK, ...) are

	unaffected.

	Default: 0



tcp_syn_retries - INTEGER

	Number of times initial SYNs for an active TCP connection attempt

	will be retransmitted. Should not be higher than 255. Default value
@@ -1099,6 +1118,15 @@ proxy_ndp - INTEGER 
		2 NDP packets are sent to userspace, where a userspace proxy

                  can be implemented



fwmark_reflect - BOOLEAN

	Controls the fwmark of kernel-generated IPv6 reply packets that are not

	associated with a socket for example, TCP RSTs or ICMPv6 echo replies).

	If unset, these packets have a fwmark of zero. If set, they have the

	fwmark of the packet they are replying to. Similarly affects the fwmark

	used by internal routing lookups triggered by incoming packets, such as

	the ones used for Path MTU Discovery.

	Default: 0



conf/interface/*:

	Change special settings per interface.

android/configs/android-base.cfg

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ANDROID_INTF_ALARM_DEV=y

CONFIG_ANDROID_LOGGER=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ASHMEM=y

CONFIG_BLK_DEV_DM=y
@@ -16,6 +15,7 @@ CONFIG_CGROUP_DEBUG=y 
CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_SCHED=y

CONFIG_DM_CRYPT=y

CONFIG_DM_VERITY=y

CONFIG_EMBEDDED=y

CONFIG_FB=y

CONFIG_HIGH_RES_TIMERS=y
@@ -34,8 +34,8 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

CONFIG_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_NF_ARPFILTER=y

android/configs/android-recommended.cfg

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 
CONFIG_COMPACTION=y

CONFIG_DM_UEVENT=y

CONFIG_DRAGONRISE_FF=y

CONFIG_ENABLE_DEFAULT_TRACERS=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_FUSE_FS=y

arch/arm/common/Kconfig

+0 −46
Original line number Diff line number Diff line
@@ -21,49 +21,3 @@ config SHARP_SCOOP 
config FIQ_GLUE

	bool

	select FIQ
 


config FIQ_DEBUGGER

	bool "FIQ Mode Serial Debugger"

	select FIQ

	select FIQ_GLUE

	default n

	help

	  The FIQ serial debugger can accept commands even when the

	  kernel is unresponsive due to being stuck with interrupts

	  disabled.





config FIQ_DEBUGGER_NO_SLEEP

	bool "Keep serial debugger active"

	depends on FIQ_DEBUGGER

	default n

	help

	  Enables the serial debugger at boot. Passing

	  fiq_debugger.no_sleep on the kernel commandline will

	  override this config option.



config FIQ_DEBUGGER_WAKEUP_IRQ_ALWAYS_ON

	bool "Don't disable wakeup IRQ when debugger is active"

	depends on FIQ_DEBUGGER

	default n

	help

	  Don't disable the wakeup irq when enabling the uart clock.  This will

	  cause extra interrupts, but it makes the serial debugger usable with

	  on some MSM radio builds that ignore the uart clock request in power

	  collapse.



config FIQ_DEBUGGER_CONSOLE

	bool "Console on FIQ Serial Debugger port"

	depends on FIQ_DEBUGGER

	default n

	help

	  Enables a console so that printk messages are displayed on

	  the debugger serial port as the occur.



config FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE

	bool "Put the FIQ debugger into console mode by default"

	depends on FIQ_DEBUGGER_CONSOLE

	default n

	help

	  If enabled, this puts the fiq debugger into console mode by default.

	  Otherwise, the fiq debugger will start out in debug mode.

arch/arm/common/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


obj-y				+= firmware.o



obj-$(CONFIG_FIQ_DEBUGGER)	+= fiq_debugger.o

obj-$(CONFIG_FIQ_GLUE)		+= fiq_glue.o fiq_glue_setup.o

obj-$(CONFIG_ICST)		+= icst.o

obj-$(CONFIG_SA1111)		+= sa1111.o