Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
* arch/arm64/include/asm/assembler.h
    Pick changes from AOSP Change-Id: I450594dc311b09b6b832b707a9abb357608cc6e4
    ("UPSTREAM: arm64: include alternative handling in dcache_by_line_op").

* drivers/android/binder.c
    Pick changes from LTS commit 14f09e8e7cd8 ("ANDROID: binder: Add strong ref checks"),
    instead of AOSP Change-Id: I66c15b066808f28bd27bfe50fd0e03ff45a09fca
    ("ANDROID: binder: Add strong ref checks").

* drivers/usb/gadget/function/u_ether.c
    Refactor throttling of highspeed IRQ logic in AOSP by adding
    a check for last queue request as intended by LTS commit
    660c04e8f174 ("usb: gadget: function: u_ether: don't starve tx request queue").
    Fixes AOSP Change-Id: I26515bfd9bbc8f7af38be7835692143f7093118a
    ("USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode").

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/cpufeature.h
Simple merge

diff --cc arch/arm64/include/asm/memory.h
Simple merge

diff --cc arch/arm64/kernel/asm-offsets.c
Simple merge

diff --cc arch/arm64/kernel/cpufeature.c
Simple merge

diff --cc arch/arm64/kernel/head.S
Simple merge

diff --cc arch/arm64/kernel/setup.c
Simple merge

diff --cc arch/arm64/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/arm64/mm/proc.S
Simple merge

diff --cc arch/x86/include/asm/uaccess.h
Simple merge

diff --cc drivers/android/binder.c
Simple merge

diff --cc drivers/usb/gadget/function/u_ether.c
index 74e9f5b5a45dd64d3cd4c3934d06a1637f1af6ef,b644248f4b8e31532e73b93bce50e7d14af01b58..e4920e5e1d647ff92c5118545309f1eb99396c36
--- 1/drivers/usb/gadget/function/u_ether.c
--- 2/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@@ -741,19 -594,13 +741,20 @@@ static netdev_tx_t eth_start_xmit(struc
  
        req->length = length;
  
 -      /* throttle high/super speed IRQ rate back slightly */
 -      if (gadget_is_dualspeed(dev->gadget))
 -              req->no_interrupt = (((dev->gadget->speed == USB_SPEED_HIGH ||
 -                                     dev->gadget->speed == USB_SPEED_SUPER)) &&
 -                                      !list_empty(&dev->tx_reqs))
 -                      ? ((atomic_read(&dev->tx_qlen) % dev->qmult) != 0)
 -                      : 0;
 +      /* throttle highspeed IRQ rate back slightly */
 +      if (gadget_is_dualspeed(dev->gadget) &&
-                        (dev->gadget->speed == USB_SPEED_HIGH)) {
++                       (dev->gadget->speed == USB_SPEED_HIGH) &&
++                       !list_empty(&dev->tx_reqs)) {
 +              dev->tx_qlen++;
 +              if (dev->tx_qlen == (dev->qmult/2)) {
 +                      req->no_interrupt = 0;
 +                      dev->tx_qlen = 0;
 +              } else {
 +                      req->no_interrupt = 1;
 +              }
 +      } else {
 +              req->no_interrupt = 0;
 +      }
  
        retval = usb_ep_queue(in, req, GFP_ATOMIC);
        switch (retval) {

diff --cc include/net/ip.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc include/uapi/linux/rtnetlink.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/ipv4/af_inet.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/sysctl_net_ipv4.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge