Merge tag 'v3.10.102' into update

This is the 3.10.102 stable release

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/powerpc/kernel/prom.c
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/mmc/card/block.c
Simple merge

diff --cc drivers/mmc/core/core.c
Simple merge

diff --cc drivers/mmc/core/mmc.c
Simple merge

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

diff --cc drivers/usb/core/driver.c
Simple merge

diff --cc drivers/usb/core/hub.c
index 67c6d0d4ba0b6721401c0b04e56cd290dcfc86e1,8eb2de6beee4b138f6fcda5bee34f77243c185fe..07b1dcf10f455ba324d619c6c99c5afaa314d9a0
--- 1/drivers/usb/core/hub.c
--- 2/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@@ -4419,15 -4167,14 +4419,21 @@@ hub_port_init (struct usb_hub *hub, str
                                                r = -EPROTO;
                                        break;
                                }
-                               if (r == 0)
+                               /*
+                                * Some devices time out if they are powered on
+                                * when already connected. They need a second
+                                * reset. But only on the first attempt,
+                                * lest we get into a time out/reset loop
+                                */
+                               if (r == 0  || (r == -ETIMEDOUT && j == 0))
                                        break;
 +
 +#if defined(CONFIG_USBIF_COMPLIANCE) && defined(CONFIG_USB_XHCI_HCD)
 +                              if (buf->bMaxPacketSize0 == 0) {
 +                                      usbif_u3h_send_event("DEV_CONN_TMOUT");
 +                              }
 +#endif
 +
                        }
                        udev->descriptor.bMaxPacketSize0 =
                                        buf->bMaxPacketSize0;

diff --cc drivers/usb/host/xhci-mem.c
Simple merge

diff --cc drivers/usb/serial/option.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc include/linux/mod_devicetable.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/sched.h
index 323eec3924d8e306657e9de37893e3a5ab8d53f8,e7f4d554fa5dfc0b205491df4e22ce9fd6e062fc..d50559dfcf5cc26276d85a71ade5aad2946293c7
--- 1/kernel/sched/sched.h
--- 2/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@@ -1440,9 -1379,15 +1440,21 @@@ static inline u64 irq_time_read(int cpu
  #endif /* CONFIG_64BIT */
  #endif /* CONFIG_IRQ_TIME_ACCOUNTING */
  
 +#ifdef CONFIG_SMP
 +static inline int rq_cpu(const struct rq *rq) { return rq->cpu; }
 +#else
 +static inline int rq_cpu(const struct rq *rq) { return 0; }
 +#endif
 +
+ static inline void account_reset_rq(struct rq *rq)
+ {
+ #ifdef CONFIG_IRQ_TIME_ACCOUNTING
+       rq->prev_irq_time = 0;
+ #endif
+ #ifdef CONFIG_PARAVIRT
+       rq->prev_steal_time = 0;
+ #endif
+ #ifdef CONFIG_PARAVIRT_TIME_ACCOUNTING
+       rq->prev_steal_time_rq = 0;
+ #endif
+ }

diff --cc kernel/trace/ring_buffer.c
index 643b469c91771ba57169c3e1a171c1b6f71fd28d,c4ce3a951a1c6a18d2dc3f6fc023d37fe1e11527..29e98c9df7c8a5518612af43c8af9b0552f9216d
--- 1/kernel/trace/ring_buffer.c
--- 2/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@@ -1129,15 -1120,13 +1129,15 @@@ static int rb_check_pages(struct ring_b
        return 0;
  }
  
- static int __rb_allocate_pages(int nr_pages, struct list_head *pages, int cpu)
+ static int __rb_allocate_pages(long nr_pages, struct list_head *pages, int cpu)
  {
-       int i;
        struct buffer_page *bpage, *tmp;
+       long i;
  
        for (i = 0; i < nr_pages; i++) {
 +#if !defined (CONFIG_MTK_EXTMEM)
                struct page *page;
 +#endif
                /*
                 * __GFP_NORETRY flag makes sure that the allocation fails
                 * gracefully without invoking oom-killer and the system is

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace_printk.c
Simple merge

diff --cc kernel/workqueue.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

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

diff --cc net/ipv6/exthdrs_core.c
index 11de7379fb9a8ea04eec99c9486c7536f9ff9045,f66c1b629582c91dac669bbe23b78000cd708d30..06fc6bfe9f9700cfb4f9ffa34505cbe95b9cd29b
--- 1/net/ipv6/exthdrs_core.c
--- 2/net/ipv6/exthdrs_core.c
+++ b/net/ipv6/exthdrs_core.c
@@@ -253,14 -253,15 +253,18 @@@ int ipv6_find_hdr(const struct sk_buff 
                                if (target < 0 &&
                                    ((!ipv6_ext_hdr(hp->nexthdr)) ||
                                     hp->nexthdr == NEXTHDR_NONE)) {
 -                                      if (fragoff)
 +                                      if (fragoff) {
                                                *fragoff = _frag_off;
 -                                      return hp->nexthdr;
 +                                              return hp->nexthdr;
 +                                      } else {
 +                                              return -EINVAL;
 +                                      }
                                }
-                               return -ENOENT;
+                               if (!found)
+                                       return -ENOENT;
+                               if (fragoff)
+                                       *fragoff = _frag_off;
+                               break;
                        }
                        hdrlen = 8;
                } else if (nexthdr == NEXTHDR_AUTH) {

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

diff --cc net/l2tp/l2tp_ip.c
Simple merge

diff --cc net/l2tp/l2tp_ip6.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/socket.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc sound/core/timer.c
Simple merge