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

Commit 392854fb authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.4.162 (3eb8e735) into msm-4.4 



* refs/heads/tmp-3eb8e735
  Linux 4.4.162
  HV: properly delay KVP packets when negotiation is in progress
  Drivers: hv: kvp: fix IP Failover
  Drivers: hv: util: Pass the channel information during the init call
  Drivers: hv: utils: Invoke the poll function after handshake
  usb: gadget: serial: fix oops when data rx'd after close
  ARC: build: Get rid of toolchain check
  powerpc/tm: Avoid possible userspace r1 corruption on reclaim
  powerpc/tm: Fix userspace r13 corruption
  net/mlx4: Use cpumask_available for eq->affinity_mask
  Input: atakbd - fix Atari CapsLock behaviour
  Input: atakbd - fix Atari keymap
  clocksource/drivers/ti-32k: Add CLOCK_SOURCE_SUSPEND_NONSTOP flag for non-am43 SoCs
  media: af9035: prevent buffer overflow on write
  x86/fpu: Finish excising 'eagerfpu'
  x86/fpu: Remove struct fpu::counter
  x86/fpu: Remove use_eager_fpu()
  KVM: x86: remove eager_fpu field of struct kvm_vcpu_arch
  rtnl: limit IFLA_NUM_TX_QUEUES and IFLA_NUM_RX_QUEUES to 4096
  net: systemport: Fix wake-up interrupt race during resume
  net: mvpp2: Extract the correct ethtype from the skb for tx csum offload
  team: Forbid enslaving team device to itself
  qlcnic: fix Tx descriptor corruption on 82xx devices
  net/usb: cancel pending work when unbinding smsc75xx
  netlabel: check for IPV4MASK in addrinfo_get
  net/ipv6: Display all addresses in output of /proc/net/if_inet6
  net: ipv4: update fnhe_pmtu when first hop's MTU changes
  ipv4: fix use-after-free in ip_cmsg_recv_dstaddr()
  ip_tunnel: be careful when accessing the inner header
  ip6_tunnel: be careful when accessing the inner header
  bonding: avoid possible dead-lock
  bnxt_en: Fix TX timeout during netpoll.
  jffs2: return -ERANGE when xattr buffer is too small
  xhci: Don't print a warning when setting link state for disabled ports
  i2c: i2c-scmi: fix for i2c_smbus_write_block_data
  perf script python: Fix export-to-postgresql.py occasional failure
  mach64: detect the dot clock divider correctly on sparc
  mm/vmstat.c: fix outdated vmstat_text
  ext4: add corruption check in ext4_xattr_set_entry()
  drm/amdgpu: Fix SDMA HQD destroy error on gfx_v7
  ARM: dts: at91: add new compatibility string for macb on sama5d3
  net: macb: disable scatter-gather for macb on sama5d3
  stmmac: fix valid numbers of unicast filter entries
  sound: enable interrupt after dma buffer initialization
  mfd: omap-usb-host: Fix dts probe of children
  selftests/efivarfs: add required kernel configs
  ASoC: sigmadsp: safeload should not have lower byte limit
  ASoC: wm8804: Add ACPI support
  ANDROID: usb: gadget: f_mtp: Return error if count is negative
  ANDROID: x86_64_cuttlefish_defconfig: disable CONFIG_MEMORY_STATE_TIME

Change-Id: Ie69fd3f90302d1ebe0c1217b46d8033fec4180a5
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents 02d722f1 3eb8e735

Documentation/devicetree/bindings/net/macb.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
  Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  the Cadence GEM, or the generic form: "cdns,gem".

  Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.

  Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.

  Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.

  Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.

  Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.

Documentation/kernel-parameters.txt

+0 −5
Original line number Diff line number Diff line
@@ -977,11 +977,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			See Documentation/x86/intel_mpx.txt for more

			information about the feature.



	eagerfpu=	[X86]

			on	enable eager fpu restore

			off	disable eager fpu restore

			auto	selects the default scheme, which automatically

				enables eagerfpu restore for xsaveopt.



	module.async_probe [KNL]

			Enable asynchronous probe on this module.

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 161

SUBLEVEL = 162

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arc/Makefile

+0 −14
Original line number Diff line number Diff line
@@ -18,20 +18,6 @@ cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__ 
cflags-$(CONFIG_ISA_ARCOMPACT)	+= -mA7

cflags-$(CONFIG_ISA_ARCV2)	+= -mcpu=archs



is_700 = $(shell $(CC) -dM -E - < /dev/null | grep -q "ARC700" && echo 1 || echo 0)



ifdef CONFIG_ISA_ARCOMPACT

ifeq ($(is_700), 0)

    $(error Toolchain not configured for ARCompact builds)

endif

endif



ifdef CONFIG_ISA_ARCV2

ifeq ($(is_700), 1)

    $(error Toolchain not configured for ARCv2 builds)

endif

endif



ifdef CONFIG_ARC_CURR_IN_REG

# For a global register defintion, make sure it gets passed to every file

# We had a customer reported bug where some code built in kernel was NOT using

arch/arm/boot/dts/sama5d3_emac.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
			};



			macb1: ethernet@f802c000 {

				compatible = "cdns,at91sam9260-macb", "cdns,macb";

				compatible = "atmel,sama5d3-macb", "cdns,at91sam9260-macb", "cdns,macb";

				reg = <0xf802c000 0x100>;

				interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;

				pinctrl-names = "default";