Merge tag 'v3.10.91' into update

This is the 3.10.91 stable release

diff --cc Makefile
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm64/mm/fault.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/mtd/ubi/io.c
Simple merge

diff --cc drivers/mtd/ubi/vtbl.c
Simple merge

diff --cc drivers/mtd/ubi/wl.c
Simple merge

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

diff --cc drivers/usb/host/xhci-ring.c
index d52c1653ce658f0d7cf60a467044d58ebcdd3de5,4ba6974dd4b64b6b9bc06ffc7f5571aef6d949f0..05e2779c4917ee2566814e74fddf0a0593ee81e5
--- 1/drivers/usb/host/xhci-ring.c
--- 2/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@@ -3374,12 -3343,12 +3394,14 @@@ int xhci_queue_bulk_tx(struct xhci_hcd 
        int num_trbs;
        struct xhci_generic_trb *start_trb;
        bool first_trb;
+       int last_trb_num;
        bool more_trbs_coming;
+       bool zero_length_needed;
        int start_cycle;
        u32 field, length_field;
 -
 +#ifdef CONFIG_MTK_XHCI
 +      int max_packet = USB_SPEED_HIGH;
 +#endif
        int running_total, trb_buff_len, ret;
        unsigned int total_packet_count;
        u64 addr;
@@@ -3407,26 -3376,7 +3429,25 @@@
                num_trbs++;
                running_total += TRB_MAX_BUFF_SIZE;
        }
-       /* FIXME: this doesn't deal with URB_ZERO_PACKET - need one more */
  
 +#ifdef CONFIG_MTK_XHCI
 +      switch(urb->dev->speed){
 +              case USB_SPEED_SUPER:
 +                      max_packet = urb->ep->desc.wMaxPacketSize;
 +                      break;
 +              case USB_SPEED_HIGH:
 +              case USB_SPEED_FULL:
 +              case USB_SPEED_LOW:
 +        default:
 +                      max_packet = urb->ep->desc.wMaxPacketSize & 0x7ff;
 +                      break;
 +      }
 +      if((urb->transfer_flags & URB_ZERO_PACKET)
 +              && ((urb->transfer_buffer_length % max_packet) == 0)){
 +              num_trbs++;
 +      }
 +#endif
 +
        ret = prepare_transfer(xhci, xhci->devs[slot_id],
                        ep_index, urb->stream_id,
                        num_trbs, urb, 0, mem_flags);
@@@ -3585,12 -3549,8 +3623,12 @@@ int xhci_queue_ctrl_tx(struct xhci_hcd 
        if (start_cycle == 0)
                field |= 0x1;
  
-       /* xHCI 1.0 6.4.1.2.1: Transfer Type field */
+       /* xHCI 1.0/1.1 6.4.1.2.1: Transfer Type field */
 -      if (xhci->hci_version >= 0x100) {
 +#ifdef CONFIG_MTK_XHCI
 +      if(1){
 +#else
 +      if (xhci->hci_version == 0x100) {
 +#endif
                if (urb->transfer_buffer_length > 0) {
                        if (setup->bRequestType & USB_DIR_IN)
                                field |= TRB_TX_TYPE(TRB_DATA_IN);

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

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

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

diff --cc ipc/shm.c
Simple merge

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