1. 27 Jan, 2014 6 commits
  2. 26 Jan, 2014 6 commits
  3. 25 Jan, 2014 15 commits
    • Linus Torvalds's avatar
      Merge branch 'ipmi' (ipmi patches from Corey Minyard) · b2e448ec
      Linus Torvalds authored
      Merge ipmi fixes from Corey Minyard:
       "Just some collected fixes for 3.14.  Nothing huge"
      * emailed patches from Corey Minyard <minyard@acm.org>:
        ipmi: Cleanup error return
        ipmi: fix timeout calculation when bmc is disconnected
        ipmi: use USEC_PER_SEC instead of 1000000 for more meaningful
        ipmi: remove deprecated IRQF_DISABLED
    • Corey Minyard's avatar
      ipmi: Cleanup error return · d02b3709
      Corey Minyard authored
      Return proper errors for a lot of IPMI failure cases.  Also call
      pci_disable_device when IPMI PCI devices are removed.
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Xie XiuQi's avatar
      ipmi: fix timeout calculation when bmc is disconnected · e21404dc
      Xie XiuQi authored
      Loading ipmi_si module while bmc is disconnected, we found the timeout
      is longer than 5 secs.  Actually it takes about 3 mins and 20
      error message as below:
        Dec 12 19:08:59 linux kernel: IPMI BT: timeout in RD_WAIT [ ] 1 retries left
        Dec 12 19:08:59 linux kernel: BT: write 4 bytes seq=0x01 03 18 00 01
        Dec 12 19:12:19 linux kernel: IPMI BT: timeout in RD_WAIT [ ]
        Dec 12 19:12:19 linux kernel: failed 2 retries, sending error response
        Dec 12 19:12:19 linux kernel: IPMI: BT reset (takes 5 secs)
        Dec 12 19:12:19 linux kernel: IPMI BT: flag reset [ ]
      Function wait_for_msg_done() use schedule_timeout_uninterruptible(1) to
      sleep 1 tick, so we should subtract jiffies_to_usecs(1) instead of 100
      usecs from timeout.
      Reported-by: default avatarHu Shiyuan <hushiyuan@huawei.com>
      Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Xie XiuQi's avatar
      ipmi: use USEC_PER_SEC instead of 1000000 for more meaningful · ccb3368c
      Xie XiuQi authored
      Use USEC_PER_SEC instead of 1000000, that making the later bugfix
      more clearly.
      Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Michael Opdenacker's avatar
      ipmi: remove deprecated IRQF_DISABLED · aa5b2bab
      Michael Opdenacker authored
      This patch proposes to remove the use of the IRQF_DISABLED flag
      It's a NOOP since 2.6.35 and it will be removed one day.
      Signed-off-by: default avatarMichael Opdenacker <michael.opdenacker@free-electrons.com>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 2d2e7d19
      Linus Torvalds authored
      Pull spi updates from Mark Brown:
       "A respun version of the merges for the pull request previously sent
        with a few additional fixes.  The last two merges were fixed up by
        hand since the branches have moved on and currently have the prior
        merge in them.
        Quite a busy release for the SPI subsystem, mostly in cleanups big and
        small scattered through the stack rather than anything else:
         - New driver for the Broadcom BC63xx HSSPI controller
         - Fix duplicate device registration for ACPI
         - Conversion of s3c64xx to DMAEngine (this pulls in platform and DMA
           changes upon which the transiton depends)
         - Some small optimisations to reduce the amount of time we hold locks
           in the datapath, eliminate some redundant checks and the size of a
         - Lots of fixes, cleanups and general enhancements to drivers,
           especially the rspi and Atmel drivers"
      * tag 'spi-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (112 commits)
        spi: core: Fix transfer failure when master->transfer_one returns positive value
        spi: Correct set_cs() documentation
        spi: Clarify transfer_one() w.r.t. spi_finalize_current_transfer()
        spi: Spelling s/finised/finished/
        spi: sc18is602: Convert to use bits_per_word_mask
        spi: Remove duplicate code to set default bits_per_word setting
        spi/pxa2xx: fix compilation warning when !CONFIG_PM_SLEEP
        spi: clps711x: Add MODULE_ALIAS to support module auto-loading
        spi: rspi: Add missing clk_disable() calls in error and cleanup paths
        spi: rspi: Spelling s/transmition/transmission/
        spi: rspi: Add support for specifying CPHA/CPOL
        spi/pxa2xx: initialize DMA channels to -1 to prevent inadvertent match
        spi: rspi: Add more QSPI register documentation
        spi: rspi: Add more RSPI register documentation
        spi: rspi: Remove dependency on DMAE for SHMOBILE
        spi/s3c64xx: Correct indentation
        spi: sh: Use spi_sh_clear_bit() instead of open-coded
        spi: bitbang: Grammar s/make to make/to make/
        spi: sh-hspi: Spelling s/recive/receive/
        spi: core: Improve tx/rx_nbits check comments
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 15333539
      Linus Torvalds authored
      Pull regulator updates from Mark Brown:
       "A respin of the merges in the previous pull request with one extra
        A quiet release for the regulator API, quite a large number of small
        improvements all over but other than the addition of new drivers for
        the AS3722 and MAX14577 there is nothing of substantial non-local
      * tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (47 commits)
        regulator: pfuze100-regulator: Improve dev_info() message
        regulator: pfuze100-regulator: Fix some checkpatch complaints
        regulator: twl: Fix checkpatch issue
        regulator: core: Fix checkpatch issue
        regulator: anatop-regulator: Remove unneeded memset()
        regulator: s5m8767: Update LDO index in s5m8767-regulator.txt
        regulator: as3722: set enable time for SD0/1/6
        regulator: as3722: detect SD0 low-voltage mode
        regulator: tps62360: Fix up a pointer-integer size mismatch warning
        regulator: anatop-regulator: Remove unneeded kstrdup()
        regulator: act8865: Fix build error when !OF
        regulator: act8865: register all regulators regardless of how many are used
        regulator: wm831x-dcdc: Remove unneeded 'err' label
        regulator: anatop-regulator: Add MODULE_ALIAS()
        regulator: act8865: fix incorrect devm_kzalloc for act8865
        regulator: act8865: Remove set_suspend_[en|dis]able implementation
        regulator: act8865: Remove unneeded regulator_unregister() calls
        regulator: s2mps11: Clean up redundant code
        regulator: tps65910: Simplify setting enable_mask for regulators
        regulator: act8865: add device tree binding doc
    • Linus Torvalds's avatar
      Merge tag 'regmap-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · bb1b6490
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "Nothing terribly exciting with regmap this release, mainly a few small
        extensions to allow more devices to be supported:
         - Allow the bulk I/O APIs to be used with no-bus regmaps
         - Support interrupt controllers with zero ack base
         - Warning and spelling fixes"
      * tag 'regmap-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: fix a couple of typos
        regmap: Allow regmap_bulk_write() to work for "no-bus" regmaps
        regmap: Allow regmap_bulk_read() to work for "no-bus" regmaps
        regmap: irq: Allow using zero value for ack_base
        regmap: Fix 'ret' would return an uninitialized value
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 4ba9920e
      Linus Torvalds authored
      Pull networking updates from David Miller:
       1) BPF debugger and asm tool by Daniel Borkmann.
       2) Speed up create/bind in AF_PACKET, also from Daniel Borkmann.
       3) Correct reciprocal_divide and update users, from Hannes Frederic
          Sowa and Daniel Borkmann.
       4) Currently we only have a "set" operation for the hw timestamp socket
          ioctl, add a "get" operation to match.  From Ben Hutchings.
       5) Add better trace events for debugging driver datapath problems, also
          from Ben Hutchings.
       6) Implement auto corking in TCP, from Eric Dumazet.  Basically, if we
          have a small send and a previous packet is already in the qdisc or
          device queue, defer until TX completion or we get more data.
       7) Allow userspace to manage ipv6 temporary addresses, from Jiri Pirko.
       8) Add a qdisc bypass option for AF_PACKET sockets, from Daniel
       9) Share IP header compression code between Bluetooth and IEEE802154
          layers, from Jukka Rissanen.
      10) Fix ipv6 router reachability probing, from Jiri Benc.
      11) Allow packets to be captured on macvtap devices, from Vlad Yasevich.
      12) Support tunneling in GRO layer, from Jerry Chu.
      13) Allow bonding to be configured fully using netlink, from Scott
      14) Allow AF_PACKET users to obtain the VLAN TPID, just like they can
          already get the TCI.  From Atzm Watanabe.
      15) New "Heavy Hitter" qdisc, from Terry Lam.
      16) Significantly improve the IPSEC support in pktgen, from Fan Du.
      17) Allow ipv4 tunnels to cache routes, just like sockets.  From Tom
      18) Add Proportional Integral Enhanced packet scheduler, from Vijay
      19) Allow openvswitch to mmap'd netlink, from Thomas Graf.
      20) Key TCP metrics blobs also by source address, not just destination
          address.  From Christoph Paasch.
      21) Support 10G in generic phylib.  From Andy Fleming.
      22) Try to short-circuit GRO flow compares using device provided RX
          hash, if provided.  From Tom Herbert.
      The wireless and netfilter folks have been busy little bees too.
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2064 commits)
        net/cxgb4: Fix referencing freed adapter
        ipv6: reallocate addrconf router for ipv6 address when lo device up
        fib_frontend: fix possible NULL pointer dereference
        rtnetlink: remove IFLA_BOND_SLAVE definition
        rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info
        qlcnic: update version to 5.3.55
        qlcnic: Enhance logic to calculate msix vectors.
        qlcnic: Refactor interrupt coalescing code for all adapters.
        qlcnic: Update poll controller code path
        qlcnic: Interrupt code cleanup
        qlcnic: Enhance Tx timeout debugging.
        qlcnic: Use bool for rx_mac_learn.
        bonding: fix u64 division
        rtnetlink: add missing IFLA_BOND_AD_INFO_UNSPEC
        sfc: Use the correct maximum TX DMA ring size for SFC9100
        Add Shradha Shah as the sfc driver maintainer.
        net/vxlan: Share RX skb de-marking and checksum checks with ovs
        tulip: cleanup by using ARRAY_SIZE()
        ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called
        net/cxgb4: Don't retrieve stats during recovery
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 82c47766
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "A handful of tooling fixes"
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf symbols: Load map before using map->map_ip()
        perf tools: Fix traceevent plugin path definitions
        perf symbols: Fix JIT symbol resolution on heap
        perf stat: Fix memory corruption of xyarray when cpumask is used
        perf evsel: Remove duplicate member zeroing after free
        perf tools: Ensure sscanf does not overrun the "mem" field
        perf stat: fix NULL pointer reference bug with event unit
        perf tools: Add support for the xtensa architecture
        perf session: Free cpu_map in perf_session__cpu_bitmap
        perf timechart: Fix wrong SVG height
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f6d13daa
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "A couple of regression fixes mostly hitting virtualized setups, but
        also some bare metal systems"
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/x86/tsc: Initialize multiplier to 0
        sched/clock: Fixup early initialization
        sched/preempt/x86: Fix voluntary preempt for x86
        Revert "sched: Fix sleep time double accounting in enqueue entity"
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · d4a63a83
      Linus Torvalds authored
      Pull user namespaces work from Eric Biederman:
       "The work to convert the kernel to use kuid_t and kgid_t has been
        finished since 3.12 so it is time to remove the scaffolding that
        allowed the work to progress incrementally.
        The first patch on this branch just removes the scaffolding, ensuring
        we will always get compile errors if people accidentally try the
        userspace and the kernel uid and gid types.  The second patch an
        overlooked and unused chunk of mips code that that fails to build
        after the first patch.
        The code hasn't been in linux-next for long (as I was out of it and
        could not sheppared the cold properly) but the patch has been around
        for a long time just waiting for the day when I had finished the
        uid/gid conversions.  Putting the code in linux-next did find the
        compile failure on mips so I took the time to get that fix reviewed
        and included.  Beyond that I am not too worried about errors because
        all these two patches do is delete a modest amount of code"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        MIPS: VPE: Remove vpe_getuid and vpe_getgid
        userns:  userns: Remove UIDGID_STRICT_TYPE_CHECKS
    • Linus Torvalds's avatar
      Merge tag 'arc-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · 7ae0e06b
      Linus Torvalds authored
      Pull ARC changes from Vineet Gupta:
       - IPI optimization and cleanups
       - Support for bootloader provided external Device Tree blobs
      * tag 'arc-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: [cmdline] support External Device Trees from u-boot
        ARC: [cmdline] uboot cmdline handling rework
        ARC: [SMP] optimize IPI send and receive
        ARC: [SMP] simplify IPI code
        ARC: [SMP] cpu halt interface doesn't need "self" cpu-id
        ARC: [SMP] IPI ACK interface doesn't need "self" cpu-id
        ARC: [SMP] cpumask not needed in IPI send path
    • Linus Torvalds's avatar
      Merge tag 'xtensa-next-20140123' of git://github.com/czankel/xtensa-linux · 9b83d851
      Linus Torvalds authored
      Pull Xtensa patches from Chris Zankel:
       "The major changes are adding support for SMP for Xtensa, fixing and
        cleaning up the ISS (simulator) network driver, and better support for
        device trees"
      * tag 'xtensa-next-20140123' of git://github.com/czankel/xtensa-linux: (40 commits)
        xtensa: implement ndelay
        xtensa: clean up udelay
        xtensa: enable HAVE_PERF_EVENTS
        xtensa: remap io area defined in device tree
        xtensa: support default device tree buses
        xtensa: initialize device tree clock sources
        xtensa: xtfpga: fix definitions of platform devices
        xtensa: standardize devicetree cpu compatible strings
        xtensa: avoid duplicate of IO range definitions
        xtensa: fix ATOMCTL register documentation
        xtensa: Enable irqs after cpu is set online
        xtensa: ISS: raise network polling rate to 10 times/sec
        xtensa: remove unused XTENSA_ISS_NETWORK Kconfig parameter
        xtensa: ISS: avoid simple_strtoul usage
        xtensa: Switch to sched_clock_register()
        xtensa: implement CPU hotplug
        xtensa: add SMP support
        xtensa: add MX irqchip
        xtensa: clear timer IRQ unconditionally in its handler
        xtensa: clean up do_interrupt/do_IRQ
    • Ingo Molnar's avatar
      Merge tag 'perf-urgent-for-mingo' of... · 993e5ee6
      Ingo Molnar authored
      Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
        * Fix traceevent plugin path definitions (Josh Boyer)
        * Load map before using map->map_ip() (Masami Hiramatsu)
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
  4. 24 Jan, 2014 13 commits
    • Linus Torvalds's avatar
      Merge tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio · 2d08cd0e
      Linus Torvalds authored
      Pull vfio update from Alex Williamson:
       - convert to misc driver to support module auto loading
       - remove unnecessary and dangerous use of device_lock
      * tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio:
        vfio-pci: Don't use device_lock around AER interrupt setup
        vfio: Convert control interface to misc driver
        misc: Reserve minor for VFIO
    • Linus Torvalds's avatar
      Merge tag 'md/3.14' of git://neil.brown.name/md · 5c85121b
      Linus Torvalds authored
      Pull md updates from Neil Brown:
       "All bug fixes, two tagged for -stable"
      * tag 'md/3.14' of git://neil.brown.name/md:
        md/raid5: close recently introduced race in stripe_head management.
        md/raid5: fix long-standing problem with bitmap handling on write failure.
        md: check command validity early in md_ioctl().
        md: ensure metadata is writen after raid level change.
        md/raid10: avoid fullsync when not necessary.
        md: allow a partially recovered device to be hot-added to an array.
        md: Change handling of save_raid_disk and metadata update during recovery.
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 4d8880a0
      Linus Torvalds authored
      Pull devicetree updates from Rob Herring:
       - Add new documents with guidelines for DT binding stability and review
         process.  This is one of the outcomes of Kernel Summit DT discussions
       - Remove a bunch of device_type usage which is only for OF and
         deprecated with FDT
       - Fix a long standing issue with compatible string match ordering
       - Various minor binding documentation updates
      * tag 'devicetree-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        dt-bindings: add rockchip vendor prefix
        serial: vt8500: Add missing binding document for arch-vt8500 serial driver.
        dt/bindings: submitting patches and ABI documents
        DT: Add vendor prefix for Emerging Display Technologies
        of: add vendor prefixe for EPFL
        of: add vendor prefix for Gumstix
        of: add vendor prefix for Ka-Ro electronics GmbH
        devicetree: macb: Document clock properties
        dts: bindings: trivial clock bindings doc fixes
        of: Fix __of_device_is_available check
        dt/bindings: Remove device_type "serial" from marvell,mv64360-mpsc
        dt/bindings: remove device_type "network" references
        dt/bindings: remove users of device_type "mdio"
        dt/bindings: Remove references to linux,phandle properties
        dt/bindings: Remove all references to device_type "ethernet-phy"
        of: irq: Ignore disabled intc's when searching map
        of: irq: Ignore disabled interrupt controllers
        OF: base: match each node compatible against all given matches first
        dt-bindings: add GIC-400 binding
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 8e585a6c
      Linus Torvalds authored
      Pull infiniband updates from Roland Dreier:
       "Main batch of InfiniBand/RDMA changes for 3.14:
         - Flow steering for InfiniBand UD traffic
         - IP-based addressing for IBoE aka RoCE
         - Pass SRP submaintainership from Dave to Bart
         - SRP transport fixes from Bart
         - Add the new Cisco usNIC low-level device driver
         - Various other fixes"
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (75 commits)
        IB/mlx5: Verify reserved fields are cleared
        IB/mlx5: Remove old field for create mkey mailbox
        IB/mlx5: Abort driver cleanup if teardown hca fails
        IB/mlx5: Allow creation of QPs with zero-length work queues
        mlx5_core: Fix PowerPC support
        mlx5_core: Improve debugfs readability
        IB/mlx5: Add support for resize CQ
        IB/mlx5: Implement modify CQ
        IB/mlx5: Make sure doorbell record is visible before doorbell
        mlx5_core: Use mlx5 core style warning
        IB/mlx5: Clear out struct before create QP command
        mlx5_core: Fix out arg size in access_register command
        RDMA/nes: Slight optimization of Ethernet address compare
        IB/qib: Fix QP check when looping back to/from QP1
        RDMA/cxgb4: Fix gcc warning on 32-bit arch
        IB/usnic: Remove unused includes of <linux/version.h>
        RDMA/amso1100: Add check if cache memory was allocated before freeing it
        IPoIB: Report operstate consistently when brought up without a link
        IB/core: Fix unused variable warning
        RDMA/cma: Handle global/non-linklocal IPv6 addresses in cma_check_linklocal()
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 1b59bab5
      Linus Torvalds authored
      Pull input subsystem updates from Dmitry Torokhov:
       "Just a swath of driver fixes and cleanups, no new drivers this time
        (although ALPS now supports one of the newer protocols, more to come)"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
        Input: wacom - add support for DTU-1031
        Input: wacom - fix wacom->shared guards for dual input devices
        Input: edt_ft5x06 - use devm_* functions where appropriate
        Input: hyperv-keyboard - pass through 0xE1 prefix
        Input: logips2pp - fix spelling s/reciver/receiver/
        Input: delete non-required instances of include <linux/init.h>
        Input: twl4030-keypad - convert to using managed resources
        Input: twl6040-vibra - remove unneeded check for CONFIG_OF
        Input: twl4030-keypad - add device tree support
        Input: twl6040-vibra - add missing of_node_put
        Input: twl4030-vibra - add missing of_node_put
        Input: i8042 - cleanup SERIO_I8042 dependencies
        Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on x86
        Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on unicore32
        Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on sparc
        Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO for SH_CAYMAN
        Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on powerpc
        Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on mips
        Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on IA64
        Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on ARM/Footbridge
    • Linus Torvalds's avatar
      Merge tag 'fbdev-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · b788769e
      Linus Torvalds authored
      Pull fbdev changes from Tomi Valkeinen:
       "This is a rather boring pull request.  There is one new fb driver,
        OpenCores VGA/LCD, but other than that it's just minor cleanups and
      * tag 'fbdev-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (51 commits)
        i810: delete useless variable
        video: add OpenCores VGA/LCD framebuffer driver
        video/logo: Remove MIPS-specific include section
        tgafb: potential NULL dereference in init
        video: mmp: Using plain integer as NULL pointer
        video: mmp: delete a stray mutex_unlock()
        video: amba-clcd: Make CLCD driver available on more platforms
        video: Replace local macro with PCI standard macro
        fbmem: really support wildcard video=options for all fbdev drivers
        video: vgacon: Don't build on arm64
        video: mx3fb: Allow blocking during framebuffer allocation
        fbcon: Fix memory leak in fbcon_exit().
        fbcon: trivial optimization for fbcon_exit
        video: pxa168fb: Cleanup pxa168fb.h file
        video: pxa: Cleanup video-pxafb.h header
        video: msm: Cleanup video-msm_fb.h header
        video: ep93xx: Cleanup video-ep93xx.h header
        video: mxsfb: fix broken videomode selection
        video: mxsfb: convert pr_debug()/dev_dbg() to pr_err()/dev_err() for error messages
        video: vmlfb: remove unnecessary pci_set_drvdata()
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 91466574
      Linus Torvalds authored
      Pull thermal management updates from Zhang Rui:
       "This time, the biggest change is the work of representing hardware
        thermal properties in device tree infrastructure.
        This work includes the introduction of a device tree bindings for
        describing the hardware thermal behavior and limits, and also a parser
        to read and interpret the data, and build thermal zones and thermal
        binding parameters.  It also contains three examples on how to use the
        new representation on sensor devices, using three different drivers to
        accomplish it.  One driver is in thermal subsystem, the TI SoC
        thermal, and the other two drivers are in hwmon subsystem.
        Actually, this would be the first step of the complete work because we
        still need to check other potential drivers to be converted and then
        validate the proposed API.  But the reason why I include it in this
        pull request is that, first, this change does not hurt any others
        without using this approach, second, the principle and concept of this
        change would not break after converting the remaining drivers.  BTW,
        as you can see, there are several points in this change that do not
        belong to thermal subsystem.  Because it has been suggested by Guenter
        R that in such cases, it is recommended to send the complete series
        via one single subsystem.
         - representing hardware thermal properties in device tree
         - fix a regression that the imx thermal driver breaks system suspend.
         - introduce ACPI INT3403 thermal driver to retrieve temperature data
           from the INT3403 ACPI device object present on some systems.
         - introduce debug statement for thermal core and step_wise governor.
         - assorted fixes and cleanups for thermal core, cpu cooling, exynos
           thrmal, intel powerclamp and imx thermal driver"
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (34 commits)
        thermal: remove const flag from .ops of imx thermal
        Thermal: update thermal zone device after setting emul_temp
        intel_powerclamp: Fix cstate counter detection.
        thermal: imx: add necessary clk operation
        Thermal cpu cooling: return error if no valid cpu frequency entry
        thermal: fix cpu_cooling max_level behavior
        thermal: rcar-thermal: Enable driver compilation with COMPILE_TEST
        thermal: debug: add debug statement for core and step_wise
        thermal: imx_thermal: add module device table
        drivers: thermal: Mark function as static in x86_pkg_temp_thermal.c
        thermal:samsung: fix compilation warning
        thermal: imx: correct suspend/resume flow
        thermal: exynos: fix error return code
        Thermal: ACPI INT3403 thermal driver
        MAINTAINERS: add thermal bindings entry in thermal domain
        arm: dts: make OMAP4460 bandgap node to belong to OCP
        arm: dts: make OMAP443x bandgap node to belong to OCP
        arm: dts: add cooling properties on omap5 cpu node
        arm: dts: add omap5 thermal data
        arm: dts: add omap5 CORE thermal data
    • Gavin Shan's avatar
      net/cxgb4: Fix referencing freed adapter · 8b662fe7
      Gavin Shan authored
      The adapter is freed before we check its flags. It was caused
      by commit 144be3d9 ("net/cxgb4: Avoid disabling PCI device for
      towice"). The problem was reported by Intel's "0-day" tool.
      The patch fixes it to avoid reverting commit 144be3d9.
      Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Gao feng's avatar
      ipv6: reallocate addrconf router for ipv6 address when lo device up · 33d99113
      Gao feng authored
      commit 25fb6ca4
      "net IPv6 : Fix broken IPv6 routing table after loopback down-up"
      allocates addrconf router for ipv6 address when lo device up.
      but commit a881ae1f
      "ipv6:don't call addrconf_dst_alloc again when enable lo" breaks
      this behavior.
      Since the addrconf router is moved to the garbage list when
      lo device down, we should release this router and rellocate
      a new one for ipv6 address when lo device up.
      This patch solves bug 67951 on bugzilla
      change from v1:
      use ip6_rt_put to repleace ip6_del_rt, thanks Hannes!
      change code style, suggested by Sergei.
      CC: Sabrina Dubroca <sd@queasysnail.net>
      CC: Hannes Frederic Sowa <hannes@stressinduktion.org>
      Reported-by: default avatarWeilong Chen <chenweilong@huawei.com>
      Signed-off-by: default avatarWeilong Chen <chenweilong@huawei.com>
      Signed-off-by: default avatarGao feng <gaofeng@cn.fujitsu.com>
      Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Oliver Hartkopp's avatar
      fib_frontend: fix possible NULL pointer dereference · a0065f26
      Oliver Hartkopp authored
      The two commits 0115e8e3 (net: remove delay at device dismantle) and
      748e2d93 (net: reinstate rtnl in call_netdevice_notifiers()) silently
      removed a NULL pointer check for in_dev since Linux 3.7.
      This patch re-introduces this check as it causes crashing the kernel when
      setting small mtu values on non-ip capable netdevices.
      Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
      Acked-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 09da8dfa
      Linus Torvalds authored
      Pull ACPI and power management updates from Rafael Wysocki:
       "As far as the number of commits goes, the top spot belongs to ACPI
        this time with cpufreq in the second position and a handful of PM
        core, PNP and cpuidle updates.  They are fixes and cleanups mostly, as
        usual, with a couple of new features in the mix.
        The most visible change is probably that we will create struct
        acpi_device objects (visible in sysfs) for all devices represented in
        the ACPI tables regardless of their status and there will be a new
        sysfs attribute under those objects allowing user space to check that
        status via _STA.
        Consequently, ACPI device eject or generally hot-removal will not
        delete those objects, unless the table containing the corresponding
        namespace nodes is unloaded, which is extremely rare.  Also ACPI
        container hotplug will be handled quite a bit differently and cpufreq
        will support CPU boost ("turbo") generically and not only in the
        acpi-cpufreq driver.
         - ACPI core changes to make it create a struct acpi_device object for
           every device represented in the ACPI tables during all namespace
           scans regardless of the current status of that device.  In
           accordance with this, ACPI hotplug operations will not delete those
           objects, unless the underlying ACPI tables go away.
         - On top of the above, new sysfs attribute for ACPI device objects
           allowing user space to check device status by triggering the
           execution of _STA for its ACPI object.  From Srinivas Pandruvada.
         - ACPI core hotplug changes reducing code duplication, integrating
           the PCI root hotplug with the core and reworking container hotplug.
         - ACPI core simplifications making it use ACPI_COMPANION() in the
           code "glueing" ACPI device objects to "physical" devices.
         - ACPICA update to upstream version 20131218.  This adds support for
           the DBG2 and PCCT tables to ACPICA, fixes some bugs and improves
           debug facilities.  From Bob Moore, Lv Zheng and Betty Dall.
         - Init code change to carry out the early ACPI initialization
           earlier.  That should allow us to use ACPI during the timekeeping
           initialization and possibly to simplify the EFI initialization too.
           From Chun-Yi Lee.
         - Clenups of the inclusions of ACPI headers in many places all over
           from Lv Zheng and Rashika Kheria (work in progress).
         - New helper for ACPI _DSM execution and rework of the code in
           drivers that uses _DSM to execute it via the new helper.  From
           Jiang Liu.
         - New Win8 OSI blacklist entries from Takashi Iwai.
         - Assorted ACPI fixes and cleanups from Al Stone, Emil Goode, Hanjun
           Guo, Lan Tianyu, Masanari Iida, Oliver Neukum, Prarit Bhargava,
           Rashika Kheria, Tang Chen, Zhang Rui.
         - intel_pstate driver updates, including proper Baytrail support,
           from Dirk Brandewie and intel_pstate documentation from Ramkumar
         - Generic CPU boost ("turbo") support for cpufreq from Lukasz
         - powernow-k6 cpufreq driver fixes from Mikulas Patocka.
         - cpufreq core fixes and cleanups from Viresh Kumar, Jane Li, Mark
         - Assorted cpufreq drivers fixes and cleanups from Anson Huang, John
           Tobias, Paul Bolle, Paul Walmsley, Sachin Kamat, Shawn Guo, Viresh
         - cpuidle cleanups from Bartlomiej Zolnierkiewicz.
         - Support for hibernation APM events from Bin Shi.
         - Hibernation fix to avoid bringing up nonboot CPUs with ACPI EC
           disabled during thaw transitions from Bjørn Mork.
         - PM core fixes and cleanups from Ben Dooks, Leonardo Potenza, Ulf
         - PNP subsystem fixes and cleanups from Dmitry Torokhov, Levente
           Kurusa, Rashika Kheria.
         - New tool for profiling system suspend from Todd E Brandt and a
           cpupower tool cleanup from One Thousand Gnomes"
      * tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (153 commits)
        thermal: exynos: boost: Automatic enable/disable of BOOST feature (at Exynos4412)
        cpufreq: exynos4x12: Change L0 driver data to CPUFREQ_BOOST_FREQ
        Documentation: cpufreq / boost: Update BOOST documentation
        cpufreq: exynos: Extend Exynos cpufreq driver to support boost
        cpufreq / boost: Kconfig: Support for software-managed BOOST
        acpi-cpufreq: Adjust the code to use the common boost attribute
        cpufreq: Add boost frequency support in core
        intel_pstate: Add trace point to report internal state.
        cpufreq: introduce cpufreq_generic_get() routine
        ARM: SA1100: Create dummy clk_get_rate() to avoid build failures
        cpufreq: stats: create sysfs entries when cpufreq_stats is a module
        cpufreq: stats: free table and remove sysfs entry in a single routine
        cpufreq: stats: remove hotplug notifiers
        cpufreq: stats: handle cpufreq_unregister_driver() and suspend/resume properly
        cpufreq: speedstep: remove unused speedstep_get_state
        platform: introduce OF style 'modalias' support for platform bus
        PM / tools: new tool for suspend/resume performance optimization
        ACPI: fix module autoloading for ACPI enumerated devices
        ACPI: add module autoloading support for ACPI enumerated devices
        ACPI: fix create_modalias() return value handling
    • David S. Miller's avatar
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next · 322b1f79
      David S. Miller authored
      John W. Linville says:
      Please pull these fixes for the 3.14 stream!
      For the iwlwifi fix, Emmanuel says:
      "A critical bug has been reported on all NICs supported by iwldvm.
      iwlwifi would simply panic upon interface up This patch fixes this. The
      offending code is by me and is present in wireless-next.git and hence in
      Along with that...
      Andreas Fenkart corrects a WoWLAN problem with mwifiex.
      Roman Dubtsov adds a device ID to rt2800usb.
      Sujith Manoharan re-enables a mistakenly commented-out line of code in
      ath9k, and also fixes and interrupt mitigation issue for that driver.
      ZHAO Gang fixes an incorrect assignment (reverse/wrong API call) in b43.
      Please let me know if there are problems!
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • John W. Linville's avatar
      Merge branch 'master' of... · 5746cc2a
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem