16 Jan, 2015

2 commits

  • commit 8e2596e81a9dd8f9efcf78476f3990f211e25edb upstream.

    In (6468276 i2c: designware: make SCL and SDA falling time
    configurable) new device tree properties were added for setting the
    falling time of SDA and SCL. The device tree bindings doc had a typo
    in it: it forgot the "-ns" suffix for both properies in the prose of
    the bindings.

    I assume this is a typo because:
    * The source code includes the "-ns"
    * The example in the bindings includes the "-ns".

    Fix the typo.

    Signed-off-by: Doug Anderson
    Fixes: 6468276b2206 ("i2c: designware: make SCL and SDA falling time configurable")
    Acked-by: Romain Baeriswyl
    Signed-off-by: Wolfram Sang
    Signed-off-by: Greg Kroah-Hartman

    Doug Anderson
     
  • commit 027bc8b08242c59e19356b4b2c189f2d849ab660 upstream.

    On some ARMs the memory can be mapped pgprot_noncached() and still
    be working for atomic operations. As pointed out by Colin Cross
    , in some cases you do want to use
    pgprot_noncached() if the SoC supports it to see a debug printk
    just before a write hanging the system.

    On ARMs, the atomic operations on strongly ordered memory are
    implementation defined. So let's provide an optional kernel parameter
    for configuring pgprot_noncached(), and use pgprot_writecombine() by
    default.

    Cc: Arnd Bergmann
    Cc: Rob Herring
    Cc: Randy Dunlap
    Cc: Anton Vorontsov
    Cc: Colin Cross
    Cc: Olof Johansson
    Cc: Russell King
    Acked-by: Kees Cook
    Signed-off-by: Tony Lindgren
    Signed-off-by: Tony Luck
    Signed-off-by: Greg Kroah-Hartman

    Tony Lindgren
     

28 Nov, 2014

1 commit

  • Pull networking fixes from David Miller:
    "Several small fixes here:

    1) Don't crash in tg3 driver when the number of tx queues has been
    configured to be different from the number of rx queues. From
    Thadeu Lima de Souza Cascardo.

    2) VLAN filter not disabled properly in promisc mode in ixgbe driver,
    from Vlad Yasevich.

    3) Fix OOPS on dellink op in VTI tunnel driver, from Xin Long.

    4) IPV6 GRE driver WCCP code checks skb->protocol for ETH_P_IP
    instead of ETH_P_IPV6, whoops. From Yuri Chislov.

    5) Socket matching in ping driver is buggy when packet AF does not
    match socket's AF. Fix from Jane Zhou.

    6) Fix checksum calculation errors in VXLAN due to where the
    udp_tunnel6_xmit_skb() helper gets it's saddr/daddr from. From
    Alexander Duyck.

    7) Fix 5G detection problem in rtlwifi driver, from Larry Finger.

    8) Fix NULL deref in tcp_v{4,6}_send_reset, from Eric Dumazet.

    9) Various missing netlink attribute verifications in bridging code,
    from Thomas Graf.

    10) tcp_recvmsg() unconditionally calls ipv4 ip_recv_error even for
    ipv6 sockets, whoops. Fix from Willem de Bruijn"

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
    net-timestamp: make tcp_recvmsg call ipv6_recv_error for AF_INET6 socks
    bridge: Sanitize IFLA_EXT_MASK for AF_BRIDGE:RTM_GETLINK
    bridge: Add missing policy entry for IFLA_BRPORT_FAST_LEAVE
    net: Check for presence of IFLA_AF_SPEC
    net: Validate IFLA_BRIDGE_MODE attribute length
    bridge: Validate IFLA_BRIDGE_FLAGS attribute length
    stmmac: platform: fix default values of the filter bins setting
    net/mlx4_core: Limit count field to 24 bits in qp_alloc_res
    net: dsa: bcm_sf2: reset switch prior to initialization
    net: dsa: bcm_sf2: fix unmapping registers in case of errors
    tg3: fix ring init when there are more TX than RX channels
    tcp: fix possible NULL dereference in tcp_vX_send_reset()
    rtlwifi: Change order in device startup
    rtlwifi: rtl8821ae: Fix 5G detection problem
    Revert "netfilter: conntrack: fix race in __nf_conntrack_confirm against get_next_corpse"
    vxlan: Fix boolean flip in VXLAN_F_UDP_ZERO_CSUM6_[TX|RX]
    ip6_udp_tunnel: Fix checksum calculation
    net-timestamp: Fix a documentation typo
    net/ping: handle protocol mismatching scenario
    af_packet: fix sparse warning
    ...

    Linus Torvalds
     

