Linux 3.14.39
Greg KH
maintainerI'm announcing the release of the 3.14.39 kernel.
All users of the 3.14 kernel series must upgrade.
The updated 3.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.14.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arc/kernel/signal.c | 4 arch/x86/kernel/reboot.c | 10 ++ drivers/acpi/processor_idle.c | 2 drivers/block/nbd.c | 8 - drivers/cpuidle/cpuidle.c | 3 drivers/cpuidle/sysfs.c | 5 - drivers/dma/omap-dma.c | 1 drivers/gpu/drm/radeon/radeon_bios.c | 10 +- drivers/iio/imu/adis_trigger.c | 2 drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 25 +++-- drivers/infiniband/core/umem.c | 8 + drivers/infiniband/core/uverbs_main.c | 1 drivers/infiniband/hw/mlx4/mad.c | 20 +++- drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 drivers/media/platform/sh_veu.c | 1 drivers/net/can/flexcan.c | 11 +- drivers/net/wireless/iwlwifi/dvm/dev.h | 1 drivers/net/wireless/iwlwifi/dvm/ucode.c | 5 - drivers/pci/pcie/aer/aerdrv_errprint.c | 12 -- drivers/scsi/be2iscsi/be_main.c | 2 drivers/scsi/scsi_lib.c | 4 drivers/target/iscsi/iscsi_target.c | 2 drivers/tty/n_tty.c | 106 +++++++++++++++++------- drivers/tty/serial/fsl_lpuart.c | 3 drivers/usb/host/xhci-hub.c | 9 +- drivers/usb/host/xhci-pci.c | 2 drivers/usb/serial/ftdi_sio.c | 9 +- drivers/usb/serial/ftdi_sio_ids.h | 6 + fs/aio.c | 3 fs/btrfs/tree-log.c | 16 --- fs/cifs/file.c | 1 fs/cifs/smb2ops.c | 3 fs/ocfs2/file.c | 14 ++- include/linux/blk_types.h | 4 include/linux/cpuidle.h | 1 kernel/sched/core.c | 2 mm/memory_hotplug.c | 13 -- mm/page-writeback.c | 7 + net/ipv4/tcp_output.c | 1 net/llc/sysctl_net_llc.c | 8 - net/rds/sysctl.c | 4 security/selinux/selinuxfs.c | 2 sound/pci/hda/patch_realtek.c | 13 ++ sound/usb/mixer_quirks.c | 1 45 files changed, 245 insertions(+), 124 deletions(-)
Al Viro (2):
ocfs2: _really_ sync the right range ioctx_alloc(): fix vma (and file) leak on failure
Andreas Werner (1):
can: flexcan: Deferred on Regulator return EPROBE_DEFER
Bart Van Assche (1):
Defer processing of REQ_PREEMPT requests for blocked devices
Bartlomiej Zolnierkiewicz (1):
cpuidle: remove state_count field from struct cpuidle_device
Ben Hutchings (1):
tcp: Fix crash in TCP Fast Open
Brian Silverman (1):
sched: Fix RLIMIT_RTTIME when PI-boosting to RT
Darshana Padmadas (1):
iio: imu: Use iio_trigger_get for indio_dev->trig assignment
David Disseldorp (1):
cifs: fix use-after-free bug in find_writable_file
David Miller (1):
radeon: Do not directly dereference pointers to BIOS area.
David Sterba (1):
btrfs: simplify insert_orphan_item
Dmitry M. Fedin (1):
ALSA: usb - Creative USB X-Fi Pro SB1095 volume knob support
Doug Goldstein (2):
USB: ftdi_sio: Added custom PID for Synapse Wireless product
USB: ftdi_sio: Use jtag quirk for SNAP Connect E10
Eli Cohen (1):
IB/core: Avoid leakage from kernel to user space
Emmanuel Grumbach (1):
iwlwifi: dvm: run INIT firmware again upon .start()
Greg Kroah-Hartman (1):
Linux 3.14.39
Gu Zheng (1):
mm/memory hotplug: postpone the reset of obsolete pgdat
Hans Verkuil (1):
sh_veu: v4l2_dev wasn't set
Hui Wang (1):
ALSA: hda - Add one more node in the EAPD supporting candidate list
Joe Perches (1):
selinux: fix sel_write_enforce broken return value
John Soni Jose (1):
be2iscsi: Fix kernel panic when device initialization fails
Kailang Yang (1):
ALSA: hda/realtek - Make more stable to get pin sense for ALC283
Lu Baolu (2):
usb: xhci: handle Config Error Change (CEC) in xhci driver
usb: xhci: apply XHCI_AVOID_BEI quirk to all Intel xHCI controllers
Majd Dibbiny (1):
IB/mlx4: Saturate RoCE port PMA counters in case of overflow
Marek Szyprowski (1):
media: s5p-mfc: fix mmap support for 64bit arch
Mike Christie (1):
iscsi target: fix oops when adding reject pdu
Peter Hurley (1):
n_tty: Fix read buffer overwrite when no newline
Peter Ujfalusi (1):
dmaengine: omap-dma: Fix memory leak when terminating running transfer
Rasmus Villemoes (1):
PCI/AER: Avoid info leak in __print_tlp_header()
Sachin Prabhu (1):
cifs: smb2_clone_range() - exit on unhandled error
Sasha Levin (2):
net: rds: use correct size for max unacked packets and bytes
net: llc: use correct size for sysctl timeout entries
Shachar Raindel (1):
IB/uverbs: Prevent integer overflow in ib_umem_get address arithmetic
Stefan Agner (1):
tty: serial: fsl_lpuart: clear receive flag on FIFO flush
Stefan Lippers-Hollmann (1):
x86/reboot: Add ASRock Q1900DC-ITX mainboard reboot quirk
Sudip Mukherjee (1):
nbd: fix possible memory leak
Takashi Iwai (1):
ALSA: hda - Fix headphone pin config for Lifebook T731
Tejun Heo (2):
writeback: add missing INITIAL_JIFFIES init in global_update_bandwidth()
writeback: fix possible underflow in write bandwidth calculation
Thomas Schlichter (1):
cpuidle: ACPI: do not overwrite name and description of C0
Vineet Gupta (1):
ARC: SA_SIGINFO ucontext regs off-by-one
Viorel Suman (1):
iio: inv_mpu6050: Clear timestamps fifo while resetting hardware fifo
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 38 +SUBLEVEL = 39 EXTRAVERSION = NAME = Remembering Coco
arch/arc/kernel/signal.c +2 -2
@@ -67,7 +67,7 @@ stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs, sigset_t *set) {int err; - err =__copy_to_user (&(sf->uc.uc_mcontext.regs), regs, + err =__copy_to_user (&(sf->uc.uc_mcontext.regs.scratch), regs,sizeof (sf->uc.uc_mcontext.regs.scratch)); err |=__copy_to_user (&sf->uc.uc_sigmask, set,sizeof (sigset_t));
@@ -83,7 +83,7 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf)if (!err)set_current_blocked (&set); - err |=__copy_from_user (regs, &(sf->uc.uc_mcontext.regs), + err |=__copy_from_user (regs, &(sf->uc.uc_mcontext.regs.scratch),sizeof (sf->uc.uc_mcontext.regs.scratch));return err;
arch/x86/kernel/reboot.c +10 -0
@@ -181,6 +181,16 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, }, +/* ASRock */ + {/* Handle problems with rebooting on ASRock Q1900DC-ITX */ + .callback = set_pci_reboot, + .ident = "ASRock Q1900DC-ITX", + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"ASRock" ), + DMI_MATCH(DMI_BOARD_NAME, "Q1900DC-ITX"), + }, + }, + /* ASUS */ { /* Handle problems with rebooting on ASUS P4S800 */ .callback = set_bios_reboot,
drivers/acpi/processor_idle.c +1 -1
@@ -962,7 +962,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)return -EINVAL ; drv->safe_state_index =-1 ; -for (i =0 ; i <CPUIDLE_STATE_MAX ; i++) { +for (i =CPUIDLE_DRIVER_STATE_START ; i <CPUIDLE_STATE_MAX ; i++) { drv->states[i].name[0 ] ='\0' ; drv->states[i].desc[0 ] ='\0' ; }
drivers/block/nbd.c +4 -4
@@ -814,10 +814,6 @@ static int __init nbd_init(void)return -EINVAL ; } - nbd_dev =kcalloc (nbds_max,sizeof (*nbd_dev),GFP_KERNEL ); -if (!nbd_dev) -return -ENOMEM ; - part_shift =0 ;if (max_part >0 ) { part_shift =fls (max_part);
@@ -839,6 +835,10 @@ static int __init nbd_init(void)if (nbds_max >1UL << (MINORBITS - part_shift))return -EINVAL ; + nbd_dev =kcalloc (nbds_max,sizeof (*nbd_dev),GFP_KERNEL ); +if (!nbd_dev) +return -ENOMEM ; +for (i =0 ; i < nbds_max; i++) {struct gendisk *disk =alloc_disk (1 << part_shift);if (!disk)
drivers/cpuidle/cpuidle.c +0 -3
@@ -252,9 +252,6 @@ int cpuidle_enable_device(struct cpuidle_device *dev)if (!dev->registered)return -EINVAL ; -if (!dev->state_count) - dev->state_count = drv->state_count; - ret =cpuidle_add_device_sysfs (dev);if (ret)return ret;
drivers/cpuidle/sysfs.c +3 -2
@@ -398,7 +398,7 @@ static int cpuidle_add_state_sysfs(struct cpuidle_device *device)struct cpuidle_driver *drv =cpuidle_get_cpu_driver (device);/* state statistics */ -for (i =0 ; i < device->state_count; i++) { +for (i =0 ; i < drv->state_count; i++) { kobj =kzalloc (sizeof (struct cpuidle_state_kobj ),GFP_KERNEL );if (!kobj) goto error_state;
@@ -430,9 +430,10 @@ error_state:*/ static void cpuidle_remove_state_sysfs (struct cpuidle_device *device) { +struct cpuidle_driver *drv =cpuidle_get_cpu_driver (device);int i; -for (i =0 ; i < device->state_count; i++) +for (i =0 ; i < drv->state_count; i++)cpuidle_free_state_kobj (device, i); }
drivers/dma/omap-dma.c +1 -0
@@ -487,6 +487,7 @@ static int omap_dma_terminate_all(struct omap_chan *c)* c->desc is NULL and exit.) */ if (c->desc) { +omap_dma_desc_free (&c->desc->vd); c->desc =NULL ;/* Avoid stopping the dma twice */ if (!c->paused)
drivers/gpu/drm/radeon/radeon_bios.c +7 -3
@@ -76,7 +76,7 @@ static bool igp_read_bios_from_vram(struct radeon_device *rdev)static bool radeon_read_bios (struct radeon_device *rdev) { -uint8_t __iomem *bios; +uint8_t __iomem *bios, val1, val2;size_t size; rdev->bios =NULL ;
@@ -86,15 +86,19 @@ static bool radeon_read_bios(struct radeon_device *rdev)return false; } -if (size ==0 || bios[0 ] !=0x55 || bios[1 ] !=0xaa ) { + val1 =readb (&bios[0 ]); + val2 =readb (&bios[1 ]); + +if (size ==0 || val1 !=0x55 || val2 !=0xaa ) {pci_unmap_rom (rdev->pdev, bios);return false; } - rdev->bios =kmemdup (bios, size,GFP_KERNEL ); + rdev->bios =kzalloc (size,GFP_KERNEL );if (rdev->bios ==NULL ) {pci_unmap_rom (rdev->pdev, bios);return false; } +memcpy_fromio (rdev->bios, bios, size);pci_unmap_rom (rdev->pdev, bios);return true; }
drivers/iio/imu/adis_trigger.c +1 -1
@@ -60,7 +60,7 @@ int adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev)iio_trigger_set_drvdata (adis->trig, adis); ret =iio_trigger_register (adis->trig); - indio_dev->trig = adis->trig; + indio_dev->trig =iio_trigger_get (adis->trig);if (ret) goto error_free_irq;
drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c +14 -11
@@ -25,6 +25,16 @@#include <linux/poll.h> #include "inv_mpu_iio.h" +static void inv_clear_kfifo (struct inv_mpu6050_state *st) +{ +unsigned long flags; + +/* take the spin lock sem to avoid interrupt kick in */ +spin_lock_irqsave (&st->time_stamp_lock, flags); +kfifo_reset (&st->timestamps); +spin_unlock_irqrestore (&st->time_stamp_lock, flags); +} +int inv_reset_fifo (struct iio_dev *indio_dev) {int result;
@@ -51,6 +61,10 @@ int inv_reset_fifo(struct iio_dev *indio_dev) INV_MPU6050_BIT_FIFO_RST);if (result) goto reset_fifo_fail; + +/* clear timestamps fifo */ +inv_clear_kfifo (st); +/* enable interrupt */ if (st->chip_config.accl_fifo_enable || st->chip_config.gyro_fifo_enable) {
@@ -84,16 +98,6 @@ reset_fifo_fail:return result; } -static void inv_clear_kfifo (struct inv_mpu6050_state *st) -{ -unsigned long flags; - -/* take the spin lock sem to avoid interrupt kick in */ -spin_lock_irqsave (&st->time_stamp_lock, flags); -kfifo_reset (&st->timestamps); -spin_unlock_irqrestore (&st->time_stamp_lock, flags); -} -/** * inv_mpu6050_irq_handler() - Cache a timestamp at each data ready interrupt. */
@@ -185,7 +189,6 @@ end_session: flush_fifo:/* Flush HW and SW FIFOs. */ inv_reset_fifo (indio_dev); -inv_clear_kfifo (st);mutex_unlock (&indio_dev->mlock);iio_trigger_notify_done (indio_dev->trig);
drivers/infiniband/core/umem.c +8 -0
@@ -94,6 +94,14 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,if (dmasync)dma_set_attr (DMA_ATTR_WRITE_BARRIER , &attrs); +/* +* If the combination of the addr and size requested for this memory +* region causes an integer overflow, return error. +*/ +if ((PAGE_ALIGN (addr + size) <= size) || + (PAGE_ALIGN (addr + size) <= addr)) +return ERR_PTR (-EINVAL ); +if (!can_do_mlock ())return ERR_PTR (-EPERM );
drivers/infiniband/core/uverbs_main.c +1 -0
@@ -476,6 +476,7 @@ static void ib_uverbs_async_handler(struct ib_uverbs_file *file, entry->desc.async.element = element; entry->desc.async.event_type = event; + entry->desc.async.reserved =0 ; entry->counter = counter;list_add_tail (&entry->list, &file->async_file->event_list);
drivers/infiniband/hw/mlx4/mad.c +16 -4
@@ -64,6 +64,14 @@ enum {#define GUID_TBL_BLK_NUM_ENTRIES 8#define GUID_TBL_BLK_SIZE (GUID_TBL_ENTRY_SIZE * GUID_TBL_BLK_NUM_ENTRIES) +/* Counters should be saturate once they reach their maximum value */ +#define ASSIGN_32BIT_COUNTER (counter, value) do {\ + if ((value) > U32_MAX) \ + counter = cpu_to_be32(U32_MAX); \ + else \ + counter = cpu_to_be32(value); \ +} while (0) +struct mlx4_mad_rcv_buf {struct ib_grh grh;u8 payload[256 ];
@@ -730,10 +738,14 @@ static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,static void edit_counter (struct mlx4_counter *cnt,struct ib_pma_portcounters *pma_cnt) { - pma_cnt->port_xmit_data =cpu_to_be32 ((be64_to_cpu (cnt->tx_bytes)>>2 )); - pma_cnt->port_rcv_data =cpu_to_be32 ((be64_to_cpu (cnt->rx_bytes)>>2 )); - pma_cnt->port_xmit_packets =cpu_to_be32 (be64_to_cpu (cnt->tx_frames)); - pma_cnt->port_rcv_packets =cpu_to_be32 (be64_to_cpu (cnt->rx_frames)); +ASSIGN_32BIT_COUNTER (pma_cnt->port_xmit_data, + (be64_to_cpu (cnt->tx_bytes) >>2 )); +ASSIGN_32BIT_COUNTER (pma_cnt->port_rcv_data, + (be64_to_cpu (cnt->rx_bytes) >>2 )); +ASSIGN_32BIT_COUNTER (pma_cnt->port_xmit_packets, +be64_to_cpu (cnt->tx_frames)); +ASSIGN_32BIT_COUNTER (pma_cnt->port_rcv_packets, +be64_to_cpu (cnt->rx_frames)); } static int iboe_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
drivers/media/platform/s5p-mfc/s5p_mfc_common.h +1 -1
@@ -30,7 +30,7 @@/* Offset base used to differentiate between CAPTURE and OUTPUT * while mmaping */ -#define DST_QUEUE_OFF_BASE (TASK_SIZE / 2) +#define DST_QUEUE_OFF_BASE (1 << 30)#define MFC_BANK1_ALLOC_CTX 0#define MFC_BANK2_ALLOC_CTX 1
drivers/media/platform/sh_veu.c +1 -0
@@ -1183,6 +1183,7 @@ static int sh_veu_probe(struct platform_device *pdev) } *vdev = sh_veu_videodev; + vdev->v4l2_dev = &veu->v4l2_dev;spin_lock_init (&veu->lock);mutex_init (&veu->fop_lock); vdev->lock = &veu->fop_lock;
drivers/net/can/flexcan.c +8 -3
@@ -1095,12 +1095,19 @@ static int flexcan_probe(struct platform_device *pdev)const struct flexcan_devtype_data *devtype_data;struct net_device *dev;struct flexcan_priv *priv; +struct regulator *reg_xceiver;struct resource *mem;struct clk *clk_ipg =NULL , *clk_per =NULL ;void __iomem *base;int err, irq;u32 clock_freq =0 ; + reg_xceiver =devm_regulator_get (&pdev->dev,"xceiver" ); +if (PTR_ERR (reg_xceiver) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; +else if (IS_ERR (reg_xceiver)) + reg_xceiver =NULL ; +if (pdev->dev.of_node)of_property_read_u32 (pdev->dev.of_node,"clock-frequency" , &clock_freq);
@@ -1162,9 +1169,7 @@ static int flexcan_probe(struct platform_device *pdev) priv->pdata =dev_get_platdata (&pdev->dev); priv->devtype_data = devtype_data; - priv->reg_xceiver =devm_regulator_get (&pdev->dev,"xceiver" ); -if (IS_ERR (priv->reg_xceiver)) - priv->reg_xceiver =NULL ; + priv->reg_xceiver = reg_xceiver;netif_napi_add (dev, &priv->napi, flexcan_poll,FLEXCAN_NAPI_WEIGHT );
drivers/net/wireless/iwlwifi/dvm/dev.h +0 -1
@@ -708,7 +708,6 @@ struct iwl_priv {unsigned long reload_jiffies;int reload_count;bool ucode_loaded; -bool init_ucode_run;/* Don't run init uCode again */ u8 plcp_delta_threshold;
drivers/net/wireless/iwlwifi/dvm/ucode.c +0 -5
@@ -418,9 +418,6 @@ int iwl_run_init_ucode(struct iwl_priv *priv)if (!priv->fw->img[IWL_UCODE_INIT ].sec[0 ].len)return 0 ; -if (priv->init_ucode_run) -return 0 ; -iwl_init_notification_wait (&priv->notif_wait, &calib_wait, calib_complete,ARRAY_SIZE (calib_complete), iwlagn_wait_calib, priv);
@@ -440,8 +437,6 @@ int iwl_run_init_ucode(struct iwl_priv *priv)*/ ret =iwl_wait_notification (&priv->notif_wait, &calib_wait,UCODE_CALIB_TIMEOUT ); -if (!ret) - priv->init_ucode_run = true; goto out;
drivers/pci/pcie/aer/aerdrv_errprint.c +2 -10
@@ -127,16 +127,8 @@ static const char *aer_agent_string[] = {static void __print_tlp_header (struct pci_dev *dev,struct aer_header_log_regs *t) { -unsigned char *tlp = (unsigned char *)&t; - -dev_err (&dev->dev," TLP Header:" -" %02x%02x%02x%02x %02x%02x%02x%02x" -" %02x%02x%02x%02x %02x%02x%02x%02x\n" , - *(tlp +3 ), *(tlp +2 ), *(tlp +1 ), *tlp, - *(tlp +7 ), *(tlp +6 ), *(tlp +5 ), *(tlp +4 ), - *(tlp +11 ), *(tlp +10 ), *(tlp +9 ), - *(tlp +8 ), *(tlp +15 ), *(tlp +14 ), - *(tlp +13 ), *(tlp +12 )); +dev_err (&dev->dev," TLP Header: %08x %08x %08x %08x\n" , + t->dw0, t->dw1, t->dw2, t->dw3); } static void __aer_print_error(struct pci_dev *dev,
drivers/scsi/be2iscsi/be_main.c +1 -1
@@ -5684,9 +5684,9 @@ free_port: hba_free:if (phba->msix_enabled)pci_disable_msix (phba->pcidev); -iscsi_host_remove (phba->shost);pci_dev_put (phba->pcidev);iscsi_host_free (phba->shost); +pci_set_drvdata (pcidev,NULL ); disable_pci:pci_disable_device (pcidev);return ret;
drivers/scsi/scsi_lib.c +3 -1
@@ -1258,9 +1258,11 @@ int scsi_prep_state_check(struct scsi_device *sdev, struct request *req) "rejecting I/O to dead device\n"); ret =BLKPREP_KILL ;break ; -case SDEV_QUIESCE :case SDEV_BLOCK :case SDEV_CREATED_BLOCK : + ret =BLKPREP_DEFER ; +break ; +case SDEV_QUIESCE :/* * If the devices is blocked we defer normal commands. */
drivers/target/iscsi/iscsi_target.c +1 -1
@@ -1165,7 +1165,7 @@ iscsit_handle_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,* traditional iSCSI block I/O. */ if (iscsit_allocate_iovecs (cmd) <0 ) { -return iscsit_add_reject_cmd (cmd, +return iscsit_reject_cmd (cmd,ISCSI_REASON_BOOKMARK_NO_RESOURCES , buf); } immed_data = cmd->immediate_data;
drivers/tty/n_tty.c +79 -27
141 lines not on this page · raw message
drivers/tty/serial/fsl_lpuart.c +3 -0
@@ -362,6 +362,9 @@ static void lpuart_setup_watermark(struct lpuart_port *sport)writeb (val |UARTPFIFO_TXFE |UARTPFIFO_RXFE , sport->port.membase +UARTPFIFO ); +/* explicitly clear RDRF */ +readb (sport->port.membase +UARTSR1 ); +/* flush Tx and Rx FIFO */ writeb (UARTCFIFO_TXFLUSH |UARTCFIFO_RXFLUSH , sport->port.membase +UARTCFIFO );
drivers/usb/host/xhci-hub.c +8 -1
@@ -383,6 +383,10 @@ static void xhci_clear_port_change_bit(struct xhci_hcd *xhci, u16 wValue, status =PORT_PLC ; port_change_bit ="link state" ;break ; +case USB_PORT_FEAT_C_PORT_CONFIG_ERROR : + status =PORT_CEC ; + port_change_bit ="config error" ; +break ;default :/* Should never happen */ return ;
@@ -584,6 +588,8 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd, status |=USB_PORT_STAT_C_LINK_STATE <<16 ;if ((raw_port_status &PORT_WRC )) status |=USB_PORT_STAT_C_BH_RESET <<16 ; +if ((raw_port_status &PORT_CEC )) + status |=USB_PORT_STAT_C_CONFIG_ERROR <<16 ; }if (hcd->speed !=HCD_USB3 ) {
@@ -999,6 +1005,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,case USB_PORT_FEAT_C_OVER_CURRENT :case USB_PORT_FEAT_C_ENABLE :case USB_PORT_FEAT_C_PORT_LINK_STATE : +case USB_PORT_FEAT_C_PORT_CONFIG_ERROR :xhci_clear_port_change_bit (xhci, wValue, wIndex, port_array[wIndex], temp);break ;
@@ -1063,7 +1070,7 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)*/ status = bus_state->resuming_ports; - mask =PORT_CSC |PORT_PEC |PORT_OCC |PORT_PLC |PORT_WRC ; + mask =PORT_CSC |PORT_PEC |PORT_OCC |PORT_PLC |PORT_WRC |PORT_CEC ;spin_lock_irqsave (&xhci->lock, flags);/* For each port, did anything change? If so, set that bit in buf. */
drivers/usb/host/xhci-pci.c +1 -1
@@ -108,6 +108,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)if (pdev->vendor ==PCI_VENDOR_ID_INTEL ) { xhci->quirks |=XHCI_LPM_SUPPORT ; xhci->quirks |=XHCI_INTEL_HOST ; + xhci->quirks |=XHCI_AVOID_BEI ; }if (pdev->vendor ==PCI_VENDOR_ID_INTEL && pdev->device ==PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI ) {
@@ -123,7 +124,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)* PPT chipsets. */ xhci->quirks |=XHCI_SPURIOUS_REBOOT ; - xhci->quirks |=XHCI_AVOID_BEI ; } if (pdev->vendor == PCI_VENDOR_ID_INTEL && (pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI ||
drivers/usb/serial/ftdi_sio.c +7 -2
@@ -617,6 +617,7 @@ static const struct usb_device_id id_table_combined[] = { .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) }, /* * ELV devices: */
@@ -1901,8 +1902,12 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial) {struct usb_device *udev = serial->dev; -if ((udev->manufacturer && !strcmp (udev->manufacturer,"CALAO Systems" )) || - (udev->product && !strcmp (udev->product,"BeagleBone/XDS100V2" ))) +if (udev->manufacturer && !strcmp (udev->manufacturer,"CALAO Systems" )) +return ftdi_jtag_probe (serial); + +if (udev->product && + (!strcmp (udev->product,"BeagleBone/XDS100V2" ) || + !strcmp (udev->product,"SNAP Connect E10" )))return ftdi_jtag_probe (serial);return 0 ;
drivers/usb/serial/ftdi_sio_ids.h +6 -0
@@ -561,6 +561,12 @@*/ #define FTDI_NT_ORIONLXM_PID 0x7c90/* OrionLXm Substation Automation Platform */ +/* +* Synapse Wireless product ids (FTDI_VID) +* http://www.synapse-wireless.com +*/ +#define FTDI_SYNAPSE_SS200_PID 0x9090/* SS200 - SNAP Stick 200 */ +/********************************/ /** third-party VID/PID combos **/
fs/aio.c +3 -0
@@ -719,6 +719,9 @@ static struct kioctx *ioctx_alloc(unsigned nr_events) err_cleanup:aio_nr_sub (ctx->max_reqs); err_ctx: +atomic_set (&ctx->dead,1 ); +if (ctx->mmap_size) +vm_munmap (ctx->mmap_base, ctx->mmap_size);aio_free_ring (ctx); err:mutex_unlock (&ctx->ring_lock);
fs/btrfs/tree-log.c +4 -12
@@ -1235,21 +1235,13 @@ out: }static int insert_orphan_item (struct btrfs_trans_handle *trans, -struct btrfs_root *root,u64 offset) +struct btrfs_root *root,u64 ino) {int ret; -struct btrfs_path *path; - - path =btrfs_alloc_path (); -if (!path) -return -ENOMEM ; - ret =btrfs_find_item (root, path,BTRFS_ORPHAN_OBJECTID , - offset,BTRFS_ORPHAN_ITEM_KEY ,NULL ); -if (ret >0 ) - ret =btrfs_insert_orphan_item (trans, root, offset); - -btrfs_free_path (path); + ret =btrfs_insert_orphan_item (trans, root, ino); +if (ret == -EEXIST ) + ret =0 ;return ret; }
fs/cifs/file.c +1 -0
@@ -1821,6 +1821,7 @@ refind_writable:cifsFileInfo_put (inv_file);spin_lock (&cifs_file_list_lock); ++refind; + inv_file =NULL ; goto refind_writable; } }
fs/cifs/smb2ops.c +2 -1
@@ -630,7 +630,8 @@ smb2_clone_range(const unsigned int xid,/* No need to change MaxChunks since already set to 1 */ chunk_sizes_updated = true; - } + }else + goto cchunk_out; } cchunk_out:
fs/ocfs2/file.c +10 -4
@@ -2391,10 +2391,14 @@ out_dio:/* buffered aio wouldn't have proper lock coverage today */ BUG_ON (ret == -EIOCBQUEUED && !(file->f_flags &O_DIRECT )); +if (unlikely (written <=0 )) + goto no_sync; +if (((file->f_flags &O_DSYNC ) && !direct_io) ||IS_SYNC (inode) || ((file->f_flags &O_DIRECT ) && !direct_io)) { - ret =filemap_fdatawrite_range (file->f_mapping, *ppos, - *ppos + count -1 ); + ret =filemap_fdatawrite_range (file->f_mapping, + iocb->ki_pos - written, + iocb->ki_pos -1 );if (ret <0 ) written = ret;
@@ -2407,10 +2411,12 @@ out_dio: }if (!ret) - ret =filemap_fdatawait_range (file->f_mapping, *ppos, - *ppos + count -1 ); + ret =filemap_fdatawait_range (file->f_mapping, + iocb->ki_pos - written, + iocb->ki_pos -1 ); } +no_sync:/* * deep in g_f_a_w_n()->ocfs2_direct_IO we pass in a ocfs2_dio_end_io * function pointer which is called when o_direct io completes so that
include/linux/blk_types.h +3 -1
@@ -180,7 +180,9 @@ enum rq_flag_bits { __REQ_ELVPRIV,/* elevator private data attached */ __REQ_FAILED,/* set if the request failed */ __REQ_QUIET,/* don't worry about errors */ - __REQ_PREEMPT,/* set for "ide_preempt" requests */ + __REQ_PREEMPT,/* set for "ide_preempt" requests and also +for requests for which the SCSI "quiesce" +state must be ignored. */ __REQ_ALLOCED,/* request came from our alloc pool */ __REQ_COPY_USER,/* contains copies of user pages */ __REQ_FLUSH_SEQ, /* request for flush sequence */
include/linux/cpuidle.h +0 -1
@@ -69,7 +69,6 @@ struct cpuidle_device {unsigned int cpu;int last_residency; -int state_count;struct cpuidle_state_usage states_usage[CPUIDLE_STATE_MAX ];struct cpuidle_state_kobj *kobjs[CPUIDLE_STATE_MAX ];struct cpuidle_driver_kobj *kobj_driver;
kernel/sched/core.c +2 -0
@@ -2980,6 +2980,8 @@ void rt_mutex_setprio(struct task_struct *p, int prio) }else {if (dl_prio (oldprio)) p->dl.dl_boosted =0 ; +if (rt_prio (oldprio)) + p->rt.timeout =0 ; p->sched_class = &fair_sched_class; }
mm/memory_hotplug.c +4 -9
@@ -1016,6 +1016,10 @@ static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start)return NULL ;arch_refresh_nodedata (nid, pgdat); + }else { +/* Reset the nr_zones and classzone_idx to 0 before reuse */ + pgdat->nr_zones =0 ; + pgdat->classzone_idx =0 ; }/* we can use NODE_DATA(nid) from here */
@@ -1863,15 +1867,6 @@ void try_offline_node(int nid)if (is_vmalloc_addr (zone->wait_table))vfree (zone->wait_table); } - -/* -* Since there is no way to guarentee the address of pgdat/zone is not -* on stack of any kernel threads or used by other kernel objects -* without reference counting or other symchronizing method, do not -* reset node_data and free pgdat here. Just reset it to 0 and reuse -* the memory when the node is online again. -*/ -memset (pgdat,0 ,sizeof (*pgdat)); }EXPORT_SYMBOL (try_offline_node);
mm/page-writeback.c +5 -2
@@ -878,8 +878,11 @@ static void bdi_update_write_bandwidth(struct backing_dev_info *bdi,* bw * elapsed + write_bandwidth * (period - elapsed) * write_bandwidth = --------------------------------------------------- * period +* +* @written may have decreased due to account_page_redirty(). +* Avoid underflowing @bw calculation. */ - bw = written - bdi->written_stamp; + bw = written -min (written, bdi->written_stamp); bw *=HZ ;if (unlikely (elapsed > period)) {do_div (bw, elapsed);
@@ -943,7 +946,7 @@ static void global_update_bandwidth(unsigned long thresh, unsigned long now) {static DEFINE_SPINLOCK (dirty_lock); -static unsigned long update_time; +static unsigned long update_time =INITIAL_JIFFIES ;/* * check locklessly first to optimize away locking for the most time
net/ipv4/tcp_output.c +1 -0
@@ -2933,6 +2933,7 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn) goto fallback; syn_data->ip_summed =CHECKSUM_PARTIAL ;memcpy (syn_data->cb, syn->cb,sizeof (syn->cb)); +skb_shinfo (syn_data)->gso_segs =1 ;if (unlikely (memcpy_fromiovecend (skb_put (syn_data, space), fo->data->msg_iov,0 , space))) {kfree_skb (syn_data);
net/llc/sysctl_net_llc.c +4 -4
@@ -18,28 +18,28 @@ static struct ctl_table llc2_timeout_table[] = { { .procname = "ack", .data = &sysctl_llc2_ack_timeout, - .maxlen = sizeof(long), + .maxlen = sizeof(sysctl_llc2_ack_timeout), .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, { .procname = "busy", .data = &sysctl_llc2_busy_timeout, - .maxlen = sizeof(long), + .maxlen = sizeof(sysctl_llc2_busy_timeout), .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, { .procname = "p", .data = &sysctl_llc2_p_timeout, - .maxlen = sizeof(long), + .maxlen = sizeof(sysctl_llc2_p_timeout), .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, { .procname = "rej", .data = &sysctl_llc2_rej_timeout, - .maxlen = sizeof(long), + .maxlen = sizeof(sysctl_llc2_rej_timeout), .mode = 0644, .proc_handler = proc_dointvec_jiffies, },
net/rds/sysctl.c +2 -2
@@ -71,14 +71,14 @@ static struct ctl_table rds_sysctl_rds_table[] = { { .procname = "max_unacked_packets", .data = &rds_sysctl_max_unacked_packets, - .maxlen = sizeof(unsigned long), + .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec, }, { .procname = "max_unacked_bytes", .data = &rds_sysctl_max_unacked_bytes, - .maxlen = sizeof(unsigned long), + .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec, },
security/selinux/selinuxfs.c +1 -1
@@ -152,7 +152,7 @@ static ssize_t sel_write_enforce(struct file *file, const char __user *buf, goto out;/* No partial writes. */ - length =EINVAL ; + length = -EINVAL ;if (*ppos !=0 ) goto out;
sound/pci/hda/patch_realtek.c +12 -1
@@ -271,7 +271,7 @@ static void alc_auto_setup_eapd(struct hda_codec *codec, bool on) {/* We currently only handle front, HP */ static hda_nid_t pins[] = { -0x0f ,0x10 ,0x14 ,0x15 ,0 +0x0f ,0x10 ,0x14 ,0x15 ,0x17 ,0 };hda_nid_t *p;for (p = pins; *p; p++)
@@ -2885,6 +2885,8 @@ static void alc283_init(struct hda_codec *codec)if (!hp_pin)return ; + +msleep (30 ); hp_pin_sense =snd_hda_jack_detect (codec, hp_pin);/* Index 0x43 Direct Drive HP AMP LPM Control 1 */
@@ -3951,6 +3953,7 @@ enum {ALC269_FIXUP_QUANTA_MUTE ,ALC269_FIXUP_LIFEBOOK ,ALC269_FIXUP_LIFEBOOK_EXTMIC , +ALC269_FIXUP_LIFEBOOK_HP_PIN ,ALC269_FIXUP_AMIC ,ALC269_FIXUP_DMIC , ALC269VB_FIXUP_AMIC,
@@ -4085,6 +4088,13 @@ static const struct hda_fixup alc269_fixups[] = { { } }, }, + [ALC269_FIXUP_LIFEBOOK_HP_PIN] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x21, 0x0221102f }, /* HP out */ + { } + }, + }, [ALC269_FIXUP_AMIC] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) {
@@ -4538,6 +4548,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x104d ,0x9084 ,"Sony VAIO" ,ALC275_FIXUP_SONY_HWEQ ),SND_PCI_QUIRK_VENDOR (0x104d ,"Sony VAIO" ,ALC269_FIXUP_SONY_VAIO ),SND_PCI_QUIRK (0x10cf ,0x1475 ,"Lifebook" ,ALC269_FIXUP_LIFEBOOK ), +SND_PCI_QUIRK (0x10cf ,0x15dc ,"Lifebook T731" ,ALC269_FIXUP_LIFEBOOK_HP_PIN ),SND_PCI_QUIRK (0x10cf ,0x1845 ,"Lifebook U904" ,ALC269_FIXUP_LIFEBOOK_EXTMIC ),SND_PCI_QUIRK (0x17aa ,0x20f2 ,"Thinkpad SL410/510" ,ALC269_FIXUP_SKU_IGNORE ), SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),
sound/usb/mixer_quirks.c +1 -0
@@ -178,6 +178,7 @@ static const struct rc_config { { USB_ID(0x041e, 0x3040), 2, 2, 6, 6, 2, 0x6e91 }, /* Live! 24-bit */ { USB_ID(0x041e, 0x3042), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 */ { USB_ID(0x041e, 0x30df), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 Pro */ + { USB_ID(0x041e, 0x3237), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 Pro */ { USB_ID(0x041e, 0x3048), 2, 2, 6, 6, 2, 0x6e91 }, /* Toshiba SB0500 */ };