1. 27 Jul, 2012 2 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 1e30c1b3
      Linus Torvalds authored
      Pull networking updates and fixes from David Miller:
      
      1) Reinstate the no-ref optimization for input route lookups in ipv4 to
         fix some routing cache removal perf regressions.
      
      2) Make TCP socket pre-demux work on ipv6 side too, from Eric Dumazet.
      
      3) Get RX hash value from correct place in be2net driver, from
         Sarveshwar Bandi.
      
      4) Validation of FIB cached routes missing critical check, from Eric
         Dumazet.
      
      5) EEH support in mlx4 driver, from Kleber Sacilotto de Souza.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (23 commits)
        ipv6: Early TCP socket demux
        ipv4: Fix input route performance regression.
        pch_gbe: vlan skb len fix
        pch_gbe: add extra clean tx
        pch_gbe: fix transmit watchdog timeout
        ixgbe: fix panic while dumping packets on Tx hang with IOMMU
        be2net: Fix to parse RSS hash from Receive completions correctly.
        net/mlx4_en: Limit the RFS filter IDs to be < RPS_NO_FILTER
        hyperv: Add error handling to rndis_filter_device_add()
        hyperv: Add a check for ring_size value
        ipv4: rt_cache_valid must check expired routes
        net/pch_gpe: Cannot disable ethernet autonegation
        qeth: repair crash in qeth_l3_vlan_rx_kill_vid()
        netiucv: cleanup attribute usage
        net: wiznet add missing HAS_IOMEM dependency
        be2net: Missing byteswap in be_get_fw_log_level causes oops on PowerPC
        mlx4: Add support for EEH error recovery
        cdc-ncm: tag Ericsson WWAN devices (eg F5521gw) with FLAG_WWAN
        wanmain: comparing array with NULL
        caif: fix NULL pointer check
        ...
      1e30c1b3
    • Stephen Rothwell's avatar
      Btrfs: using vmalloc and friends needs vmalloc.h · a1857ebe
      Stephen Rothwell authored
      On powerpc, we don't get the implicit vmalloc.h include, and as a result
      the build fails noisily:
      
        fs/btrfs/send.c: In function 'fs_path_free':
        fs/btrfs/send.c:185:4: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
        fs/btrfs/send.c: In function 'fs_path_ensure_buf':
        fs/btrfs/send.c:215:4: error: implicit declaration of function 'vmalloc' [-Werror=implicit-function-declaration]
        fs/btrfs/send.c:215:12: warning: assignment makes pointer from integer without a cast [enabled by default]
        fs/btrfs/send.c:225:12: warning: assignment makes pointer from integer without a cast [enabled by default]
        fs/btrfs/send.c:233:13: warning: assignment makes pointer from integer without a cast [enabled by default]
        fs/btrfs/send.c: In function 'iterate_dir_item':
        fs/btrfs/send.c:900:10: warning: assignment makes pointer from integer without a cast [enabled by default]
        fs/btrfs/send.c:909:11: warning: assignment makes pointer from integer without a cast [enabled by default]
        fs/btrfs/send.c: In function 'btrfs_ioctl_send':
        fs/btrfs/send.c:4463:17: warning: assignment makes pointer from integer without a cast [enabled by default]
        fs/btrfs/send.c:4469:17: warning: assignment makes pointer from integer without a cast [enabled by default]
        fs/btrfs/send.c:4475:2: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration]
        fs/btrfs/send.c:4475:20: warning: assignment makes pointer from integer without a cast [enabled by default]
        fs/btrfs/send.c:4483:21: warning: assignment makes pointer from integer without a cast [enabled by default]
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a1857ebe
  2. 26 Jul, 2012 38 commits
    • Linus Torvalds's avatar
      Merge tag 'remoteproc-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc · a9197f90
      Linus Torvalds authored
      Pull remoteproc update from Ohad Ben-Cohen:
       - custom binary format support from Sjur Brændeland
       - groundwork for recovery and runtime pm support
       - some cleanups and API simplifications
      
      Fix up conflicts in drivers/remoteproc/remoteproc_core.c due to clashes
      with earlier cleanups by Sjur Brændeland (with part of the cleanups
      moved into the new remoteproc_elf_loader.c file).
      
      * tag 'remoteproc-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
        MAINTAINERS: add remoteproc's git
        remoteproc: Support custom firmware handlers
        remoteproc: Move Elf related functions to separate file
        remoteproc: Add function rproc_get_boot_addr
        remoteproc: Pass struct fw to load_segments and find_rsc_table.
        remoteproc: adopt the driver core's alloc/add/del/put naming
        remoteproc: remove the get_by_name/put API
        remoteproc: support non-iommu carveout assignment
        remoteproc: simplify unregister/free interfaces
        remoteproc: remove the now-redundant kref
        remoteproc: maintain a generic child device for each rproc
        remoteproc: allocate vrings on demand, free when not needed
      a9197f90
    • Eric Dumazet's avatar
      ipv6: Early TCP socket demux · c7109986
      Eric Dumazet authored
      This is the IPv6 missing bits for infrastructure added in commit
      41063e9d (ipv4: Early TCP socket demux.)
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c7109986
    • David S. Miller's avatar
      ipv4: Fix input route performance regression. · c6cffba4
      David S. Miller authored
      With the routing cache removal we lost the "noref" code paths on
      input, and this can kill some routing workloads.
      
      Reinstate the noref path when we hit a cached route in the FIB
      nexthops.
      
      With help from Eric Dumazet.
      Reported-by: default avatarAlexander Duyck <alexander.duyck@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c6cffba4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · e2aed8df
      Linus Torvalds authored
      Pull large btrfs update from Chris Mason:
       "This pull request is very large, and the two main features in here
        have been under testing/devel for quite a while.
      
        We have subvolume quotas from the strato developers.  This enables
        full tracking of how many blocks are allocated to each subvolume (and
        all snapshots) and you can set limits on a per-subvolume basis.  You
        can also create quota groups and toss multiple subvolumes into a big
        group.  It's everything you need to be a web hosting company and give
        each user their own subvolume.
      
        The userland side of the quotas is being refreshed, they'll send out
        details on where to grab it soon.
      
        Next is the kernel side of btrfs send/receive from Alexander Block.
        This leverages the same infrastructure as the quota code to figure out
        relationships between blocks and their owners.  It can then compute
        the difference between two snapshots and sends the diffs in a neutral
        format into userland.
      
        The basic model:
      
              create a snapshot
              send that snapshot as the initial backup
              make changes
              create a second snapshot
              send the incremental as a backup
              delete the first snapshot
              (use the second snapshot for the next incremental)
      
        The receive portion is all in userland, and in the 'next' branch of my
        btrfs-progs repo.
      
        There's still some work to do in terms of optimizing the send side
        from kernel to userland.  The really important part is figuring out
        how two snapshots are different, and this is where we are
        concentrating right now.  The initial send of a dataset is a little
        slower than tar, but the incremental sends are dramatically faster
        than what rsync can do.
      
        On top of all of that, we have a nice queue of fixes, cleanups and
        optimizations."
      
      Fix up trivial modify/del conflict in fs/btrfs/ioctl.c
      
      Also fix up semantic conflict in fs/btrfs/send.c: the interface to
      dentry_open() changed in commit 765927b2 ("switch dentry_open() to
      struct path, make it grab references itself"), and since it now grabs
      whatever references it needs, we should no longer do the mntget() on the
      mnt (and we need to dput() the dentry reference we took).
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (65 commits)
        Btrfs: uninit variable fixes in send/receive
        Btrfs: introduce BTRFS_IOC_SEND for btrfs send/receive
        Btrfs: add btrfs_compare_trees function
        Btrfs: introduce subvol uuids and times
        Btrfs: make iref_to_path non static
        Btrfs: add a barrier before a waitqueue_active check
        Btrfs: call the ordered free operation without any locks held
        Btrfs: Check INCOMPAT flags on remount and add helper function
        Btrfs: add helper for tree enumeration
        btrfs: allow cross-subvolume file clone
        Btrfs: improve multi-thread buffer read
        Btrfs: make btrfs's allocation smoothly with preallocation
        Btrfs: lock the transition from dirty to writeback for an eb
        Btrfs: fix potential race in extent buffer freeing
        Btrfs: don't return true in releasepage unless we actually freed the eb
        Btrfs: suppress printk() if all device I/O stats are zero
        Btrfs: remove unwanted printk() for btrfs device I/O stats
        Btrfs: rewrite BTRFS_SETGET_FUNCS
        Btrfs: zero unused bytes in inode item
        Btrfs: kill free_space pointer from inode structure
        ...
      
      Conflicts:
      	fs/btrfs/ioctl.c
      e2aed8df
    • Andy Cress's avatar
      pch_gbe: vlan skb len fix · 4487e64d
      Andy Cress authored
      pch_gbe_xmit_frame skb->len verification was incorrect in vlan case
      causing bogus transfer length errors.  One correction could be:
          offset = skb->protocol == htons(ETH_P_8021Q) ? 0 : 4;
          if (unlikely(skb->len > (adapter->hw.mac.max_frame_size - offset)))
      However, this verification is not necessary, so remove it.
      Signed-off-by: default avatarAndy Cress <andy.cress@us.kontron.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4487e64d
    • Andy Cress's avatar
      pch_gbe: add extra clean tx · f2c31662
      Andy Cress authored
      This adds extra cleaning to the pch_gbe_clean_tx routine to avoid
      transmit timeouts on some BCM PHYs that have different timing.
      Also update the DRV_VERSION to 1.01, and show it.
      Signed-off-by: default avatarAndy Cress <andy.cress@us.kontron.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f2c31662
    • Andy Cress's avatar
      pch_gbe: fix transmit watchdog timeout · 913f53e4
      Andy Cress authored
      An extended ping test with 6 vlans resulted in a driver oops with a
      netdev transmit timeout.
      Fix WATCHDOG_TIMEOUT to be more like e1000e at 5 * HZ, to avoid
      unnecessary transmit timeouts.
      Signed-off-by: default avatarAndy Cress <andy.cress@us.kontron.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      913f53e4
    • Emil Tantilov's avatar
      ixgbe: fix panic while dumping packets on Tx hang with IOMMU · 9c50c035
      Emil Tantilov authored
      This patch resolves a "BUG: unable to handle kernel paging request at ..."
      oops while dumping packet data. The issue occurs with IOMMU enabled due to
      the address provided by phys_to_virt().
      
      This patch makes use of skb->data on Tx and the virtual address of the pages
      allocated for Rx.
      Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
      Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9c50c035
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux · 47652500
      Linus Torvalds authored
      Pull ACPI & power management update from Len Brown:
       "Re-write of the turbostat tool.
           lower overhead was necessary for measuring very large system when
           they are very idle.
      
        IVB support in intel_idle
           It's what I run on my IVB, others should be able to also:-)
      
        ACPICA core update
           We have found some bugs due to divergence between Linux and the
           upstream ACPICA base.  Most of these patches are to reduce that
           divergence to reduce the risk of future bugs.
      
        Some cpuidle updates, mostly for non-Intel
           More will be coming, as they depend on this part.
      
        Some thermal management changes needed by non-ACPI systems.
      
        Some _OST (OS Status Indication) updates for hot ACPI hot-plug."
      
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (51 commits)
        Thermal: Documentation update
        Thermal: Add Hysteresis attributes
        Thermal: Make Thermal trip points writeable
        ACPI/AC: prevent OOPS on some boxes due to missing check power_supply_register() return value check
        tools/power: turbostat: fix large c1% issue
        tools/power: turbostat v2 - re-write for efficiency
        ACPICA: Update to version 20120711
        ACPICA: AcpiSrc: Fix some translation issues for Linux conversion
        ACPICA: Update header files copyrights to 2012
        ACPICA: Add new ACPI table load/unload external interfaces
        ACPICA: Split file: tbxface.c -> tbxfload.c
        ACPICA: Add PCC address space to space ID decode function
        ACPICA: Fix some comment fields
        ACPICA: Table manager: deploy new firmware error/warning interfaces
        ACPICA: Add new interfaces for BIOS(firmware) errors and warnings
        ACPICA: Split exception code utilities to a new file, utexcep.c
        ACPI: acpi_pad: tune round_robin_time
        ACPICA: Update to version 20120620
        ACPICA: Add support for implicit notify on multiple devices
        ACPICA: Update comments; no functional change
        ...
      47652500
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · bd22dc17
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "One of the smaller drm -next pulls in ages!
      
        Ben (nouveau) has a rewrite in progress but we decided to leave it
        stew for another cycle, so just some fixes from him.
      
         - radeon: lots of documentation work, fixes, more ring and locking
           changes, pcie gen2, more dp fixes.
         - i915: haswell features, gpu reset fixes, /dev/agpgart removal on
           machines that we never used it on, more VGA/HDP fix., more DP fixes
         - drm core: cleanups from Daniel, sis 64-bit fixes, range allocator
           colouring.
      
        but yeah fairly quiet merge this time, probably because I missed half
        of it!"
      
      Trivial add-add conflict in include/linux/pci_regs.h
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (255 commits)
        drm/nouveau: init vblank requests list
        drm/nv50: extend vblank semaphore to generic dmaobj + offset pair
        drm/nouveau: mark most of our ioctls as deprecated, move to compat layer
        drm/nouveau: move current gpuobj code out of nouveau_object.c
        drm/nouveau/gem: fix object reference leak in a failure path
        drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION
        drm/nv84: decode PCRYPT errors
        drm/nouveau: dcb table quirk for fdo#50830
        nouveau: Fix alignment requirements on src and dst addresses
        drm/i915: unbreak lastclose for failed driver init
        drm/i915: Set the context before setting up regs for the context.
        drm/i915: constify mode in crtc_mode_fixup
        drm/i915/lvds: ditch ->prepare special case
        drm/i915: dereferencing an error pointer
        drm/i915: fix invalid reference handling of the default ctx obj
        drm/i915: Add -EIO to the list of known errors for __wait_seqno
        drm/i915: Flush the context object from the CPU caches upon switching
        drm/radeon: fix dpms on/off on trinity/aruba v2
        drm/radeon: on hotplug force link training to happen (v2)
        drm/radeon: fix hotplug of DP to DVI|HDMI passive adapters (v2)
        ...
      bd22dc17
    • Linus Torvalds's avatar
      Merge tag 'dlm-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 548ed102
      Linus Torvalds authored
      Pull dlm updatesfrom David Teigland:
       "This set includes a major redesign of recording the master node for
        resources.  The old dir hash table, which just held the master node
        for each resource, has been removed.  The rsb hash table has always
        duplicated the master node value from the dir, and is now the single
        record of it.
      
        Having two full hash tables of all resources has always been a waste,
        especially since one just duplicated a single value from the other.
        Local requests will now often require one instead of two lengthy hash
        table searches.
      
        The other substantial change is made possible by the dirtbl removal,
        and fixes a long standing race between resource removal and lookup by
        reworking how removal is done.  At the same time it improves the
        efficiency of removal by avoiding repeated searches through a hash
        bucket.
      
        The other commits include minor fixes and changes."
      
      * tag 'dlm-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: fix missing dir remove
        dlm: fix conversion deadlock from recovery
        dlm: use wait_event_timeout
        dlm: fix race between remove and lookup
        dlm: use idr instead of list for recovered rsbs
        dlm: use rsbtbl as resource directory
      548ed102
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 98077a72
      Linus Torvalds authored
      Pull CIFS fixes from Steve French.
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: (40 commits)
        cifs: ensure that we always do cifsFileInfo_get under the spinlock
        CIFS: Make CAP_* checks protocol independent
        CIFS: Allow SMB2 statistics to be tracked
        CIFS: Move clear/print_stats code to ops struct
        CIFS: Add echo request support for SMB2
        CIFS: Move echo code to osp struct
        CIFS: Add SMB2 support for async requests
        CIFS: Setup async request in ops struct
        CIFS: Add SMB2 support for build_path_to_root
        CIFS: Move building path to root to ops struct
        CIFS: Query SMB2 inode info
        CIFS: Move query inode info code to ops struct
        CIFS: Add SMB2 support for is_path_accessible
        CIFS: Move is_path_accessible to ops struct
        CIFS: Move informational tcon calls to ops struct
        CIFS: Move getting dfs referalls to ops struct
        CIFS: Process reconnects for SMB2 shares
        CIFS: Add tree connect/disconnect capability for SMB2
        CIFS: Add session setup/logoff capability for SMB2
        CIFS: Add capability to send SMB2 negotiate message
        ...
      98077a72
    • Linus Torvalds's avatar
      Merge tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · f948ad07
      Linus Torvalds authored
      Pull GPIO changes from Linus Walleij:
       - New driver for AMD-8111 southbridge GPIOs
       - New driver for Wolfson Micro Arizona devices
       - Propagate device tree parse errors
       - Probe deferral finalizations - all expected calls to GPIO will now
         hopefully request deferral where apropriate
       - Misc updates to TCA6424, WM8994, LPC32xx, PCF857x, Samsung MXC, OMAP
         and PCA953X drivers.
      
      Fix up gpio_idx conflicts in drivers/gpio/gpio-mxc.c
      
      * tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: of_get_named_gpio_flags() return -EPROBE_DEFER if GPIO not yet available
        gpiolib: Defer failed gpio requests by default
        MAINTAINERS: add entry OMAP GPIO driver
        gpio/pca953x: increase variables size to support 24 bit of data
        GPIO: PCA953X: Increase size of invert variable to support 24 bit
        gpio/omap: move bank->dbck initialization to omap_gpio_mod_init()
        gpio/mxc: use the edge_sel feature if available
        gpio: propagate of_parse_phandle_with_args errors
        gpio: samsung: add flags specifier to device-tree binding
        gpiolib: Add support for Wolfson Microelectronics Arizona class devices
        gpio: gpio-lpc32xx: Add gpio_to_irq mapping
        gpio: pcf857x: share 8/16 bit access functions
        gpio: LPC32xx: Driver cleanup
        MAINTAINERS: Add Wolfson gpiolib drivers to the Wolfson entry
        gpiolib: wm8994: Convert to devm_kzalloc()
        gpiolib: wm8994: Use irq_domain mappings for gpios
        gpio: add a driver for GPIO pins found on AMD-8111 south bridge chips
        gpio/tca6424: merge I2C transactions, remove cast
        gpio/of: fix a typo of comment message
      f948ad07
    • Linus Torvalds's avatar
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 608adca5
      Linus Torvalds authored
      Pull tile PCI build fixes from Chris Metcalf:
       "This fixes a couple of issues with the pci_bus.subordinate removal
        from pci-next as it affected the tile architecture.  One commit does
        the bombing for tilegx PCI (added during the merge window, so missed
        the pci-next bombing) and the other commit undoes a buggy part of the
        bombing for tilepro PCI."
      
      * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tilepro pci: fix pci_bus.subordinate bad bombing from b918c62e
        tilegx pci: fix semantic merge conflict with 3527ed81
      608adca5
    • Josh Boyer's avatar
      posix_types.h: Cleanup stale __NFDBITS and related definitions · 8ded2bbc
      Josh Boyer authored
      Recently, glibc made a change to suppress sign-conversion warnings in
      FD_SET (glibc commit ceb9e56b3d1).  This uncovered an issue with the
      kernel's definition of __NFDBITS if applications #include
      <linux/types.h> after including <sys/select.h>.  A build failure would
      be seen when passing the -Werror=sign-compare and -D_FORTIFY_SOURCE=2
      flags to gcc.
      
      It was suggested that the kernel should either match the glibc
      definition of __NFDBITS or remove that entirely.  The current in-kernel
      uses of __NFDBITS can be replaced with BITS_PER_LONG, and there are no
      uses of the related __FDELT and __FDMASK defines.  Given that, we'll
      continue the cleanup that was started with commit 8b3d1cda
      ("posix_types: Remove fd_set macros") and drop the remaining unused
      macros.
      
      Additionally, linux/time.h has similar macros defined that expand to
      nothing so we'll remove those at the same time.
      Reported-by: default avatarJeff Law <law@redhat.com>
      Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      CC: <stable@vger.kernel.org>
      Signed-off-by: default avatarJosh Boyer <jwboyer@redhat.com>
      [ .. and fix up whitespace as per akpm ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8ded2bbc
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4cb38750
      Linus Torvalds authored
      Pull x86/mm changes from Peter Anvin:
       "The big change here is the patchset by Alex Shi to use INVLPG to flush
        only the affected pages when we only need to flush a small page range.
      
        It also removes the special INVALIDATE_TLB_VECTOR interrupts (32
        vectors!) and replace it with an ordinary IPI function call."
      
      Fix up trivial conflicts in arch/x86/include/asm/apic.h (added code next
      to changed line)
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/tlb: Fix build warning and crash when building for !SMP
        x86/tlb: do flush_tlb_kernel_range by 'invlpg'
        x86/tlb: replace INVALIDATE_TLB_VECTOR by CALL_FUNCTION_VECTOR
        x86/tlb: enable tlb flush range support for x86
        mm/mmu_gather: enable tlb flush range in generic mmu_gather
        x86/tlb: add tlb_flushall_shift knob into debugfs
        x86/tlb: add tlb_flushall_shift for specific CPU
        x86/tlb: fall back to flush all when meet a THP large page
        x86/flush_tlb: try flush_tlb_single one by one in flush_tlb_range
        x86/tlb_info: get last level TLB entry number of CPU
        x86: Add read_mostly declaration/definition to variables from smp.h
        x86: Define early read-mostly per-cpu macros
      4cb38750
    • Linus Torvalds's avatar
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0a2fe19c
      Linus Torvalds authored
      Pul x86/efi changes from Ingo Molnar:
       "This tree adds an EFI bootloader handover protocol, which, once
        supported on the bootloader side, will make bootup faster and might
        result in simpler bootloaders.
      
        The other change activates the EFI wall clock time accessors on x86-64
        as well, instead of the legacy RTC readout."
      
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, efi: Handover Protocol
        x86-64/efi: Use EFI to deal with platform wall clock
      0a2fe19c
    • Linus Torvalds's avatar
      Merge branches 'x86-cleanups-for-linus' and 'x86-cpufeature-for-linus' of... · c1b669b7
      Linus Torvalds authored
      Merge branches 'x86-cleanups-for-linus' and 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull x86 cleanup and cpufeature from Ingo Molnar:
       "Just a single cleanup and and a commit that adds new CPU feature
        names"
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, boot: Remove ancient, unconditionally #ifdef'd out dead code
      
      * 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, cpufeature: Add the RDSEED and ADX features
      c1b669b7
    • Linus Torvalds's avatar
      Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3d72b105
      Linus Torvalds authored
      Pull x86/boot changes from Ingo Molnar:
       "Kernel image size reduction and assorted fixes and other small
        improvements."
      
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, doc: Assign a bootloader ID for "Minimal Linux Bootloader"
        x86, boot: Exclude cmdline.c if you can't use it
        x86, boot: Exclude early_serial_console.c if can't use it.
        x86, boot: Removed unused debug flag and set code
        x86, boot: Switch output functions from command-line flags to conditional compilation
        x86, boot: Changed error putstr path to match new debug_putstr format
        x86, boot: Wrap debug printing in a new debug_putstr function
        x86, boot: Removed quiet flag and switched quiet output to debug flag
      3d72b105
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 79071638
      Linus Torvalds authored
      Pull scheduler changes from Ingo Molnar:
       "The biggest change is a performance improvement on SMP systems:
      
        | 4 socket 40 core + SMT Westmere box, single 30 sec tbench
        | runs, higher is better:
        |
        | clients     1       2       4        8       16       32       64      128
        |..........................................................................
        | pre        30      41     118      645     3769     6214    12233    14312
        | post      299     603    1211     2418     4697     6847    11606    14557
        |
        | A nice increase in performance.
      
        which speedup is particularly noticeable on heavily interacting
        few-tasks workloads, so the changes should help desktop-style Xorg
        workloads and interactivity as well, on multi-core CPUs.
      
        There are also cpuset suspend behavior fixes/restructuring and various
        smaller tweaks."
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched: Fix race in task_group()
        sched: Improve balance_cpu() to consider other cpus in its group as target of (pinned) task
        sched: Reset loop counters if all tasks are pinned and we need to redo load balance
        sched: Reorder 'struct lb_env' members to reduce its size
        sched: Improve scalability via 'CPU buddies', which withstand random perturbations
        cpusets: Remove/update outdated comments
        cpusets, hotplug: Restructure functions that are invoked during hotplug
        cpusets, hotplug: Implement cpuset tree traversal in a helper function
        CPU hotplug, cpusets, suspend: Don't modify cpusets during suspend/resume
        sched/x86: Remove broken power estimation
      79071638
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 44a6b844
      Linus Torvalds authored
      Pull crypto updates from Herbert Xu:
      
       - Fixed algorithm construction hang when self-test fails.
       - Added SHA variants to talitos AEAD list.
       - New driver for Exynos random number generator.
       - Performance enhancements for arc4.
       - Added hwrng support to caam.
       - Added ahash support to caam.
       - Fixed bad kfree in aesni-intel.
       - Allow aesni-intel in FIPS mode.
       - Added atmel driver with support for AES/3DES/SHA.
       - Bug fixes for mv_cesa.
       - CRC hardware driver for BF60x family processors.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (66 commits)
        crypto: twofish-avx - remove useless instruction
        crypto: testmgr - add aead cbc aes hmac sha1,256,512 test vectors
        crypto: talitos - add sha224, sha384 and sha512 to existing AEAD algorithms
        crypto: talitos - export the talitos_submit function
        crypto: talitos - move talitos structures to header file
        crypto: atmel - add new tests to tcrypt
        crypto: atmel - add Atmel SHA1/SHA256 driver
        crypto: atmel - add Atmel DES/TDES driver
        crypto: atmel - add Atmel AES driver
        ARM: AT91SAM9G45: add crypto peripherals
        crypto: testmgr - allow aesni-intel and ghash_clmulni-intel in fips mode
        hwrng: exynos - Add support for Exynos random number generator
        crypto: aesni-intel - fix wrong kfree pointer
        crypto: caam - ERA retrieval and printing for SEC device
        crypto: caam - Using alloc_coherent for caam job rings
        crypto: algapi - Fix hang on crypto allocation
        crypto: arc4 - now arc needs blockcipher support
        crypto: caam - one tasklet per job ring
        crypto: caam - consolidate memory barriers from job ring en/dequeue
        crypto: caam - only query h/w in job ring dequeue path
        ...
      44a6b844
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 945c40c6
      Linus Torvalds authored
      Pull input layer updates from Dmitry Torokhov:
       "First set of updates for the input subsystem.  You will get a new
        touchscreen driver (Melfas mms114), a new keypad driver for LPC32xx
        SoC, large update to Atmel mXT touchscreen driver, a lot of drivers
        acquired device tree support and a slew of other fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
        Input: add MELFAS mms114 touchscreen driver
        Input: add support for key scan interface of the LPC32xx SoC
        Input: omap4-keypad - add device tree support
        Input: hanwang - add support for Art Master II tablet
        Input: spear_keyboard - reconfigure operating frequency on suspend
        Input: spear_keyboard - fix clock handling during suspend/resume
        Input: ff-memless - fix a couple min_t() casts
        Input: synaptics - print firmware ID and board number at init
        Input: spear_keyboard - generalize keyboard frequency configuration
        Input: spear_keyboard - rename bit definitions to reflect register
        Input: spear_keyboard - use correct io accessors
        Input: spear-keyboard - fix disable device_init_wakeup in remove
        Input: wacom_i2c - fix compiler warning
        Input: imx_keypad - check error returned by clk_prepare_enable()
        Input: imx_keypad - adapt the new kpp clock name
        Input: imx_keypad - use clk_prepare_enable/clk_disable_unprepare()
        Input: ad7879 - add option to correct xy axis
        Input: synaptics_usb - Remove TrackPoint name trailing whitespace
        Revert "Input: atmel_mxt_ts - warn if sysfs could not be created"
        Input: MT - Include win8 support
        ...
      945c40c6
    • Linus Torvalds's avatar
      Merge tag 'spi-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc · 0082c16e
      Linus Torvalds authored
      Pull spi updates from Mark Brown:
       "Since Grant is even more specacularly busy than usual for the time
        being I've been collecting SPI patches for him for this release -
        probably things will revert back to Grant before the next release.
      
        There's nothing too exciting here, mostly it's simple driver specific
        stuff:
      
         - Add spi: to the modaliases of SPI devices to provide namespacing.
         - A driver for AD-FMCOMMS1-EBZ.
         - DT binding for Orion.
         - Fixes and cleanups for i.MX, PL0022, OMAP and bitbang drivers.
      
         There may be a few more fixes I've missed, people keep sending me new
         things."
      
      * tag 'spi-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc:
        spi/orion: remove uneeded spi_info
        spi/bcm63xx: fix clock configuration selection
        spi/orion: add device tree binding
        spi/omap2: mark omap2_mcspi_master_setup as __devinit
        spi: omap2-mcspi: Fix the below warning
        spi: Add AD-FMCOMMS1-EBZ I2C-SPI bridge driver
        spi/imx: use gpio_is_valid to determine if a gpio is valid
        spi/imx: remove redundant config.speed_hz setting
        spi/gpio: start with CS non-active
        spi: tegra: use dmaengine based dma driver
        spi/pl022: cleanup pl022 header documentation
        spi/pl022: enable runtime PM
        spi/pl022: delete DB5500 support
        spi/pl022: disable port when unused
        spi: Add "spi:" prefix to modalias attribute of spi devices
      0082c16e
    • Hauke Mehrtens's avatar
      bcma: fix invalid PMU chip control masks · 1f03bf06
      Hauke Mehrtens authored
      Commit b9562545 ("bcma: complete workaround for BCMA43224 and
      BCM4313") introduced the wrong masks for setting the chip control
      registers - the "mask" parameter is inverse.
      
      It should be the mask of bits *not* changed, which is admittedly a bit
      non-intuitive.
      
      The incorrect mask not only causes the driver to not work correctly on
      the chips affected (eg the BCM43224 on the Macbook Air 4,2) but the
      state persists over a soft reset, causing the next boot to not
      necessarily see the device correctly.
      Reported-and-tested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Tested-by: default avatarSeth Forshee <seth.forshee@canonical.com>
      Cc: Hauke Mehrtens <hauke@hauke-m.de>
      Cc: Arend Van Spriel <arend@broadcom.com>
      Cc: Pieter-Paul Giesberts <pieterpg@broadcom.com>
      Cc: Brett Rudley <brudley@broadcom.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1f03bf06
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · b84382f5
      Linus Torvalds authored
      Pull char/misc patches from Greg Kroah-Hartman:
       "Here's the "big" pull request for 3.6-rc1 for the char/misc drivers.
      
        It's really just a few updates to the mei driver, plus 4 other tiny
        patches, nothing big at all.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'char-misc-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        mei: use module_pci_driver
        powerpc/BSR: cleanup the error path of bsr_init
        mei: mei_irq_thread_write_handler - line break fix
        mei: streamline the _mei_irq_thread_close/ioctol functions
        mei: introduce mei_data2slots wrapper
        mei: mei_wd_host_init: update the comment
        mei: remove write only wariable wd_due_counter
        mei: mei_device can be const for mei register access functions
        mei: revamp host buffer interface function
        mei: don't query HCSR for host buffer depth
        mei: group wd_interface_reg with watchdog variables within struct mei_device
        mei: mei_irq_thread_write_handler check for overflow
        mei: make mei_write_message more readable
        mei: check for error codes that mei_flow_ctrl_creds retuns
        misc: at25: Parse dt settings
        misc: hpilo: increase number of max supported channels
        mei: mei.txt: minor grammar fixes
      b84382f5
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · fa93669a
      Linus Torvalds authored
      Pull driver core changes from Greg Kroah-Hartman:
       "Here's the big driver core pull request for 3.6-rc1.
      
        Unlike 3.5, this kernel should be a lot tamer, with the printk changes
        now settled down.  All we have here is some extcon driver updates, w1
        driver updates, a few printk cleanups that weren't needed for 3.5, but
        are good to have now, and some other minor fixes/changes in the driver
        core.
      
        All of these have been in the linux-next releases for a while now.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
        printk: Export struct log size and member offsets through vmcoreinfo
        Drivers: hv: Change the hex constant to a decimal constant
        driver core: don't trigger uevent after failure
        extcon: MAX77693: Add extcon-max77693 driver to support Maxim MAX77693 MUIC device
        sysfs: fail dentry revalidation after namespace change fix
        sysfs: fail dentry revalidation after namespace change
        extcon: spelling of detach in function doc
        extcon: arizona: Stop microphone detection if we give up on it
        extcon: arizona: Update cable reporting calls and split headset
        PM / Runtime: Do not increment device usage counts before probing
        kmsg - do not flush partial lines when the console is busy
        kmsg - export "continuation record" flag to /dev/kmsg
        kmsg - avoid warning for CONFIG_PRINTK=n compilations
        kmsg - properly print over-long continuation lines
        driver-core: Use kobj_to_dev instead of re-implementing it
        driver-core: Move kobj_to_dev from genhd.h to device.h
        driver core: Move deferred devices to the end of dpm_list before probing
        driver core: move uevent call to driver_register
        driver core: fix shutdown races with probe/remove(v3)
        Extcon: Arizona: Add driver for Wolfson Arizona class devices
        ...
      fa93669a
    • Linus Torvalds's avatar
      Merge tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · b13bc8dd
      Linus Torvalds authored
      Pull staging tree patches from Greg Kroah-Hartman:
       "Here's the big staging tree merge for the 3.6-rc1 merge window.
      
        There are some patches in here outside of drivers/staging/, notibly
        the iio code (which is still stradeling the staging / not staging
        boundry), the pstore code, and the tracing code.  All of these have
        gotten acks from the various subsystem maintainers to be included in
        this tree.  The pstore and tracing patches are related, and are coming
        here as they replace one of the android staging drivers.
      
        Otherwise, the normal staging mess.  Lots of cleanups and a few new
        drivers (some iio drivers, and the large csr wireless driver
        abomination.)
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      Fixed up trivial conflicts in drivers/staging/comedi/drivers/s626.h and
      drivers/staging/gdm72xx/netlink_k.c
      
      * tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1108 commits)
        staging: csr: delete a bunch of unused library functions
        staging: csr: remove csr_utf16.c
        staging: csr: remove csr_pmem.h
        staging: csr: remove CsrPmemAlloc
        staging: csr: remove CsrPmemFree()
        staging: csr: remove CsrMemAllocDma()
        staging: csr: remove CsrMemCalloc()
        staging: csr: remove CsrMemAlloc()
        staging: csr: remove CsrMemFree() and CsrMemFreeDma()
        staging: csr: remove csr_util.h
        staging: csr: remove CsrOffSetOf()
        stating: csr: remove unneeded #includes in csr_util.c
        staging: csr: make CsrUInt16ToHex static
        staging: csr: remove CsrMemCpy()
        staging: csr: remove CsrStrLen()
        staging: csr: remove CsrVsnprintf()
        staging: csr: remove CsrStrDup
        staging: csr: remove CsrStrChr()
        staging: csr: remove CsrStrNCmp
        staging: csr: remove CsrStrCmp
        ...
      b13bc8dd
    • Linus Torvalds's avatar
      Merge tag 'usb-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 9fc37779
      Linus Torvalds authored
      Pull USB patches from Greg Kroah-Hartman:
       "Here's the big USB patch set for the 3.6-rc1 merge window.
      
        Lots of little changes in here, primarily for gadget controllers and
        drivers.  There's some scsi changes that I think also went in through
        the scsi tree, but they merge just fine.  All of these patches have
        been in the linux-next tree for a while now.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      Fix up trivial conflicts in include/scsi/scsi_device.h (same libata
      conflict that Jeff had already encountered)
      
      * tag 'usb-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (207 commits)
        usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC webcams
        usb: Add quirk detection based on interface information
        usb: s3c-hsotg: Add header file protection macros in s3c-hsotg.h
        USB: ehci-s5p: Add vbus setup function to the s5p ehci glue layer
        USB: add USB_VENDOR_AND_INTERFACE_INFO() macro
        USB: notify phy when root hub port connect change
        USB: remove 8 bytes of padding from usb_host_interface on 64 bit builds
        USB: option: add ZTE MF821D
        USB: sierra: QMI mode MC7710 moved to qcserial
        USB: qcserial: adding Sierra Wireless devices
        USB: qcserial: support generic Qualcomm serial ports
        USB: qcserial: make probe more flexible
        USB: qcserial: centralize probe exit path
        USB: qcserial: consolidate usb_set_interface calls
        USB: ehci-s5p: Add support for device tree
        USB: ohci-exynos: Add support for device tree
        USB: ehci-omap: fix compile failure(v1)
        usb: host: tegra: pass correct pointer in ehci_setup()
        USB: ehci-fsl: Update ifdef check to work on 64-bit ppc
        USB: serial: keyspan: Removed unrequired parentheses.
        ...
      9fc37779
    • Linus Torvalds's avatar
      Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 5e23ae49
      Linus Torvalds authored
      Pull libata updates from Jeff Garzik:
       "Notable changes:
      
         - Updating libata to directly bind with ACPI / runtime power mgmt.
           This is a pre-req for SATA ZPODD (CD-ROM power management).
      
           Touches ACPI (exports++) and SCSI in minor ways.  Has been in
           linux-next for weeks.
      
           The rest of this should come via SCSI tree, as it involves a lot of
           updates to the 'sr' driver etc.
      
        Other, minor changes:
      
         - module_pci_driver() removes a lot of common boilerplate from each
           PCI driver
      
         - minor coding style, whitespace cleanups
      
         - pata_pcmcia bug fix, caught by Coccinelle
      
         - pata_imx, sata_dwc_460ex minor vendor updates
      
         - ahci_platform: use simple PM ops, and thereby add hibernation cb's
      
         - Add a few device-specific quirks"
      
      * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (23 commits)
        [libata] pata_cmd64x: whitespace cleanup
        libata-acpi: fix up for acpi_pm_device_sleep_state API
        sata_dwc_460ex: device tree may specify dma_channel
        ahci, trivial: fixed coding style issues related to braces
        ahci_platform: add hibernation callbacks
        libata-eh.c: local functions should not be exposed globally
        libata-transport.c: local functions should not be exposed globally
        sata_dwc_460ex: support hardreset
        ata: use module_pci_driver
        drivers/ata/pata_pcmcia.c: adjust suspicious bit operation
        pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare
        ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2
        [libata] Prevent interface errors with Seagate FreeAgent GoFlex
        drivers/acpi/glue: revert accidental license-related 6b66d958 bits
        libata-acpi: add missing inlines in libata.h
        libata: tell scsi layer device supports runtime power off
        libata: detect Device Attention support
        libata-acpi: register/unregister device to/from power resource
        libata-acpi: add ata port runtime D3Cold support
        libata-acpi: set acpi state for SATA port
        ...
      5e23ae49
    • Sarveshwar Bandi's avatar
      be2net: Fix to parse RSS hash from Receive completions correctly. · c297977e
      Sarveshwar Bandi authored
      Wrong pointer variable is being used to parse the rss hash from
      receive completions leading to corrupted rss_hash values filled into skb.
      Signed-off-by: default avatarSarveshwar Bandi <sarveshwar.bandi@emulex.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c297977e
    • Amir Vadai's avatar
      net/mlx4_en: Limit the RFS filter IDs to be < RPS_NO_FILTER · ee64c0ee
      Amir Vadai authored
      RFS filter id can't have the special value RPS_NO_FILTER,
      need to skip it when allocating id's.
      
      CC: Ben Hutchings <bhutchings@solarflare.com>
      Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
      Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ee64c0ee
    • Len Brown's avatar
      Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery',... · ec033d0a
      Len Brown authored
      Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupled', 'cpuidle-tweaks', 'intel_idle-ivb', 'ost', 'red-hat-bz-772730', 'thermal', 'thermal-spear' and 'turbostat-v2' into release
      ec033d0a
    • Dave Airlie's avatar
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next · 98c7b423
      Dave Airlie authored
      Daniel writes: (this pull is the one with the bad patch dropped)
      First pile of fixes for 3.6 already, and I'm afraid it's a bit larger than
      what I'd wish for. But I've moved all the feature-y stuff to -next, so
      this really is all -fixes. Most of it is handling fallout from the hw
      context stuff, discovered now that mesa git has started using them for
      real. Otherwise all just small fixes:
      - unbreak modeset=0 on gen6+ (regressed in next)
      - const mismatch fix for ->mode_fixup
      - simplify overly clever lvds modeset code (current code can totally
        confuse backlights, resulting in broken panels until a full power draw
        restores them).
      - fix some fallout from the flushing_list disabling (regression only
        introduced in -next)
      - DP link train improvements (this also kills the last 3.2 dp regression
        afaik)
      - bugfix for the new ddc VGA detection on newer platforms
      - minor backlight fixes (one of them a -next regression)
      - only enable the required PM interrupts (to avoid waking up the cpu
        unnecessarily)
      - some really minor bits (workaround clarification, make coverty happy,
        hsw init fix)
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: (23 commits)
        drm/i915: unbreak lastclose for failed driver init
        drm/i915: Set the context before setting up regs for the context.
        drm/i915: constify mode in crtc_mode_fixup
        drm/i915/lvds: ditch ->prepare special case
        drm/i915: dereferencing an error pointer
        drm/i915: fix invalid reference handling of the default ctx obj
        drm/i915: Add -EIO to the list of known errors for __wait_seqno
        drm/i915: Flush the context object from the CPU caches upon switching
        drm/i915: Make the lock for pageflips interruptible
        drm/i915: don't forget the PCH backlight registers
        drm/i915: Insert a flush between batches if the breadcrumb was dropped
        drm/i915: missing error case in init status page
        drm/i915: mask tiled bit when updating ILK sprites
        drm/i915: try to train DP even harder
        drm/i915: kill intel_ddc_probe
        drm/i915: check whether we actually received an edid in detect_ddc
        drm/i915: fix up PCH backlight #define mixup
        drm/i915: Add comments to explain the BSD tail write workaround
        drm/i915: Disable the BLT on pre-production SNB hardware
        drm/i915: initialize power wells in modeset_init_hw
        ...
      98c7b423
    • Dave Airlie's avatar
      Merge branch 'drm-nouveau-fixes' of... · 2536f7dc
      Dave Airlie authored
      Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
      
      * 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
        drm/nouveau: init vblank requests list
        drm/nv50: extend vblank semaphore to generic dmaobj + offset pair
        drm/nouveau: mark most of our ioctls as deprecated, move to compat layer
        drm/nouveau: move current gpuobj code out of nouveau_object.c
        drm/nouveau/gem: fix object reference leak in a failure path
        drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION
        drm/nv84: decode PCRYPT errors
        drm/nouveau: dcb table quirk for fdo#50830
        nouveau: Fix alignment requirements on src and dst addresses
      2536f7dc
    • Marcin Slusarz's avatar
      drm/nouveau: init vblank requests list · 71585545
      Marcin Slusarz authored
      Fixes kernel panic when vblank interrupt triggers before first sync to
      vblank request.
      
      (Besides init, remove some relevant leftovers from vblank rework)
      Reported-by: default avatarOrtwin Glück <odi@odi.ch>
      Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
      Cc: stable@vger.kernel.org [3.5]
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      71585545
    • Ben Skeggs's avatar
    • Ben Skeggs's avatar
      drm/nouveau: mark most of our ioctls as deprecated, move to compat layer · 2a259a3d
      Ben Skeggs authored
      These will be replaced in the near future, the code isn't yet stable enough
      for this merge window however.
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      2a259a3d
    • Ben Skeggs's avatar
      drm/nouveau: move current gpuobj code out of nouveau_object.c · ce22af03
      Ben Skeggs authored
      I want this file for the new interfaces...
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      ce22af03