26 Nov, 2014

1 commit


23 Nov, 2014

1 commit

  • Pull vfs fixes from Al Viro:
    "Assorted fixes, most in overlayfs land"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    ovl: ovl_dir_fsync() cleanup
    ovl: update MAINTAINERS
    ovl: pass dentry into ovl_dir_read_merged()
    ovl: use lockless_dereference() for upperdentry
    ovl: allow filenames with comma
    ovl: fix race in private xattr checks
    ovl: fix remove/copy-up race
    ovl: rename filesystem type to "overlay"
    isofs: avoid unused function warning
    vfs: fix reference leak in d_prune_aliases()

    Linus Torvalds
     

22 Nov, 2014

2 commits

  • Pull devicetree fixes from Rob Herring:
    "DeviceTree fixes for 3.18:

    - two fixes for OF selftest code
    - fix for PowerPC address parsing to disable work-around except on
    old PowerMACs
    - fix a crash when earlycon is enabled, but no device is found
    - DT documentation fixes and missing vendor prefixes

    All but the doc updates are also for stable"

    * tag 'devicetree-fixes-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
    of/selftest: Fix testing when /aliases is missing
    of/selftest: Fix off-by-one error in removal path
    documentation: pinctrl bindings: Fix trivial typo 'abitrary'
    devicetree: bindings: Add vendor prefix for Micron Technology, Inc.
    of: Add vendor prefix for Chips&Media, Inc.
    of/base: Fix PowerPC address parsing hack
    devicetree: vendor-prefixes.txt: fix whitespace
    of: Fix crash if an earlycon driver is not found
    of/irq: Drop obsolete 'interrupts' vs 'interrupts-extended' text
    of: Spelling s/stucture/structure/
    devicetree: bindings: add sandisk to the vendor prefixes

    Linus Torvalds
     
  • Pull PCI fixes from Bjorn Helgaas:
    "These are fixes for an issue with 64-bit PCI bus addresses on 32-bit
    PAE kernels, an APM X-Gene problem (it depended on a generic change we
    removed before merging), a fix for my hotplug device configuration
    changes, and a devicetree documentation update.

    Resource management:
    - Support 64-bit bridge windows if we have 64-bit dma_addr_t (Yinghai Lu)

    PCI device hotplug:
    - Apply _HPX Link Control settings to all devices with a link (Yinghai Lu)

    Generic host bridge driver:
    - Add DT binding for "linux,pci-domain" property (Lucas Stach)

    APM X-Gene:
    - Assign resources to bus before adding new devices (Duc Dang)"

    * tag 'pci-v3.18-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
    PCI: Support 64-bit bridge windows if we have 64-bit dma_addr_t
    PCI: Apply _HPX Link Control settings to all devices with a link
    PCI: Add missing DT binding for "linux,pci-domain" property
    PCI: xgene: Assign resources to bus before adding new devices

    Linus Torvalds
     

20 Nov, 2014

1 commit

  • Some distributions carry an "old" format of overlayfs while mainline has a
    "new" format.

    The distros will possibly want to keep the old overlayfs alongside the new
    for compatibility reasons.

    To make it possible to differentiate the two versions change the name of
    the new one from "overlayfs" to "overlay".

    Signed-off-by: Miklos Szeredi
    Reported-by: Serge Hallyn
    Cc: Andy Whitcroft

    Miklos Szeredi
     

