1. 05 2月, 2014 19 次提交
  2. 27 1月, 2014 3 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 77d143de
      Linus Torvalds 提交于
      Pull UML changes from Richard Weinberger:
       "This time only various cleanups and housekeeping patches"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        um: hostfs: make functions static
        um: Include generic barrier.h
        um: Removed unused attributes from thread_struct
      77d143de
    • L
      Merge tag 'mmc-updates-for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · ccc039d6
      Linus Torvalds 提交于
      Pull MMC updates from Chris Ball:
       "MMC highlights for 3.14:
      
        Core:
         - Avoid get_cd() on cards marked nonremovable
      
        Drivers:
         - arasan: New driver for controllers found in e.g. Xilinx Zynq SoC
         - dwmmc: Support Hisilicon K3 SoC controllers
         - esdhc-imx: Support for HS200 mode, DDR modes on MX6, runtime PM
         - sdhci-pci: Support O2Micro/BayHubTech controllers used in laptops
           like Lenovo ThinkPad W540, Dell Latitude E5440, Dell Latitude E6540
         - tegra: Support Tegra124 SoCs"
      
      * tag 'mmc-updates-for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (55 commits)
        mmc: sdhci-pci: Fix possibility of chip->fixes being null
        mmc: sdhci-pci: Fix BYT sd card getting stuck in runtime suspend
        mmc: sdhci: Allow for long command timeouts
        mmc: sdio: add a quirk for broken SDIO_CCCR_INTx polling
        mmc: sdhci: fix lockdep error in tuning routine
        mmc: dw_mmc: k3: remove clk_table
        mmc: dw_mmc: fix dw_mci_get_cd
        mmc: dw_mmc: fix sparse non static symbol warning
        mmc: sdhci-esdhc-imx: fix warning during module remove function
        mmc: sdhci-esdhc-imx: fix access hardirq-unsafe lock in atomic context
        mmc: core: sd: implement proper support for sd3.0 au sizes
        mmc: atmel-mci: add vmmc-supply support
        mmc: sdhci-pci: add broken HS200 quirk for Intel Merrifield
        mmc: sdhci: add quirk for broken HS200 support
        mmc: arasan: Add driver for Arasan SDHCI
        mmc: dw_mmc: add dw_mmc-k3 for k3 platform
        mmc: dw_mmc: use slot-gpio to handle cd pin
        mmc: sdhci-pci: add support of O2Micro/BayHubTech SD hosts
        mmc: sdhci-pci: break out definitions to header file
        mmc: tmio: fixup compile error
        ...
      
      Conflicts:
      	MAINTAINERS
      ccc039d6
    • L
      Merge tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 1c294838
      Linus Torvalds 提交于
      Pull 9p changes from Eric Van Hensbergen:
       "Included are a new cache model for support of mmap, and several
        cleanups across the filesystem and networking portions of the code"
      
      * tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: update documentation
        9P: introduction of a new cache=mmap model.
        net/9p: remove virtio default hack and set appropriate bits instead
        9p: remove useless 'name' variable and assignment
        9p: fix return value in case in v9fs_fid_xattr_set()
        9p: remove useless variable and assignment
        9p: remove useless assignment
        9p: remove unused 'super_block' struct pointer
        9p: remove never used return variable
        9p: remove unused 'p9_fid' struct pointer
        9p: remove unused 'p9_client' struct pointer
      1c294838
  3. 26 1月, 2014 17 次提交
    • J
      um: hostfs: make functions static · 9e443bc3
      James Hogan 提交于
      The hostfs_*() callback functions are all only used within
      hostfs_kern.c, so make them static.
      Signed-off-by: NJames Hogan <james.hogan@imgtec.com>
      Cc: Jeff Dike <jdike@addtoit.com>
      Cc: Richard Weinberger <richard@nod.at>
      Cc: user-mode-linux-devel@lists.sourceforge.net
      Signed-off-by: NRichard Weinberger <richard@nod.at>
      9e443bc3
    • R
      um: Include generic barrier.h · 9af2452a
      Richard Weinberger 提交于
      ...to get smp_store_release().
      Reported-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NRichard Weinberger <richard@nod.at>
      9af2452a
    • R
      um: Removed unused attributes from thread_struct · 61aad98a
      Richard Weinberger 提交于
      temp_stack and mm_count have no users and can be killed.
      Signed-off-by: NRichard Weinberger <richard@nod.at>
      61aad98a
    • L
      Merge branch 'ipmi' (ipmi patches from Corey Minyard) · b2e448ec
      Linus Torvalds 提交于
      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
      b2e448ec
    • C
      ipmi: Cleanup error return · d02b3709
      Corey Minyard 提交于
      Return proper errors for a lot of IPMI failure cases.  Also call
      pci_disable_device when IPMI PCI devices are removed.
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d02b3709
    • X
      ipmi: fix timeout calculation when bmc is disconnected · e21404dc
      Xie XiuQi 提交于
      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
      secs.(HZ=250)
      
      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: NHu Shiyuan <hushiyuan@huawei.com>
      Signed-off-by: NXie XiuQi <xiexiuqi@huawei.com>
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e21404dc
    • X
      ipmi: use USEC_PER_SEC instead of 1000000 for more meaningful · ccb3368c
      Xie XiuQi 提交于
      Use USEC_PER_SEC instead of 1000000, that making the later bugfix
      more clearly.
      Signed-off-by: NXie XiuQi <xiexiuqi@huawei.com>
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ccb3368c
    • M
      ipmi: remove deprecated IRQF_DISABLED · aa5b2bab
      Michael Opdenacker 提交于
      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: NMichael Opdenacker <michael.opdenacker@free-electrons.com>
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      aa5b2bab
    • L
      Merge tag 'spi-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 2d2e7d19
      Linus Torvalds 提交于
      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
           spi_transfer
         - 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
        ...
      2d2e7d19
    • L
      Merge tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 15333539
      Linus Torvalds 提交于
      Pull regulator updates from Mark Brown:
       "A respin of the merges in the previous pull request with one extra
        fix.
      
        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
        impact"
      
      * 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
        ...
      15333539
    • L
      Merge tag 'regmap-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · bb1b6490
      Linus Torvalds 提交于
      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
      bb1b6490
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 4ba9920e
      Linus Torvalds 提交于
      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
          Borkmann.
      
       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
          Feldman.
      
      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
          Herbert.
      
      18) Add Proportional Integral Enhanced packet scheduler, from Vijay
          Subramanian.
      
      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
        ...
      4ba9920e
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 82c47766
      Linus Torvalds 提交于
      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
      82c47766
    • L
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f6d13daa
      Linus Torvalds 提交于
      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"
      f6d13daa
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · d4a63a83
      Linus Torvalds 提交于
      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
      d4a63a83
    • L
      Merge tag 'arc-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · 7ae0e06b
      Linus Torvalds 提交于
      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
      7ae0e06b
    • L
      Merge tag 'xtensa-next-20140123' of git://github.com/czankel/xtensa-linux · 9b83d851
      Linus Torvalds 提交于
      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
        ...
      9b83d851
  4. 25 1月, 2014 1 次提交