1. 01 6月, 2012 2 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · f737c770
      Linus Torvalds 提交于
      Pull Sparc updates from David S. Miller:
      
       1) Remove the idiotic situation wherein Leon was a special case in all
          of the TLB/cache handling code.
      
          The worst side effect of this bogosity is that you couldn't build a
          kernel with Leon support enabled (to get better build coverage), and
          test boot it on a non-LEON cpu.
      
          Leon is, in all core respects, programatically identical to the
          32-bit SRMMU.  Except that they put the TLB registers in a different
          alternate address space location.
      
          Through code patching (for fast paths) and run time checks, this
          issue is now a thing of the past.
      
          From Sam Ravnborg.
      
       2) There was a mis-merge of arch/sparc/Kconfig for one of the
          clockevents changes that went in, causing 32-bit sparc to start
          failing to build.
      
          I merged in your tree to get those clockevents changes (and added a
          note to the merge commit) then added Stephen Rothwell's fix for the
          merge error.
      
       3) Software quad floating point emulation was not working properly on
          more recent Niagara chips, because the way the situation is reported
          by the cpu has changed.
      
          Nobody noticed because gcc emits calls to software emulation
          routines in glibc.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: (25 commits)
        sparc: fix sparc64 build due to leon.h inclusion
        sparc32: remove unused variable in head_32.S
        sparc32,leon: fix leon bootup
        sparc32: Export leon_dma_ops to modules.
        sparc32: support leon + sun in dma_make_coherent()
        sparc32,leon: always support leon in ioport
        sparc32,leon: always include leon_pmc in build
        sparc32: refactor cpu_idle()
        sparc32: srmmu_probe now knows about leon too
        sparc32: drop LEON hack for ASI_M_MMUREGS
        sparc32: introduce run-time patching of srmmu access functions
        sparc32: introduce support for run-time patching for all shared assembler code
        sparc32,leon: fix section mismatch warning
        sparc32,leon: always include leon_smp + leon_mm in build
        sparc32,leon: always include leon_kernel in build
        sparc32,leon: clean up leon.h
        sparc32: handle leon in cpu.c
        sparc32: handle leon in irq_32.c
        sparc32: add support for run-time patching of leon/sun single instructions
        sparc32: introduce sparc32_start_kernel called from head_32.S
        ...
      f737c770
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 13199a08
      Linus Torvalds 提交于
      Pull networking changes from David S. Miller:
      
       1) Fix IPSEC header length calculation for transport mode in ESP.  The
          issue is whether to do the calculation before or after alignment.
          Fix from Benjamin Poirier.
      
       2) Fix regression in IPV6 IPSEC fragment length calculations, from Gao
          Feng.  This is another transport vs tunnel mode issue.
      
       3) Handle AF_UNSPEC connect()s properly in L2TP to avoid OOPSes.  Fix
          from James Chapman.
      
       4) Fix USB ASIX driver's reception of full sized VLAN packets, from
          Eric Dumazet.
      
       5) Allow drop monitor (and, more generically, all generic netlink
          protocols) to be automatically loaded as a module.  From Neil
          Horman.
      
      Fix up trivial conflict in Documentation/feature-removal-schedule.txt
      due to new entries added next to each other at the end. As usual.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)
        net/smsc911x: Repair broken failure paths
        virtio-net: remove useless disable on freeze
        netdevice: Update netif_dbg for CONFIG_DYNAMIC_DEBUG
        drop_monitor: Add module alias to enable automatic module loading
        genetlink: Build a generic netlink family module alias
        net: add MODULE_ALIAS_NET_PF_PROTO_NAME
        r6040: Do a Proper deinit at errorpath and also when driver unloads (calling r6040_remove_one)
        r6040: disable pci device if the subsequent calls (after pci_enable_device) fails
        skb: avoid unnecessary reallocations in __skb_cow
        net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens
        asix: allow full size 8021Q frames to be received
        rds_rdma: don't assume infiniband device is PCI
        l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case
        mac80211: fix ADDBA declined after suspend with wowlan
        wlcore: fix undefined symbols when CONFIG_PM is not defined
        mac80211: fix flag check for QoS NOACK frames
        ath9k_hw: apply internal regulator settings on AR933x
        ath9k_hw: update AR933x initvals to fix issues with high power devices
        ath9k: fix a use-after-free-bug when ath_tx_setup_buffer() fails
        ath9k: stop rx dma before stopping tx
        ...
      13199a08
  2. 31 5月, 2012 9 次提交
    • L
      net/smsc911x: Repair broken failure paths · 2e1d4a06
      Lee Jones 提交于
      Current failure paths attempt to free resources which we failed to request
      and disable resources which we failed to enable ones. This leads to kernel
      oops/panic. This patch does some simple re-ordering to prevent this from
      happening.
      
      Cc: netdev@vger.kernel.org
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      Acked-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2e1d4a06
    • M
      virtio-net: remove useless disable on freeze · 3bbf372c
      Michael S. Tsirkin 提交于
      disable_cb is just an optimization: it
      can not guarantee that there are no callbacks.
      In particular it doesn't have any effect when
      event index is on.
      
      Instead, detach, napi disable and reset on freeze ensure we don't run
      concurrently with a callback.
      
      Remove the useless calls so we get same behaviour
      with and without event index.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3bbf372c
    • J
      netdevice: Update netif_dbg for CONFIG_DYNAMIC_DEBUG · 0053ea9c
      Joe Perches 提交于
      Make netif_dbg use dynamic debugging whenever
      CONFIG_DYNAMIC_DEBUG is enabled.
      
      commit b558c96f
      ("dynamic_debug: make dynamic-debug supersede DEBUG ccflag")
      missed updating the netif_dbg variant.
      Signed-off-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0053ea9c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · af56e0aa
      Linus Torvalds 提交于
      Pull ceph updates from Sage Weil:
       "There are some updates and cleanups to the CRUSH placement code, a bug
        fix with incremental maps, several cleanups and fixes from Josh Durgin
        in the RBD block device code, a series of cleanups and bug fixes from
        Alex Elder in the messenger code, and some miscellaneous bounds
        checking and gfp cleanups/fixes."
      
      Fix up trivial conflicts in net/ceph/{messenger.c,osdmap.c} due to the
      networking people preferring "unsigned int" over just "unsigned".
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (45 commits)
        libceph: fix pg_temp updates
        libceph: avoid unregistering osd request when not registered
        ceph: add auth buf in prepare_write_connect()
        ceph: rename prepare_connect_authorizer()
        ceph: return pointer from prepare_connect_authorizer()
        ceph: use info returned by get_authorizer
        ceph: have get_authorizer methods return pointers
        ceph: ensure auth ops are defined before use
        ceph: messenger: reduce args to create_authorizer
        ceph: define ceph_auth_handshake type
        ceph: messenger: check return from get_authorizer
        ceph: messenger: rework prepare_connect_authorizer()
        ceph: messenger: check prepare_write_connect() result
        ceph: don't set WRITE_PENDING too early
        ceph: drop msgr argument from prepare_write_connect()
        ceph: messenger: send banner in process_connect()
        ceph: messenger: reset connection kvec caller
        libceph: don't reset kvec in prepare_write_banner()
        ceph: ignore preferred_osd field
        ceph: fully initialize new layout
        ...
      af56e0aa
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 65a50c95
      Linus Torvalds 提交于
      Pull perf updates from Ingo Molnar.
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
        perf ui browser: Stop using 'self'
        perf annotate browser: Read perf config file for settings
        perf config: Allow '_' in config file variable names
        perf annotate browser: Make feature toggles global
        perf annotate browser: The idx_asm field should be used in asm only view
        perf tools: Convert critical messages to ui__error()
        perf ui: Make --stdio default when TUI is not supported
        tools lib traceevent: Silence compiler warning on 32bit build
        perf record: Fix branch_stack type in perf_record_opts
        perf tools: Reconstruct event with modifiers from perf_event_attr
        perf top: Fix counter name fixup when fallbacking to cpu-clock
        perf tools: fix thread_map__new_by_pid_str() memory leak in error path
        perf tools: Do not use _FORTIFY_SOURCE when DEBUG=1 is specified
        tools lib traceevent: Fix signature of create_arg_item()
        tools lib traceevent: Use proper function parameter type
        tools lib traceevent: Fix freeing arg on process_dynamic_array()
        tools lib traceevent: Fix a possibly wrong memory dereference
        tools lib traceevent: Fix a possible memory leak
        tools lib traceevent: Allow expressions in __print_symbolic() fields
        perf evlist: Explicititely initialize input_name
        ...
      65a50c95
    • L
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 42fe55ce
      Linus Torvalds 提交于
      Pull i2c updates from Jean Delvare.
      
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING
        i2c-dev: Add support for I2C_M_RECV_LEN
      42fe55ce
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · 19ce0a99
      Linus Torvalds 提交于
      Pull second set of watchdog updates from Wim Van Sebroeck:
       "This changeset contains following changes:
         * Add support for multiple watchdog devices.  We use dynamically
           allocated device id's for this.
         * Add locking into the generic watchdog infrastructure.
         * Add support for dynamically allocated watchdog_device structs so
           that we can deal with devices that get unbound.
         * convert following drivers to the generic watchdog framework:
           sch5627, sch5636 and sp805_wdt.
         * Add DA9052/53 PMIC watchdog support
         * Fix printk format warnings for iTCO_wdt.c"
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: iTCO_wdt.c: fix printk format warnings
        watchdog: sp805_wdt: Add clk_{un}prepare support
        watchdog: sp805_wdt: convert to watchdog core
        hwmon/sch56xx: Depend on watchdog for watchdog core functions
        watchdog: sch56xx-common: set correct bits in register()
        Watchdog: DA9052/53 PMIC watchdog support
        watchdog: sch56xx-common: Add proper ref-counting of watchdog data
        watchdog: sch56xx: Remove unnecessary checks for register changes
        watchdog: sch56xx: Use watchdog core
        watchdog: Add support for dynamically allocated watchdog_device structs
        watchdog: Add Locking support
        watchdog: watchdog_dev: Rewrite wrapper code
        watchdog: use dev_ functions
        watchdog: create all the proper device files
        watchdog: Add a flag to indicate the watchdog doesn't reboot things
        watchdog: Add multiple device support
        watchdog: watchdog_core.h: make functions extern
        watchdog: correct the name of the watchdog_core inlude file
        watchdog: Add watchdog_active() routine
        watchdog: watchdog_dev: include private header to pickup global symbol prototypes
      19ce0a99
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 6bb340c7
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Just regular fixes, bunch from intel, quieting some of the over
        zealous power warnings, and the rest just misc.
      
        I've got another pull with the remaining dma-buf bits, since the vmap
        bits are in your tree now.  I'll send tomorrow just to space things
        out a bit."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (22 commits)
        drm/edid/quirks: ViewSonic VA2026w
        drm/udl: remove unused variables.
        drm/radeon: fix XFX quirk
        drm: Use stdint types for consistency
        drm: Constify params to format_check() and framebuffer_checks()
        drm/radeon: fix typo in trinity tiling setup
        drm/udl: unlock before returning in udl_gem_mmap()
        radeon: make radeon_cs_update_pages static.
        drm/i915: tune down the noise of the RP irq limit fail
        drm/i915: Remove the error message for unbinding pinned buffers
        drm/i915: Limit page allocations to lowmem (dma32) for i965
        drm/i915: always use RPNSWREQ for turbo change requests
        drm/i915: reject doubleclocked cea modes on dp
        drm/i915: Adding TV Out Missing modes.
        drm/i915: wait for a vblank to pass after tv detect
        drm/i915: no lvds quirk for HP t5740e Thin Client
        drm/i915: enable vdd when switching off the eDP panel
        drm/i915: Fix PCH PLL assertions to not assume CRTC:PLL relationship
        drm/i915: Always update RPS interrupts thresholds along with frequency
        drm/i915: properly handle interlaced bit for sdvo dtd conversion
        ...
      6bb340c7
    • L
      Merge branch 'for-3.5/drivers' of git://git.kernel.dk/linux-block · a70f35af
      Linus Torvalds 提交于
      Pull block driver updates from Jens Axboe:
       "Here are the driver related changes for 3.5.  It contains:
      
         - The floppy changes from Jiri.  Jiri is now also marked as the
           maintainer of floppy.c, I shall be publically branding his forehead
           with red hot iron at the next opportune moment.
      
         - A batch of drbd updates and fixes from the linbit crew, as well as
           fixes from others.
      
         - Two small fixes for xen-blkfront courtesy of Jan."
      
      * 'for-3.5/drivers' of git://git.kernel.dk/linux-block: (70 commits)
        floppy: take over maintainership
        floppy: remove floppy-specific O_EXCL handling
        floppy: convert to delayed work and single-thread wq
        xen-blkfront: module exit handling adjustments
        xen-blkfront: properly name all devices
        drbd: grammar fix in log message
        drbd: check MODULE for THIS_MODULE
        drbd: Restore the request restart logic
        drbd: introduce a bio_set to allocate housekeeping bios from
        drbd: remove unused define
        drbd: bm_page_async_io: properly initialize page->private
        drbd: use the newly introduced page pool for bitmap IO
        drbd: add page pool to be used for meta data IO
        drbd: allow bitmap to change during writeout from resync_finished
        drbd: fix race between drbdadm invalidate/verify and finishing resync
        drbd: fix resend/resubmit of frozen IO
        drbd: Ensure that data_size is not 0 before using data_size-1 as index
        drbd: Delay/reject other state changes while establishing a connection
        drbd: move put_ldev from __req_mod() to the endio callback
        drbd: fix WRITE_ACKED_BY_PEER_AND_SIS to not set RQ_NET_DONE
        ...
      a70f35af
  3. 30 5月, 2012 29 次提交