19 Nov, 2014

6 commits


15 Nov, 2014

2 commits

  • Pull input subsystem updates from Dmitry Torokhov:
    "Mostly small fixups to PS/2 tochpad drivers (ALPS, Elantech,
    Synaptics) to better deal with specific hardware"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: elantech - update the documentation
    Input: elantech - provide a sysfs knob for crc_enabled
    Input: elantech - report the middle button of the touchpad
    Input: alps - ignore bad data on Dell Latitudes E6440 and E7440
    Input: alps - allow up to 2 invalid packets without resetting device
    Input: alps - ignore potential bare packets when device is out of sync
    Input: elantech - fix crc_enabled for Fujitsu H730
    Input: elantech - use elantech_report_trackpoint for hardware v4 too
    Input: twl4030-pwrbutton - ensure a wakeup event is recorded.
    Input: synaptics - add min/max quirk for Lenovo T440s

    Linus Torvalds
     
  • Pull libata fixes from Tejun Heo:
    "The most notable is the revert of lock splitting optimization in ahci.
    This also made the IRQ handling threaded even when there's only one
    IRQ in use. The conversion missed IRFQ_SHARED leading to screaming
    IRQs problem in some cases and the threaded IRQ handling showed
    performance regression in some LKP test cases. The changes are
    reverted for now. It'll probably be retried once threaded IRQ
    handling is removed from ahci.

    Other than that, there's one fix for ahci and several patches adding
    device IDs"

    * 'for-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
    ahci: fix AHCI parameters not taken into account
    ata: sata_rcar: Add r8a7793 device support
    ahci: Add Device IDs for Intel Sunrise Point PCH
    ahci: disable MSI instead of NCQ on Samsung pci-e SSDs on macbooks
    Revert "AHCI: Optimize single IRQ interrupt processing"
    Revert "AHCI: Do not acquire ata_host::lock from single IRQ handler"
    ata: sata_rcar: Disable DIPM mode for r8a7790 ES1

    Linus Torvalds
     

14 Nov, 2014

