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

Commit 9841ef2e authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.4.99 (7eab308a) into msm-4.4 



* refs/heads/tmp-7eab308a
  Linux 4.4.99
  misc: panel: properly restore atomic counter on error path
  target: Fix node_acl demo-mode + uncached dynamic shutdown regression
  target/iscsi: Fix iSCSI task reassignment handling
  brcmfmac: remove setting IBSS mode when stopping AP
  tipc: fix link attribute propagation bug
  security/keys: add CONFIG_KEYS_COMPAT to Kconfig
  tcp/dccp: fix other lockdep splats accessing ireq_opt
  tcp/dccp: fix lockdep splat in inet_csk_route_req()
  tcp/dccp: fix ireq->opt races
  ipip: only increase err_count for some certain type icmp in ipip_err
  ppp: fix race in ppp device destruction
  sctp: reset owner sk for data chunks on out queues when migrating a sock
  tun: allow positive return values on dev_get_valid_name() call
  ip6_gre: only increase err_count for some certain type icmpv6 in ip6gre_err
  net/unix: don't show information about sockets from other namespaces
  ipv6: flowlabel: do not leave opt->tot_len with garbage
  packet: avoid panic in packet_getsockopt()
  sctp: add the missing sock_owned_by_user check in sctp_icmp_redirect
  tun: call dev_get_valid_name() before register_netdevice()
  l2tp: check ps->sock before running pppol2tp_session_ioctl()
  tcp: fix tcp_mtu_probe() vs highest_sack
  tun/tap: sanitize TUNSETSNDBUF input
  ALSA: seq: Cancel pending autoload work at unbinding device
  Input: ims-psu - check if CDC union descriptor is sane
  usb: usbtest: fix NULL pointer dereference
  mac80211: don't compare TKIP TX MIC key in reinstall prevention
  mac80211: use constant time comparison with keys
  mac80211: accept key reinstall without changing anything
  FROMLIST: binder: fix proc->files use-after-free

Change-Id: I9aaf4f803a5da1fc983879a214b2fddda7879f41
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents 202fde33 7eab308a

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 98

SUBLEVEL = 99

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/powerpc/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -1083,11 +1083,6 @@ source "arch/powerpc/Kconfig.debug" 


source "security/Kconfig"



config KEYS_COMPAT

	bool

	depends on COMPAT && KEYS

	default y



source "crypto/Kconfig"



config PPC_LIB_RHEAP

arch/s390/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -347,9 +347,6 @@ config COMPAT 
config SYSVIPC_COMPAT

	def_bool y if COMPAT && SYSVIPC



config KEYS_COMPAT

	def_bool y if COMPAT && KEYS



config SMP

	def_bool y

	prompt "Symmetric multi-processing support"

arch/sparc/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -550,9 +550,6 @@ config SYSVIPC_COMPAT 
	depends on COMPAT && SYSVIPC

	default y



config KEYS_COMPAT

	def_bool y if COMPAT && KEYS



endmenu



source "net/Kconfig"

arch/x86/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -2657,10 +2657,6 @@ config COMPAT_FOR_U64_ALIGNMENT 
config SYSVIPC_COMPAT

	def_bool y

	depends on SYSVIPC



config KEYS_COMPAT

	def_bool y

	depends on KEYS

endif



endmenu