10 Jul, 2013

20 commits

  • Pull networking updates from David Miller:
    "This is a re-do of the net-next pull request for the current merge
    window. The only difference from the one I made the other day is that
    this has Eliezer's interface renames and the timeout handling changes
    made based upon your feedback, as well as a few bug fixes that have
    trickeled in.

    Highlights:

    1) Low latency device polling, eliminating the cost of interrupt
    handling and context switches. Allows direct polling of a network
    device from socket operations, such as recvmsg() and poll().

    Currently ixgbe, mlx4, and bnx2x support this feature.

    Full high level description, performance numbers, and design in
    commit 0a4db187a999 ("Merge branch 'll_poll'")

    From Eliezer Tamir.

    2) With the routing cache removed, ip_check_mc_rcu() gets exercised
    more than ever before in the case where we have lots of multicast
    addresses. Use a hash table instead of a simple linked list, from
    Eric Dumazet.

    3) Add driver for Atheros CQA98xx 802.11ac wireless devices, from
    Bartosz Markowski, Janusz Dziedzic, Kalle Valo, Marek Kwaczynski,
    Marek Puzyniak, Michal Kazior, and Sujith Manoharan.

    4) Support reporting the TUN device persist flag to userspace, from
    Pavel Emelyanov.

    5) Allow controlling network device VF link state using netlink, from
    Rony Efraim.

    6) Support GRE tunneling in openvswitch, from Pravin B Shelar.

    7) Adjust SOCK_MIN_RCVBUF and SOCK_MIN_SNDBUF for modern times, from
    Daniel Borkmann and Eric Dumazet.

    8) Allow controlling of TCP quickack behavior on a per-route basis,
    from Cong Wang.

    9) Several bug fixes and improvements to vxlan from Stephen
    Hemminger, Pravin B Shelar, and Mike Rapoport. In particular,
    support receiving on multiple UDP ports.

    10) Major cleanups, particular in the area of debugging and cookie
    lifetime handline, to the SCTP protocol code. From Daniel
    Borkmann.

    11) Allow packets to cross network namespaces when traversing tunnel
    devices. From Nicolas Dichtel.

    12) Allow monitoring netlink traffic via AF_PACKET sockets, in a
    manner akin to how we monitor real network traffic via ptype_all.
    From Daniel Borkmann.

    13) Several bug fixes and improvements for the new alx device driver,
    from Johannes Berg.

    14) Fix scalability issues in the netem packet scheduler's time queue,
    by using an rbtree. From Eric Dumazet.

    15) Several bug fixes in TCP loss recovery handling, from Yuchung
    Cheng.

    16) Add support for GSO segmentation of MPLS packets, from Simon
    Horman.

    17) Make network notifiers have a real data type for the opaque
    pointer that's passed into them. Use this to properly handle
    network device flag changes in arp_netdev_event(). From Jiri
    Pirko and Timo Teräs.

    18) Convert several drivers over to module_pci_driver(), from Peter
    Huewe.

    19) tcp_fixup_rcvbuf() can loop 500 times over loopback, just use a
    O(1) calculation instead. From Eric Dumazet.

    20) Support setting of explicit tunnel peer addresses in ipv6, just
    like ipv4. From Nicolas Dichtel.

    21) Protect x86 BPF JIT against spraying attacks, from Eric Dumazet.

    22) Prevent a single high rate flow from overruning an individual cpu
    during RX packet processing via selective flow shedding. From
    Willem de Bruijn.

    23) Don't use spinlocks in TCP md5 signing fast paths, from Eric
    Dumazet.

    24) Don't just drop GSO packets which are above the TBF scheduler's
    burst limit, chop them up so they are in-bounds instead. Also
    from Eric Dumazet.

    25) VLAN offloads are missed when configured on top of a bridge, fix
    from Vlad Yasevich.

    26) Support IPV6 in ping sockets. From Lorenzo Colitti.

    27) Receive flow steering targets should be updated at poll() time
    too, from David Majnemer.

    28) Fix several corner case regressions in PMTU/redirect handling due
    to the routing cache removal, from Timo Teräs.

    29) We have to be mindful of ipv4 mapped ipv6 sockets in
    upd_v6_push_pending_frames(). From Hannes Frederic Sowa.

    30) Fix L2TP sequence number handling bugs, from James Chapman."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1214 commits)
    drivers/net: caif: fix wrong rtnl_is_locked() usage
    drivers/net: enic: release rtnl_lock on error-path
    vhost-net: fix use-after-free in vhost_net_flush
    net: mv643xx_eth: do not use port number as platform device id
    net: sctp: confirm route during forward progress
    virtio_net: fix race in RX VQ processing
    virtio: support unlocked queue poll
    net/cadence/macb: fix bug/typo in extracting gem_irq_read_clear bit
    Documentation: Fix references to defunct linux-net@vger.kernel.org
    net/fs: change busy poll time accounting
    net: rename low latency sockets functions to busy poll
    bridge: fix some kernel warning in multicast timer
    sfc: Fix memory leak when discarding scattered packets
    sit: fix tunnel update via netlink
    dt:net:stmmac: Add dt specific phy reset callback support.
    dt:net:stmmac: Add support to dwmac version 3.610 and 3.710
    dt:net:stmmac: Allocate platform data only if its NULL.
    net:stmmac: fix memleak in the open method
    ipv6: rt6_check_neigh should successfully verify neigh if no NUD information are available
    net: ipv6: fix wrong ping_v6_sendmsg return value
    ...

    Linus Torvalds
     
  • Pull drm updates from Dave Airlie:
    "Okay this is the big one, I was stalled on the fbdev pull req as I
    stupidly let fbdev guys merge a patch I required to fix a warning with
    some patches I had, they ended up merging the patch from the wrong
    place, but the warning should be fixed. In future I'll just take the
    patch myself!

    Outside drm:

    There are some snd changes for the HDMI audio interactions on haswell,
    they've been acked for inclusion via my tree. This relies on the
    wound/wait tree from Ingo which is already merged.

    Major changes:

    AMD finally released the dynamic power management code for all their
    GPUs from r600->present day, this is great, off by default for now but
    also a huge amount of code, in fact it is most of this pull request.

    Since it landed there has been a lot of community testing and Alex has
    sent a lot of fixes for any bugs found so far. I suspect radeon might
    now be the biggest kernel driver ever :-P p.s. radeon.dpm=1 to enable
    dynamic powermanagement for anyone.

    New drivers:

    Renesas r-car display unit.

    Other highlights:

    - core: GEM CMA prime support, use new w/w mutexs for TTM
    reservations, cursor hotspot, doc updates
    - dvo chips: chrontel 7010B support
    - i915: Haswell (fbc, ips, vecs, watermarks, audio powerwell),
    Valleyview (enabled by default, rc6), lots of pll reworking, 30bpp
    support (this time for sure)
    - nouveau: async buffer object deletion, context/register init
    updates, kernel vp2 engine support, GF117 support, GK110 accel
    support (with external nvidia ucode), context cleanups.
    - exynos: memory leak fixes, Add S3C64XX SoC series support, device
    tree updates, common clock framework support,
    - qxl: cursor hotspot support, multi-monitor support, suspend/resume
    support
    - mgag200: hw cursor support, g200 mode limiting
    - shmobile: prime support
    - tegra: fixes mostly

    I've been banging on this quite a lot due to the size of it, and it
    seems to okay on everything I've tested it on."

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (811 commits)
    drm/radeon/dpm: implement vblank_too_short callback for si
    drm/radeon/dpm: implement vblank_too_short callback for cayman
    drm/radeon/dpm: implement vblank_too_short callback for btc
    drm/radeon/dpm: implement vblank_too_short callback for evergreen
    drm/radeon/dpm: implement vblank_too_short callback for 7xx
    drm/radeon/dpm: add checks against vblank time
    drm/radeon/dpm: add helper to calculate vblank time
    drm/radeon: remove stray line in old pm code
    drm/radeon/dpm: fix display_gap programming on rv7xx
    drm/nvc0/gr: fix gpc firmware regression
    drm/nouveau: fix minor thinko causing bo moves to not be async on kepler
    drm/radeon/dpm: implement force performance level for TN
    drm/radeon/dpm: implement force performance level for ON/LN
    drm/radeon/dpm: implement force performance level for SI
    drm/radeon/dpm: implement force performance level for cayman
    drm/radeon/dpm: implement force performance levels for 7xx/eg/btc
    drm/radeon/dpm: add infrastructure to force performance levels
    drm/radeon: fix surface setup on r1xx
    drm/radeon: add support for 3d perf states on older asics
    drm/radeon: set default clocks for SI when DPM is disabled
    ...

    Linus Torvalds
     
  • Pull fbdev update from Jean-Christophe PLAGNIOL-VILLARD:
    "Various fbdev changes for 3.11
    - xilinxfb updates
    - Small cleanups and fixes to multiple drivers
    - OMAP display subsystem bug updates
    - imxfb dt support"

    * tag 'fbdev-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev: (95 commits)
    video: imxfb: Add DT support
    video: i740fb: Make i740fb_init static
    fb: make fp_get_options name argument const
    video: mmp: fix graphics/video layer enable/mask swap issue
    video: mmp: fix memcpy wrong size for mmp_addr issue
    radeon: use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
    aty128fb: use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
    video: of_display_timing.h: Declare 'display_timing'
    fbdev: bfin-lq035q1-fb: Use dev_pm_ops
    fbmem: return -EFAULT on copy_to_user() failure
    OMAPDSS: DPI: Fix wrong pixel clock limit
    video: replace strict_strtoul() with kstrtoul()
    uvesafb: Correct/simplify warning message
    fb: fix atyfb unused data warnings
    fb: fix atyfb build warning
    video: imxfb: Make local symbols static
    video: udlfb: Make local symbol static
    video: udlfb: Use NULL instead of 0
    video: smscufx: Use NULL instead of 0
    video: remove unnecessary platform_set_drvdata()
    ...

    Linus Torvalds
     
  • Merge second patch-bomb from Andrew Morton:
    - misc fixes
    - audit stuff
    - fanotify/inotify/dnotify things
    - most of the rest of MM. The new cache shrinker code from Glauber and
    Dave Chinner probably isn't quite stabilized yet.
    - ptrace
    - ipc
    - partitions
    - reboot cleanups
    - add LZ4 decompressor, use it for kernel compression

    * emailed patches from Andrew Morton : (118 commits)
    lib/scatterlist: error handling in __sg_alloc_table()
    scsi_debug: fix do_device_access() with wrap around range
    crypto: talitos: use sg_pcopy_to_buffer()
    lib/scatterlist: introduce sg_pcopy_from_buffer() and sg_pcopy_to_buffer()
    lib/scatterlist: factor out sg_miter_get_next_page() from sg_miter_next()
    crypto: add lz4 Cryptographic API
    lib: add lz4 compressor module
    arm: add support for LZ4-compressed kernel
    lib: add support for LZ4-compressed kernel
    decompressor: add LZ4 decompressor module
    lib: add weak clz/ctz functions
    reboot: move arch/x86 reboot= handling to generic kernel
    reboot: arm: change reboot_mode to use enum reboot_mode
    reboot: arm: prepare reboot_mode for moving to generic kernel code
    reboot: arm: remove unused restart_mode fields from some arm subarchs
    reboot: unicore32: prepare reboot_mode for moving to generic kernel code
    reboot: x86: prepare reboot_mode for moving to generic kernel code
    reboot: checkpatch.pl the new kernel/reboot.c file
    reboot: move shutdown/reboot related functions to kernel/reboot.c
    reboot: remove -stable friendly PF_THREAD_BOUND define
    ...

    Linus Torvalds
     
  • rtnl_is_locked() doesn't check who holds this lock, it just tells that it's
    locked right now. if caif::ldisc_close really can be called under rtrnl_lock
    then it should release net device in other context because there is no way
    to grab rtnl_lock without deadlock.

    This patch adds work which releases these devices. Also this patch fixes calling
    dev_close/unregister_netdevice without rtnl_lock from caif_ser_exit().

    Signed-off-by: Konstantin Khlebnikov
    Cc: Dmitry Tarnyagin
    Signed-off-by: David S. Miller

    Konstantin Khlebnikov
     
  • enic_change_mtu_work() must call rtnl_unlock() on all exiting paths.

    Signed-off-by: Konstantin Khlebnikov
    Cc: Christian Benvenuti
    Cc: Roopa Prabhu
    Cc: Neel Patel
    Cc: Nishank Trivedi
    Signed-off-by: David S. Miller

    Konstantin Khlebnikov
     
  • vhost_net_ubuf_put_and_wait has a confusing name:
    it will actually also free it's argument.
    Thus since commit 1280c27f8e29acf4af2da914e80ec27c3dbd5c01
    "vhost-net: flush outstanding DMAs on memory change"
    vhost_net_flush tries to use the argument after passing it
    to vhost_net_ubuf_put_and_wait, this results
    in use after free.
    To fix, don't free the argument in vhost_net_ubuf_put_and_wait,
    add an new API for callers that want to free ubufs.

    Acked-by: Asias He
    Acked-by: Jason Wang
    Signed-off-by: Michael S. Tsirkin
    Signed-off-by: David S. Miller

    Michael S. Tsirkin
     
  • The port number is only local to the ethernet block, not global, so
    there can be two ethernet blocks both using the same port, like
    kirkwood with both using port 0.

    Fix this by using the array index offset for the allocated platform
    devices as the id.

    Signed-off-by: Jonas Gorski
    Signed-off-by: David S. Miller

    Jonas Gorski
     
  • virtio net called virtqueue_enable_cq on RX path after napi_complete, so
    with NAPI_STATE_SCHED clear - outside the implicit napi lock.
    This violates the requirement to synchronize virtqueue_enable_cq wrt
    virtqueue_add_buf. In particular, used event can move backwards,
    causing us to lose interrupts.
    In a debug build, this can trigger panic within START_USE.

    Jason Wang reports that he can trigger the races artificially,
    by adding udelay() in virtqueue_enable_cb() after virtio_mb().

    However, we must call napi_complete to clear NAPI_STATE_SCHED before
    polling the virtqueue for used buffers, otherwise napi_schedule_prep in
    a callback will fail, causing us to lose RX events.

    To fix, call virtqueue_enable_cb_prepare with NAPI_STATE_SCHED
    set (under napi lock), later call virtqueue_poll with
    NAPI_STATE_SCHED clear (outside the lock).

    Reported-by: Jason Wang
    Tested-by: Jason Wang
    Acked-by: Jason Wang
    Signed-off-by: Michael S. Tsirkin
    Signed-off-by: David S. Miller

    Michael S. Tsirkin
     
  • This adds a way to check ring empty state after enable_cb outside any
    locks. Will be used by virtio_net.

    Note: there's room for more optimization: caller is likely to have a
    memory barrier already, which means we might be able to get rid of a
    barrier here. Deferring this optimization until we do some
    benchmarking.

    Signed-off-by: Michael S. Tsirkin
    Signed-off-by: David S. Miller

    Michael S. Tsirkin
     
  • Signed-off-by: Jongsung Kim
    Acked-by: Nicolas Ferre
    Signed-off-by: David S. Miller

    Jongsung Kim
     
  • Pull Ceph updates from Sage Weil:
    "There is some follow-on RBD cleanup after the last window's code drop,
    a series from Yan fixing multi-mds behavior in cephfs, and then a
    sprinkling of bug fixes all around. Some warnings, sleeping while
    atomic, a null dereference, and cleanups"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (36 commits)
    libceph: fix invalid unsigned->signed conversion for timespec encoding
    libceph: call r_unsafe_callback when unsafe reply is received
    ceph: fix race between cap issue and revoke
    ceph: fix cap revoke race
    ceph: fix pending vmtruncate race
    ceph: avoid accessing invalid memory
    libceph: Fix NULL pointer dereference in auth client code
    ceph: Reconstruct the func ceph_reserve_caps.
    ceph: Free mdsc if alloc mdsc->mdsmap failed.
    ceph: remove sb_start/end_write in ceph_aio_write.
    ceph: avoid meaningless calling ceph_caps_revoking if sync_mode == WB_SYNC_ALL.
    ceph: fix sleeping function called from invalid context.
    ceph: move inode to proper flushing list when auth MDS changes
    rbd: fix a couple warnings
    ceph: clear migrate seq when MDS restarts
    ceph: check migrate seq before changing auth cap
    ceph: fix race between page writeback and truncate
    ceph: reset iov_len when discarding cap release messages
    ceph: fix cap release race
    libceph: fix truncate size calculation
    ...

    Linus Torvalds
     
  • Pull third set of VFS updates from Al Viro:
    "Misc stuff all over the place. There will be one more pile in a
    couple of days"

    This is an "evil merge" that also uses the new d_count helper in
    fs/configfs/dir.c, missed by commit 84d08fa888e7 ("helper for reading
    ->d_count")

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    ncpfs: fix error return code in ncp_parse_options()
    locks: move file_lock_list to a set of percpu hlist_heads and convert file_lock_lock to an lglock
    seq_file: add seq_list_*_percpu helpers
    f2fs: fix readdir incorrectness
    mode_t whack-a-mole...
    lustre: kill the pointless wrapper
    helper for reading ->d_count

    Linus Torvalds
     
  • do_device_access() is a function that abstracts copying SG list from/to
    ramdisk storage (fake_storep).

    It must deal with the ranges exceeding actual fake_storep size, because
    such ranges are valid if virtual_gb is set greater than zero, and they
    should be treated as fake_storep is repeatedly mirrored up to virtual
    size.

    Unfortunately, it can't deal with the range which wraps around the end of
    fake_storep. A wrap around range is copied by two
    sg_copy_{from,to}_buffer() calls, but sg_copy_{from,to}_buffer() can't
    copy from/to in the middle of SG list, therefore the second call can't
    copy correctly.

    This fixes it by using sg_pcopy_{from,to}_buffer() that can copy from/to
    the middle of SG list.

    This also simplifies the assignment of sdb->resid in
    fill_from_dev_buffer(). Because fill_from_dev_buffer() is now only called
    once per command execution cycle. So it is not necessary to take care to
    decrease sdb->resid if fill_from_dev_buffer() is called more than once.

    Signed-off-by: Akinobu Mita
    Cc: "David S. Miller"
    Cc: "James E.J. Bottomley"
    Cc: Douglas Gilbert
    Cc: Herbert Xu
    Cc: Horia Geanta
    Cc: Imre Deak
    Cc: Tejun Heo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita
     
  • Use sg_pcopy_to_buffer() which is better than the function previously used.
    Because it doesn't do kmap/kunmap for skipped pages.

    Signed-off-by: Akinobu Mita
    Cc: "David S. Miller"
    Cc: "James E.J. Bottomley"
    Cc: Douglas Gilbert
    Cc: Herbert Xu
    Cc: Horia Geanta
    Cc: Imre Deak
    Cc: Tejun Heo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita
     
  • Preparing to move the parsing of reboot= to generic kernel code forces
    the change in reboot_mode handling to use the enum.

    [akpm@linux-foundation.org: fix arch/arm/mach-socfpga/socfpga.c]
    Signed-off-by: Robin Holt
    Cc: Russell King
    Cc: Russ Anderson
    Cc: Robin Holt
    Cc: H. Peter Anvin
    Cc: Guan Xuetao
    Acked-by: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Robin Holt
     
  • Smatch complains that on 64 bit systems, there is a hole in the
    MW_ABILITIES struct between ->component_count and ->component_list[].
    It leaks stack information from the mwave_ioctl() function.

    I've added a memset() to initialize the struct to zero.

    Signed-off-by: Dan Carpenter
    Cc: Greg KH
    Cc: Jiri Kosina
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Dan Carpenter
     
  • stmp_reset_block() may fail, so let's check its return value and
    propagate it in the case of error.

    Signed-off-by: Fabio Estevam
    Acked-by: Shawn Guo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Fabio Estevam
     
  • Fix two obvious problems:

    1. We have registered msm_iommu_driver first, and need unregister it
    when registered msm_iommu_ctx_driver fail

    2. We don't need to kfree drvdata before kzalloc was successful.

    [akpm@linux-foundation.org: remove now-unneeded initialization of ctx_drvdata, remove unneeded braces]
    Signed-off-by: Libo Chen
    Acked-by: David Brown
    Cc: David Woodhouse
    Cc: James Hogan
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Libo Chen
     
  • The recent "drivers/dma: remove unused support for MEMSET operations"
    change has fallout from lack of build testing by the author. This
    fixes:

    drivers/dma/iop-adma.c:1020:13: warning: unused variable 'dma_addr' [-Wunused-variable]
    drivers/dma/iop-adma.c:1519:2: warning: format '%s' expects a matching 'char *' argument [-Wformat=]

    Signed-off-by: Olof Johansson
    Cc: Bartlomiej Zolnierkiewicz
    Cc: Kyungmin Park
    Cc: Sebastian Hesselbarth
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Olof Johansson
     

09 Jul, 2013

11 commits


08 Jul, 2013

4 commits

  • Add devicetree support for imx framebuffer driver. It uses the generic
    display bindings and helper functions.

    Signed-off-by: Markus Pargmann
    Cc: Fabio Estevam
    Cc: Mark Rutland
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Acked-by: Sascha Hauer

    Markus Pargmann
     
  • "drm/nve0-/gr: some new gpc registers can have multiple copies"
    5ee86c4190f9e caused a regression for nvc0, because the bit indicating last
    transfer has occured was no longer set, resulting in random system lockups.

    Reported-by: Ronald Uitermark
    Tested-by: Ronald Uitermark
    Signed-off-by: Maarten Lankhorst
    Signed-off-by: Ben Skeggs

    Maarten Lankhorst
     
  • Reported-by: Maarten Lankhorst
    Signed-off-by: Ben Skeggs

    Ben Skeggs
     
  • Pull slave-dmaengine updates from Vinod Koul:
    "Once you have some time from extended weekend celebrations please
    consider pulling the following to get:
    - Various fixes and PCI driver for dw_dmac by Andy
    - DT binding for imx-dma by Markus & imx-sdma by Shawn
    - DT fixes for dmaengine by Lars
    - jz4740 dmac driver by Lars
    - and various fixes across the drivers"

    What "extended weekend celebrations"? I'm in the merge window, who has
    time for extended celebrations..

    * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (40 commits)
    DMA: shdma: add DT support
    DMA: shdma: shdma_chan_filter() has to be in shdma-base.h
    DMA: shdma: (cosmetic) don't re-calculate a pointer
    dmaengine: at_hdmac: prepare clk before calling enable
    dmaengine/trivial: at_hdmac: add curly brackets to if/else expressions
    dmaengine: at_hdmac: remove unsuded atc_cleanup_descriptors()
    dmaengine: at_hdmac: add FIFO configuration parameter to DMA DT binding
    ARM: at91: dt: add header to define at_hdmac configuration
    MIPS: jz4740: Correct clock gate bit for DMA controller
    MIPS: jz4740: Remove custom DMA API
    MIPS: jz4740: Register jz4740 DMA device
    dma: Add a jz4740 dmaengine driver
    MIPS: jz4740: Acquire and enable DMA controller clock
    dma: mmp_tdma: disable irq when disabling dma channel
    dmaengine: PL08x: Avoid collisions with get_signal() macro
    dmaengine: dw: select DW_DMAC_BIG_ENDIAN_IO automagically
    dma: dw: add PCI part of the driver
    dma: dw: split driver to library part and platform code
    dma: move dw_dmac driver to an own directory
    dw_dmac: don't check resource with devm_ioremap_resource
    ...

    Linus Torvalds
     

07 Jul, 2013

3 commits

  • Pull timer core updates from Thomas Gleixner:
    "The timer changes contain:

    - posix timer code consolidation and fixes for odd corner cases

    - sched_clock implementation moved from ARM to core code to avoid
    duplication by other architectures

    - alarm timer updates

    - clocksource and clockevents unregistration facilities

    - clocksource/events support for new hardware

    - precise nanoseconds RTC readout (Xen feature)

    - generic support for Xen suspend/resume oddities

    - the usual lot of fixes and cleanups all over the place

    The parts which touch other areas (ARM/XEN) have been coordinated with
    the relevant maintainers. Though this results in an handful of
    trivial to solve merge conflicts, which we preferred over nasty cross
    tree merge dependencies.

    The patches which have been committed in the last few days are bug
    fixes plus the posix timer lot. The latter was in akpms queue and
    next for quite some time; they just got forgotten and Frederic
    collected them last minute."

    * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (59 commits)
    hrtimer: Remove unused variable
    hrtimers: Move SMP function call to thread context
    clocksource: Reselect clocksource when watchdog validated high-res capability
    posix-cpu-timers: don't account cpu timer after stopped thread runtime accounting
    posix_timers: fix racy timer delta caching on task exit
    posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule()
    selftests: add basic posix timers selftests
    posix_cpu_timers: consolidate expired timers check
    posix_cpu_timers: consolidate timer list cleanups
    posix_cpu_timer: consolidate expiry time type
    tick: Sanitize broadcast control logic
    tick: Prevent uncontrolled switch to oneshot mode
    tick: Make oneshot broadcast robust vs. CPU offlining
    x86: xen: Sync the CMOS RTC as well as the Xen wallclock
    x86: xen: Sync the wallclock when the system time is set
    timekeeping: Indicate that clock was set in the pvclock gtod notifier
    timekeeping: Pass flags instead of multiple bools to timekeeping_update()
    xen: Remove clock_was_set() call in the resume path
    hrtimers: Support resuming with two or more CPUs online (but stopped)
    timer: Fix jiffies wrap behavior of round_jiffies_common()
    ...

    Linus Torvalds
     
  • Pull Metag architecture changes from James Hogan:
    - Infrastructure and DT files for TZ1090 SoC (pin control drivers
    already merged via pinctrl tree).
    - Panic on boot instead of just warning if cache aliasing possible.
    - Various SMP/hotplug fixes.
    - Various other randconfig/sparse fixes.

    * tag 'metag-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag: (24 commits)
    metag: move EXPORT_SYMBOL(csum_partial) to metag_ksyms.c
    metag: cpu hotplug: route_irq: preserve irq mask
    metag: kick: add missing irq_enter/exit to kick_handler()
    metag: smp: don't spin waiting for CPU to start
    metag: smp: enable irqs after set_cpu_online
    metag: use clear_tasks_mm_cpumask()
    metag: tz1090: select and instantiate pinctrl-tz1090-pdc
    metag: tz1090: select and instantiate pinctrl-tz1090
    metag: don't check for cache aliasing on smp cpu boot
    metag: panic if cache aliasing possible
    metag: *.dts: include using preprocessor
    metag: add symlink
    metag/.gitignore: Extend the *.dtb pattern to match the dtb.S files
    metag/traps: include setup.h for the per_cpu_trap_init declaration
    metag/traps: Mark die() as __noreturn to match the declaration.
    metag/processor.h: Add missing cpuinfo_op declaration.
    metag/setup: Restrict scope for the capabilities variable
    metag/mm/cache: Restrict scope for metag_lnkget_probe
    metag/asm/irq.h: Declare init_IRQ
    metag/kernel/irq.c: Declare root_domain as static
    ...

    Linus Torvalds
     
  • Signed-off-by: Al Viro

    Al Viro
     

06 Jul, 2013

2 commits