3 commits

  • Pull networking fixes from David Miller:

    1) sunhme driver lacks DMA mapping error checks, based upon a report by
    Meelis Roos.

    2) Fix memory leak in mvpp2 driver, from Sudip Mukherjee.

    3) DMA memory allocation sizes are wrong in systemport ethernet driver,
    fix from Florian Fainelli.

    4) Fix use after free in mac80211 defragmentation code, from Johannes
    Berg.

    5) Some networking uapi headers missing from Kbuild file, from Stephen
    Hemminger.

    6) TUN driver gets csum_start offset wrong when VLAN accel is enabled,
    and macvtap has a similar bug, from Herbert Xu.

    7) Adjust several tunneling drivers to set dev->iflink after registry,
    because registry sets that to -1 overwriting whatever we did. From
    Steffen Klassert.

    8) Geneve forgets to set inner tunneling type, causing GSO segmentation
    to fail on some NICs. From Jesse Gross.

    9) Fix several locking bugs in stmmac driver, from Fabrice Gasnier and
    Giuseppe CAVALLARO.

    10) Fix spurious timeouts with NewReno on low traffic connections, from
    Marcelo Leitner.

    11) Fix descriptor updates in enic driver, from Govindarajulu
    Varadarajan.

    12) PPP calls bpf_prog_create() with locks held, which isn't kosher.
    Fix from Takashi Iwai.

    13) Fix NULL deref in SCTP with malformed INIT packets, from Daniel
    Borkmann.

    14) psock_fanout selftest accesses past the end of the mmap ring, fix
    from Shuah Khan.

    15) Fix PTP timestamping for VLAN packets, from Richard Cochran.

    16) netlink_unbind() calls in netlink pass wrong initial argument, from
    Hiroaki SHIMODA.

    17) vxlan socket reuse accidently reuses a socket when the address
    family is different, so we have to explicitly check this, from
    Marcelo Lietner.

    18) Fix missing include in nft_reject_bridge.c breaking the build on ppc
    and other architectures, from Guenter Roeck.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (75 commits)
    vxlan: Do not reuse sockets for a different address family
    smsc911x: power-up phydev before doing a software reset.
    lib: rhashtable - Remove weird non-ASCII characters from comments
    net/smsc911x: Fix delays in the PHY enable/disable routines
    net/smsc911x: Fix rare soft reset timeout issue due to PHY power-down mode
    netlink: Properly unbind in error conditions.
    net: ptp: fix time stamp matching logic for VLAN packets.
    cxgb4 : dcb open-lldp interop fixes
    selftests/net: psock_fanout seg faults in sock_fanout_read_ring()
    net: bcmgenet: apply MII configuration in bcmgenet_open()
    net: bcmgenet: connect and disconnect from the PHY state machine
    net: qualcomm: Fix dependency
    ixgbe: phy: fix uninitialized status in ixgbe_setup_phy_link_tnx
    net: phy: Correctly handle MII ioctl which changes autonegotiation.
    ipv6: fix IPV6_PKTINFO with v4 mapped
    net: sctp: fix memory leak in auth key management
    net: sctp: fix NULL pointer dereference in af->from_addr_param on malformed packet
    net: ppp: Don't call bpf_prog_create() in ppp_lock
    net/mlx4_en: Advertize encapsulation offloads features only when VXLAN tunnel is set
    cxgb4 : Fix bug in DCB app deletion
    ...

    Linus Torvalds
     
  • A chapter is added to describe the trackpoint packets.

    A section is added to describe the behaviour of the knob crc_enabled in
    sysfs.

    The introduction of the documentation only mentioned v1/v2, but in the
    last part it already contains explanation of v3 and v4. The introduction
    is updated.

    Signed-off-by: Ulrik De Bie
    Signed-off-by: Dmitry Torokhov

    Ulrik De Bie
     
  • 41e5c0f81d3e ("of/pci: Add pci_get_new_domain_nr() and
    of_get_pci_domain_nr()") added parsing of the "linux,pci-domain" property,
    but didn't add the binding documentation.

    Since this property will be supported by a number of host bridge drivers,
    add it to the common PCI binding doc.

    Fixes: 41e5c0f81d3e ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
    Signed-off-by: Lucas Stach
    Signed-off-by: Bjorn Helgaas
    Acked-by: Liviu Dudau
    Acked-by: Rob Herring

    Lucas Stach
     

10 Nov, 2014

1 commit

  • Pull USB fixes from Greg KH:
    "Here are some USB fixes for 3.18-rc4.

    Just a bunch of little fixes resolving reported issues and new device
    ids for existing drivers. Full details are in the shortlog"

    * tag 'usb-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (26 commits)
    USB: Update default usb-storage delay_use value in kernel-parameters.txt
    USB: cdc-acm: add quirk for control-line state requests
    phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly
    USB: storage: Fix timeout in usb_stor_euscsi_init() and usb_stor_huawei_e220_init()
    USB: cdc-acm: only raise DTR on transitions from B0
    Revert "storage: Replace magic number with define in usb_stor_euscsi_init()"
    usb: core: notify disconnection when core detects disconnect
    usb: core: need to call usb_phy_notify_connect after device setup
    uas: Add US_FL_NO_ATA_1X quirk for 2 more Seagate models
    xhci: no switching back on non-ULT Haswell
    USB: quirks: enable device-qualifier quirk for yet another Elan touchscreen
    USB: quirks: enable device-qualifier quirk for another Elan touchscreen
    MAINTAINERS: Remove duplicate entry for usbip driver
    usb: storage: fix build warnings !CONFIG_PM
    usb: Remove references to non-existent PLAT_S5P symbol
    uas: Add NO_ATA_1X for VIA VL711 devices
    xhci: Disable streams on Asmedia 1042 xhci controllers
    USB: HWA: fix a warning message
    uas: Add US_FL_NO_ATA_1X quirk for 1 more Seagate model
    usb-storage: handle a skipped data phase
    ...

    Linus Torvalds
     

09 Nov, 2014

1 commit

  • Pull media fixes from Mauro Carvalho Chehab:
    "For:
    - some regression fixes at the Remote Controller core and imon driver
    - a build fix for certain randconfigs with ir-hix5hd2
    - don't feed power to satellite system at ds3000 driver init

    It also contains some fixes for drivers added for Kernel 3.18:
    - some fixes at the new ISDB-S driver, and the corresponding bits to
    fix some descriptors for this Japanese TV standard at the DVB core
    - two warning cleanups for sp2 driver if PM is disabled
    - change the default mode for the new vivid driver"

    * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
    [media] sp2: sp2_init() can be static
    [media] dvb:tc90522: fix always-false expression
    [media] dvb-core: set default properties of ISDB-S
    [media] dvb:tc90522: fix stats report
    [media] vivid: default to single planar device instances
    [media] imon: fix other RC type protocol support
    [media] ir-hix5hd2 fix build warning
    [media] ds3000: fix LNB supply voltage on Tevii S480 on initialization
    [media] rc5-decoder: BZ#85721: Fix RC5-SZ decoding
    [media] rc-core: fix protocol_change regression in ir_raw_event_register

    Linus Torvalds
     

08 Nov, 2014

1 commit


06 Nov, 2014

1 commit


05 Nov, 2014

1 commit

  • Pull thermal fixes from Eduardo Valentin:
    "Specifics:
    - a few code fixes improving the Exynos code base. They remove dead
    and unreachable code. No functional changes here
    - in Exynos code base, fixes regarding the right usage of features
    (TRIMINFO and TRIMRELOAD)
    - documentation of RCAR thermal
    - fix in the of-thermal, regarding the proper usage of of-APIs
    - fixes on thermal-core, removal of unreachable code"

    [ Eduardo is sending the thermal fixes on behalf of Rui Zhang this time.
    Rui is currently unable to send pull requests due to troubles with his
    machine and he's currently in a business trip ]

    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
    Thermal:Remove usless if(!result) before return tz
    thermal: exynos: fix IRQ clearing on TMU initialization
    thermal: fix multiple disbalanced device node counters
    thermal: rcar: Add binding docs for new R-Car Gen2 SoCs
    thermal: exynos: Add support for TRIM_RELOAD feature at Exynos3250
    thermal: exynos: Add support for many TRIMINFO_CTRL registers
    thermal: samsung: Exynos5260 and Exynos5420 should not use TRIM_RELOAD flag
    thermal: exynos: remove identical values from exynos*_tmu_registers structures
    thermal: exynos: remove redundant pdata checks from exynos_tmu_control()
    thermal: exynos: cache non_hw_trigger_levels in pdata
    thermal: exynos: simplify temp_to_code() and code_to_temp()
    thermal: exynos: remove redundant threshold_code checks from exynos_tmu_initialize()
    thermal: exynos: remove redundant pdata checks from exynos_tmu_initialize()
    thermal: exynos: remove dead code for HW_MODE calibration
    thermal: exynos: remove unused struct exynos_tmu_registers entries

    Linus Torvalds
     

04 Nov, 2014

1 commit

  • The default used to be that the first vivid device instance was
    single planar, the second multi planar, the third single planar, etc.

    However, that turned out to be unexpected and awkward. Change the
    driver to always default to single planar.

    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     

03 Nov, 2014

1 commit


01 Nov, 2014

5 commits

  • Pull input updates from Dmitry Torokhov:
    "A bunch of fixes for minor defects reported by Coverity, a few driver
    fixups and revert of i8042.nomux change so that we are once again
    enable active MUX mode if box claims to support it"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Revert "Input: i8042 - disable active multiplexing by default"
    Input: altera_ps2 - use correct type for irq return value
    Input: altera_ps2 - write to correct register when disabling interrupts
    Input: max77693-haptic - fix potential overflow
    Input: psmouse - remove unneeded check in psmouse_reconnect()
    Input: vsxxxaa - fix code dropping bytes from queue
    Input: ims-pcu - fix dead code in ims_pcu_ofn_reg_addr_store()
    Input: opencores-kbd - fix error handling
    Input: wm97xx - adapt parameters to tosa touchscreen.
    Input: i8042 - quirks for Fujitsu Lifebook A544 and Lifebook AH544
    Input: stmpe-keypad - fix valid key line bitmask
    Input: soc_button_array - update calls to gpiod_get*()

    Linus Torvalds
     
  • Pull networking fixes from David Miller:
    "A bit has accumulated, but it's been a week or so since my last batch
    of post-merge-window fixes, so...

    1) Missing module license in netfilter reject module, from Pablo.
    Lots of people ran into this.

    2) Off by one in mac80211 baserate calculation, from Karl Beldan.

    3) Fix incorrect return value from ax88179_178a driver's set_mac_addr
    op, which broke use of it with bonding. From Ian Morgan.

    4) Checking of skb_gso_segment()'s return value was not all
    encompassing, it can return an SKB pointer, a pointer error, or
    NULL. Fix from Florian Westphal.

    This is crummy, and longer term will be fixed to just return error
    pointers or a real SKB.

    6) Encapsulation offloads not being handled by
    skb_gso_transport_seglen(). From Florian Westphal.

    7) Fix deadlock in TIPC stack, from Ying Xue.

    8) Fix performance regression from using rhashtable for netlink
    sockets. The problem was the synchronize_net() invoked for every
    socket destroy. From Thomas Graf.

    9) Fix bug in eBPF verifier, and remove the strong dependency of BPF
    on NET. From Alexei Starovoitov.

    10) In qdisc_create(), use the correct interface to allocate
    ->cpu_bstats, otherwise the u64_stats_sync member isn't
    initialized properly. From Sabrina Dubroca.

    11) Off by one in ip_set_nfnl_get_byindex(), from Dan Carpenter.

    12) nf_tables_newchain() was erroneously expecting error pointers from
    netdev_alloc_pcpu_stats(). It only returna a valid pointer or
    NULL. From Sabrina Dubroca.

    13) Fix use-after-free in _decode_session6(), from Li RongQing.

    14) When we set the TX flow hash on a socket, we mistakenly do so
    before we've nailed down the final source port. Move the setting
    deeper to fix this. From Sathya Perla.

    15) NAPI budget accounting in amd-xgbe driver was counting descriptors
    instead of full packets, fix from Thomas Lendacky.

    16) Fix total_data_buflen calculation in hyperv driver, from Haiyang
    Zhang.

    17) Fix bcma driver build with OF_ADDRESS disabled, from Hauke
    Mehrtens.

    18) Fix mis-use of per-cpu memory in TCP md5 code. The problem is
    that something that ends up being vmalloc memory can't be passed
    to the crypto hash routines via scatter-gather lists. From Eric
    Dumazet.

    19) Fix regression in promiscuous mode enabling in cdc-ether, from
    Olivier Blin.

    20) Bucket eviction and frag entry killing can race with eachother,
    causing an unlink of the object from the wrong list. Fix from
    Nikolay Aleksandrov.

    21) Missing initialization of spinlock in cxgb4 driver, from Anish
    Bhatt.

    22) Do not cache ipv4 routing failures, otherwise if the sysctl for
    forwarding is subsequently enabled this won't be seen. From
    Nicolas Cavallari"

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (131 commits)
    drivers: net: cpsw: Support ALLMULTI and fix IFF_PROMISC in switch mode
    drivers: net: cpsw: Fix broken loop condition in switch mode
    net: ethtool: Return -EOPNOTSUPP if user space tries to read EEPROM with lengh 0
    stmmac: pci: set default of the filter bins
    net: smc91x: Fix gpios for device tree based booting
    mpls: Allow mpls_gso to be built as module
    mpls: Fix mpls_gso handler.
    r8152: stop submitting intr for -EPROTO
    netfilter: nft_reject_bridge: restrict reject to prerouting and input
    netfilter: nft_reject_bridge: don't use IP stack to reject traffic
    netfilter: nf_reject_ipv6: split nf_send_reset6() in smaller functions
    netfilter: nf_reject_ipv4: split nf_send_reset() in smaller functions
    netfilter: nf_tables_bridge: update hook_mask to allow {pre,post}routing
    drivers/net: macvtap and tun depend on INET
    drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets
    drivers/net: Disable UFO through virtio
    net: skb_fclone_busy() needs to detect orphaned skb
    gre: Use inner mac length when computing tunnel length
    mlx4: Avoid leaking steering rules on flow creation error flow
    net/mlx4_en: Don't attempt to TX offload the outer UDP checksum for VXLAN
    ...

    Linus Torvalds
     
  • With legacy booting, the platform init code was taking care of
    the configuring of GPIOs. With device tree based booting, things
    may or may not work depending what bootloader has configured or
    if the legacy platform code gets called.

    Let's add support for the pwrdn and reset GPIOs to the smc91x
    driver to fix the issues of smc91x not working properly when
    booted in device tree mode.

    And let's change n900 to use these settings as some versions
    of the bootloader do not configure things properly causing
    errors.

    Reported-by: Kevin Hilman
    Signed-off-by: Tony Lindgren
    Signed-off-by: David S. Miller

    Tony Lindgren
     
  • Pull documentation fixes from Jonathan Corbet:
    "So this is my first pull request since I rashly agreed to look after
    the documentation subtree. It contains some typo fixes, a few minor
    documentation improvements, and, most importantly, fixes for a couple
    of build problems in various bits of sample code.

    I fully intend to start sending pull requests with signed tags.
    However, due to poor planning on my part and the general obnoxiousness
    of life, I'm 2000 miles away from my private key which is sitting on a
    powered-down machine. This should be fixed before my next request.

    Meanwhile git.lwn.net is a machine under my control, the patches are
    all trivial, and all have done time in linux-next"

    * tag 'docs-for-linus' of git://git.lwn.net/linux-2.6:
    Documentation/SubmittingPatches: Reported-by tags and permission
    Documentation: remove outdated references to the linux-next wiki
    Documentation: Restrict TSC test code to x86
    doc: kernel-parameters.txt: Add ide-generic.probe-mask
    vdso: don't require 64-bit math in standalone test
    Documentation: Add CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF case
    Documentation: Add default kmemleak off case in kernel-parameters.txt
    Docs: Document that the sticky bit is understood by hugetlbfs
    DocBook: Reduce noise from make cleandocs
    Documentation: fix vdso_standalone_test_x86 on 32-bit
    Documentation: dt-bindings: Explain order in patch series
    Documentation/ABI/testing/sysfs-ibft: fix a typo

    Linus Torvalds
     
  • This reverts commit 68da166491655bc54051bf04c78ce648e2e33508.

    It turns out that the assertion about scope of regressions due to
    always keeping keyboard controller in legacy mode was proven wrong.
    There are laptops, such as Clevo W650SH, that only have internal
    touchpad (no external PS/2 ports), that require active multiplexing
    mode to switch the touchpad (Elantech) into native mode instead of
    basic PS/2 emulation.

    Reported-by: Roel Aaij
    Signed-off-by: Dmitry Torokhov

    Dmitry Torokhov
     

31 Oct, 2014

1 commit

  • Pull sound fixes from Takashi Iwai:
    "Although the diffstat looks scary, it's just because of the removal of
    the dead code (s6000), thus it must not affect anything serious.

    Other than that, all small fixes. The only core fix is zero-clear for
    a PCM compat ioctl. The rest are driver-specific, bebob, sgtl500,
    adau1761, intel-sst, ad1889 and a few HD-audio quirks as usual"

    * tag 'sound-3.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: hda - Add workaround for CMI8888 snoop behavior
    ALSA: pcm: Zero-clear reserved fields of PCM status ioctl in compat mode
    ALSA: bebob: Uninitialized id returned by saffirepro_both_clk_src_get
    ALSA: hda/realtek - New SSID for Headset quirk
    ALSA: ad1889: Fix probable mask then right shift defects
    ALSA: bebob: fix wrong decoding of clock information for Terratec PHASE 88 Rack FW
    ALSA: hda/realtek - Update restore default value for ALC283
    ALSA: hda/realtek - Update restore default value for ALC282
    ASoC: fsl: use strncpy() to prevent copying of over-long names
    ASoC: adau1761: Fix input PGA volume
    ASoC: s6000: remove driver
    ASoC: Intel: HSW/BDW only support S16 and S24 formats.
    ASoC: sgtl500: Document the required supplies

    Linus Torvalds
     

29 Oct, 2014

1 commit


28 Oct, 2014

4 commits

  • The linux-next wiki at http://linux.f-seidel.de/linux-next/pmwiki has
    been gone for several months now.

    Signed-off-by: Jim Davis
    Signed-off-by: Jonathan Corbet

    Jim Davis
     
  • The prctl test code in Documentation/ tries to show how to
    use a call that only makes sense on x86. Restrict it there
    so that other platforms don't try to call asm("rdtsc").

    Signed-off-by: Alexander Graf
    Acked-by: Peter Foley
    Signed-off-by: Jonathan Corbet

    Alexander Graf
     
  • Signed-off-by: Koji Matsuoka
    Signed-off-by: Yoshihiro Kaneko
    Signed-off-by: Tejun Heo

    Koji Matsuoka
     
  • Pull media fixes from Mauro Carvalho Chehab:
    "A series of driver fixes:
    - a few compilation fixes with randconfigs
    - one potential compilation breakage on userspace due to the usage of
    a gcc extension
    - several warnings fixed
    - some other random driver fixes"

    * tag 'media/v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (22 commits)
    [media] s5p-jpeg: Avoid -Wuninitialized warning in s5p_jpeg_parse_hdr
    [media] s5p-fimc: Only build suspend/resume for PM
    [media] s5p-jpeg: Only build suspend/resume for PM
    [media] Remove references to non-existent PLAT_S5P symbol
    [media] videobuf-dma-contig: set vm_pgoff to be zero to pass the sanity check in vm_iomap_memory()
    [media] tw68: remove bogus I2C_ALGOBIT dependency
    [media] usbvision-video: two use after frees
    [media] tw68: remove deprecated IRQF_DISABLED
    [media] xc5000: use after free in release()
    [media] em28xx-input: NULL dereference on error
    [media] wl128x: fix fmdbg compiler warning
    Revert "[media] v4l2-dv-timings: fix a sparse warning"
    [media] hackrf: harmless off by one in debug code
    [media] cx23885: initialize config structs for T9580
    [media] v4l: uvcvideo: Fix buffer completion size check
    [media] vivid: fix buffer overrun
    [media] saa7146: Create a device name before it's used
    [media] em28xx: fix uninitialized variable warning
    [media] vivid: fix Kconfig FB dependency
    [media] anysee: make sure loading modules is const
    ...

    Linus Torvalds
     

27 Oct, 2014

3 commits