1. 26 Mar, 2012 1 commit
    • David Howells's avatar
      SELinux: selinux/xfrm.h needs net/flow.h · 778aae84
      David Howells authored
      selinux/xfrm.h needs to #include net/flow.h or else suffer:
      In file included from security/selinux/ss/services.c:69:0:
      security/selinux/include/xfrm.h: In function 'selinux_xfrm_notify_policyload':
      security/selinux/include/xfrm.h:53:14: error: 'flow_cache_genid' undeclared (first use in this function)
      security/selinux/include/xfrm.h:53:14: note: each undeclared identifier is reported only once for each function it appears in
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
  2. 23 Mar, 2012 13 commits
    • David Howells's avatar
      ARM: Fix missing linux/types.h #inclusion in asm/hardware/iop3xx.h · 15e9b9b9
      David Howells authored
      arch/arm/include/asm/hardware/iop3xx.h needs to include linux/types.h to avoid
      the following errors:
      In file included from arch/arm/plat-iop/restart.c:10:0:
      /data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h:239:1: error: unknown type name 'u32'
      /data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h: In function 'read_tmr0':
      /data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h:241:2: error: unknown type name 'u32'
      /data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h: At top level:
      /data/fs/linux-2.6-fscache/arch/arm/include/asm/hardware/iop3xx.h:246:31: error: unknown type name 'u32'
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
    • Linus Torvalds's avatar
      Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6 · 43753826
      Linus Torvalds authored
      Pull fbdev updates for 3.4 from Florian Tobias Schandinat:
       - drivers for Samsung Exynos MIPI DSI and display port
       - i740fb to support those old Intel chips
       - large updates to OMAP, viafb and sh_mobile_lcdcfb
       - some updates to s3c-fb and udlfb, few patches to others
      Fix up conflicts in drivers/video/udlfb.c due to Key Sievers' fix making
      it in twice.
      * tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6: (156 commits)
        Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page"
        OMAPDSS: register dss drivers in module init
        video: pxafb: add clk_prepare/clk_unprepare calls
        fbdev: bfin_adv7393fb: Drop needless include
        fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info
        fbdev: remove dependency of FB_SH_MOBILE_MERAM from FB_SH_MOBILE_LCDC
        Revert "MAINTAINERS: add entry for exynos mipi display drivers"
        fbdev: da8xx: add support for SP10Q010 display
        fbdev: da8xx:: fix reporting of the display timing info
        drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
        OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update
        fbdev: sh_mobile_meram: Implement system suspend/resume
        fbdev: sh_mobile_meram: Remove unneeded sanity checks
        fbdev: sh_mobile_meram: Don't perform update in register operation
        arm: mach-shmobile: Constify sh_mobile_meram_cfg structures
        fbdev: sh_mobile_lcdc: Don't store copy of platform data
        fbdev: sh_mobile_meram: Remove unused sh_mobile_meram_icb_cfg fields
        arm: mach-shmobile: Don't set MERAM ICB numbers in platform data
        fbdev: sh_mobile_meram: Allocate ICBs automatically
        fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocation
    • Linus Torvalds's avatar
      Merge tag 'regmap-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · 9586c959
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "Things are really quieting down with the regmap API, while we're still
        seeing a trickle of new features coming in they're getting much
        smaller than they were.  It's also nice to have some features which
        support other subsystems building infrastructure on top of regmap.
        Highlights include:
        - Support for padding between the register and the value when
          interacting with the device, sometimes needed for fast interfaces.
        - Support for applying register updates to the device when restoring
          the register state.  This is intended to be used to apply updates
          supplied by manufacturers for tuning the performance of the device
          (many of which are to undocumented registers which aren't otherwise
        - Support for multi-register operations on cached registers.
        - Support for syncing only part of the register cache.
        - Stubs and parameter query functions intended to make it easier for
          other subsystems to build infrastructure on top of the regmap API.
        plus a few driver updates making use of the new features which it was
        easier to merge via this tree."
      * tag 'regmap-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: (41 commits)
        regmap: Fix future missing prototype of devres_alloc() and friends
        regmap: Rejig struct declarations for stubbed API
        regmap: Fix rbtree block base in sync
        regcache: Make sure we sync register 0 in an rbtree cache
        regmap: delete unused module.h from drivers/base/regmap files
        regmap: Add stub for regcache_sync_region()
        mfd: Improve performance of later WM1811 revisions
        regmap: Fix x86_64 breakage
        regmap: Allow drivers to sync only part of the register cache
        regmap: Supply ranges to the sync operations
        regmap: Add tracepoints for cache only and cache bypass
        regmap: Mark the cache as clean after a successful sync
        regmap: Remove default cache sync implementation
        regmap: Skip hardware defaults for LZO caches
        regmap: Expose the driver name in debugfs
        mfd: wm8400: Convert to devm_regmap_init_i2c()
        mfd: wm831x: Convert to devm_regmap_init()
        mfd: wm8994: Convert to devm_regmap_init()
        mfd/ASoC: Convert WM8994 driver to use regmap patches
        mfd: Add __devinit and __devexit annotations in wm8994
    • Linus Torvalds's avatar
      Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · 34699403
      Linus Torvalds authored
      Pull IEEE 1394 (FireWire) subsystem updates post v3.3 from Stefan Richter:
       - Some SBP-2 initiator fixes, side product from ongoing work on a target.
       - Reintroduction of an isochronous I/O feature of the older ieee1394 driver
         stack (flush buffer completions); it was evidently rarely used but not
         actually unused.  Matching libraw1394 code is already available.
       - Be sure to prefix all kernel log messages with device name or card name,
         and other logging related cleanups.
       - Misc other small cleanups, among them a small API change that affects
         sound/firewire/ too. Clemens Ladisch is aware of it.
      * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: (26 commits)
        firewire: allow explicit flushing of iso packet completions
        firewire: prevent dropping of completed iso packet header data
        firewire: ohci: factor out iso completion flushing code
        firewire: ohci: simplify iso header pointer arithmetic
        firewire: ohci: optimize control bit checks
        firewire: ohci: remove unused excess_bytes field
        firewire: ohci: copy_iso_headers(): make comment match the code
        firewire: cdev: fix IR multichannel event documentation
        firewire: ohci: fix too-early completion of IR multichannel buffers
        firewire: ohci: move runtime debug facility out of #ifdef
        firewire: tone down some diagnostic log messages
        firewire: sbp2: replace a GFP_ATOMIC allocation
        firewire: sbp2: Fix SCSI sense data mangling
        firewire: sbp2: Ignore SBP-2 targets on the local node
        firewire: sbp2: Take into account Unit_Unique_ID
        firewire: nosy: Use the macro DMA_BIT_MASK().
        firewire: core: convert AR-req handler lock from _irqsave to _bh
        firewire: core: fix race at address_handler unregistration
        firewire: core: remove obsolete comment
        firewire: core: prefix log messages with card name
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 7fc86a79
      Linus Torvalds authored
      Pull pinctrl updates for v3.4 from Linus Walleij (*):
       - Switches the PXA 168, 910 and MMP over to use pinctrl
       - Locking revamped
       - Massive refactorings...
       - Reform the driver API to use multiple states
       - Support pin config in the mapping tables
       - Pinctrl drivers for the nVidia Tegra series
       - Generic pin config support lib for simple pin controllers
       - Implement pin config for the U300
      * tag 'pinctrl-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (48 commits)
        ARM: u300: configure some pins as an example
        pinctrl: support pinconfig on the U300
        pinctrl/coh901: use generic pinconf enums and parameters
        pinctrl: introduce generic pin config
        pinctrl: fix error path in pinconf_map_to_setting()
        pinctrl: allow concurrent gpio and mux function ownership of pins
        pinctrl: forward-declare struct device
        pinctrl: split pincontrol states into its own header
        pinctrl: include machine header to core.h
        ARM: tegra: Select PINCTRL Kconfig variables
        pinctrl: add a driver for NVIDIA Tegra
        pinctrl: Show selected function and group in pinmux-pins debugfs
        pinctrl: enhance mapping table to support pin config operations
        pinctrl: API changes to support multiple states per device
        pinctrl: add usecount to pins for muxing
        pinctrl: refactor struct pinctrl handling in core.c vs pinmux.c
        pinctrl: fix and simplify locking
        pinctrl: fix the pin descriptor kerneldoc
        pinctrl: assume map table entries can't have a NULL name field
        pinctrl: introduce PINCTRL_STATE_DEFAULT, define hogs as that state
      (*) What is it with all these Linuses these days? There's a Linus at
          google too.  Some day I will get myself my own broadsword, and run
          around screaming "There can be only one".
          I used to be _special_ dammit. Snif.
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 90597b6c
      Linus Torvalds authored
      Pull libata updates from Jeff Garzik:
       1) AHCI regression fix.  A recent "make driver conform to spec" change
          broke on deployed hardware.  Make new behavior optional, rather than
          default, turning it on only for specific embedded platforms that
          need this.
          Everybody else runs in the famous "non conformant but working" mode.
       2) pata_cmd64x, pata_legacy cleanups
       3) new Intel SATA PCI IDs
       4) misc minor vendor feature additions
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        pata_cmd64x: implement sff_irq_check() method
        pata_cmd64x: implement sff_irq_clear() method
        pata_cmd64x: use interrupt status from MRDMODE register
        pata_cmd64x: turn string of *if* statements into *switch*
        drivers/ata/pata_mpc52xx.c: clean up error handling code
        ahci_platform: add STRICT_AHCI platform type
        ahci: move AHCI_HFLAGS() macro to ahci.h
        ahci: add AHCI_HFLAG_DELAY_ENGINE host flag
        sata_fsl: add support for interrupt coalsecing feature
        ata/pata_arasan_cf: Add Hibernation support
        pata_legacy: correctly mask recovery field for HT6560B
        ata_piix: IDE-mode SATA patch for Intel Lynx Point DeviceIDs
        ahci: AHCI-mode SATA patch for Intel Lynx Point DeviceIDs
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 7bfe0e66
      Linus Torvalds authored
      Pull input subsystem updates from Dmitry Torokhov:
       "- we finally merged driver for USB version of Synaptics touchpads
          (I guess most commonly found in IBM/Lenovo keyboard/touchpad combo);
         - a bunch of new drivers for embedded platforms (Cypress
           touchscreens, DA9052 OnKey, MAX8997-haptic, Ilitek ILI210x
           touchscreens, TI touchscreen);
         - input core allows clients to specify desired clock source for
           timestamps on input events (EVIOCSCLOCKID ioctl);
         - input core allows querying state of all MT slots for given event
           code via EVIOCGMTSLOTS ioctl;
         - various driver fixes and improvements."
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (45 commits)
        Input: ili210x - add support for Ilitek ILI210x based touchscreens
        Input: altera_ps2 - use of_match_ptr()
        Input: synaptics_usb - switch to module_usb_driver()
        Input: convert I2C drivers to use module_i2c_driver()
        Input: convert SPI drivers to use module_spi_driver()
        Input: omap4-keypad - move platform_data to <linux/platform_data>
        Input: kxtj9 - who_am_i check value and initial data rate fixes
        Input: add driver support for MAX8997-haptic
        Input: tegra-kbc - revise device tree support
        Input: of_keymap - add device tree bindings for simple key matrices
        Input: wacom - fix physical size calculation for 3rd-gen Bamboo
        Input: twl4030-vibra - really switch from #if to #ifdef
        Input: hp680_ts_input - ensure arguments to request_irq and free_irq are compatible
        Input: max8925_onkey - avoid accessing input device too early
        Input: max8925_onkey - allow to be used as a wakeup source
        Input: atmel-wm97xx - convert to dev_pm_ops
        Input: atmel-wm97xx - set driver owner
        Input: add cyttsp touchscreen maintainer entry
        Input: cyttsp - remove useless checks in cyttsp_probe()
        Input: usbtouchscreen - add support for Data Modul EasyTouch TP 72037
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 6a76a699
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       "This fixes a build problem where two crypto modules both try to export
        the same symbols (which shouldn't have been exported in the first
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: twofish-x86_64-3way - module init/exit functions should be static
        crypto: camellia-x86_64 - module init/exit functions should be static
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · d4c6fa73
      Linus Torvalds authored
      Pull xen updates from Konrad Rzeszutek Wilk:
       "which has three neat features:
         - PV multiconsole support, so that there can be hvc1, hvc2, etc; This
           can be used in HVM and in PV mode.
         - P-state and C-state power management driver that uploads said power
           management data to the hypervisor.  It also inhibits cpufreq
           scaling drivers to load so that only the hypervisor can make power
           management decisions - fixing a weird perf bug.
           There is one thing in the Kconfig that you won't like: "default y
           if (X86_ACPI_CPUFREQ = y || X86_POWERNOW_K8 = y)" (note, that it
           all depends on CONFIG_XEN which depends on CONFIG_PARAVIRT which by
           default is off).  I've a fix to convert that boolean expression
           into "default m" which I am going to post after the cpufreq git
           pull - as the two patches to make this work depend on a fix in Dave
           Jones's tree.
         - Function Level Reset (FLR) support in the Xen PCI backend.
         - Kconfig dependencies for Xen PV keyboard and video
         - Compile warnings and constify fixes
         - Change over to use percpu_xxx instead of this_cpu_xxx"
      Fix up trivial conflicts in drivers/tty/hvc/hvc_xen.c due to changes to
      a removed commit.
      * tag 'stable/for-linus-3.4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen kconfig: relax INPUT_XEN_KBDDEV_FRONTEND deps
        xen/acpi-processor: C and P-state driver that uploads said data to hypervisor.
        xen: constify all instances of "struct attribute_group"
        xen/xenbus: ignore console/0
        hvc_xen: introduce HVC_XEN_FRONTEND
        hvc_xen: implement multiconsole support
        hvc_xen: support PV on HVM consoles
        xenbus: don't free other end details too early
        xen/enlighten: Expose MWAIT and MWAIT_LEAF if hypervisor OKs it.
        xen/setup/pm/acpi: Remove the call to boot_option_idle_override.
        xenbus: address compiler warnings
        xen: use this_cpu_xxx replace percpu_xxx funcs
        xen/pciback: Support pci_reset_function, aka FLR or D3 support.
        pci: Introduce __pci_reset_function_locked to be used when holding device_lock.
        xen: Utilize the restore_msi_irqs hook.
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm · aab008db
      Linus Torvalds authored
      Pull cleancache changes from Konrad Rzeszutek Wilk:
       "This has some patches for the cleancache API that should have been
        submitted a _long_ time ago.  They are basically cleanups:
         - rename of flush to invalidate
         - moving reporting of statistics into debugfs
         - use __read_mostly as necessary.
        Oh, and also the MAINTAINERS file change.  The files (except the
        MAINTAINERS file) have been in #linux-next for months now.  The late
        addition of MAINTAINERS file is a brain-fart on my side - didn't
        realize I needed that just until I was typing this up - and I based
        that patch on v3.3 - so the tree is on top of v3.3."
      * tag 'stable/for-linus-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
        MAINTAINERS: Adding cleancache API to the list.
        mm: cleancache: Use __read_mostly as appropiate.
        mm: cleancache: report statistics via debugfs instead of sysfs.
        mm: zcache/tmem/cleancache: s/flush/invalidate/
        mm: cleancache: s/flush/invalidate/
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin · 4f5b1aff
      Linus Torvalds authored
      Pull blackfin updates from Bob Liu
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin: (24 commits)
        blackfin: clean up string bfin_dma_5xx after rename.
        blackfin:dma: rename bfin_dma_5xx.c to bfin_dma.c
        bf548: ssm2602: Add ssm2602 platform data into bf548 ezkit board file.
        Blackfin: s/#if CONFIG/#ifdef CONFIG/
        Blackfin: pnav: delete duplicate linux/export.h include
        bf561: add ppi DLEN macro for 10bits to 16bits
        arch: blackfin: udpate defconfig
        Disintegrate asm/system.h for Blackfin [ver #2]
        arch/blackfin: don't generate random mac in bfin_get_ether_addr()
        Blackfin: wire up new process_vm syscalls
        blackfin: cleanup anomaly workarounds
        blackfin: update default defconfig
        blackfin: thread_info: add suspend flag
        bfin: add bfin_ad73311_machine platform device
        blackfin: bf537: stamp: update board file for 193x
        blackfin: kgdb: skip hardware watchpoint test
        bf548: add ppi interrupt mask and blanking clocks
        blackfin: bf561: forgot CSYNC in get_core_lock_noflush
        spi/bfin_spi: drop bits_per_word from client data
        blackfin: cplb-mpu: fix page mask table overflow
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · db141796
      Linus Torvalds authored
      Pull s390 patches from Martin Schwidefsky:
       "The biggest patch is the rework of the smp code, something I wanted to
        do for some time.  There are some patches for our various dump methods
        and one new thing: z/VM LGR detection.  LGR stands for linux-guest-
        relocation and is the guest migration feature of z/VM.  For debugging
        purposes we keep a log of the systems where a specific guest has lived."
      Fix up trivial conflict in arch/s390/kernel/smp.c due to the scheduler
      cleanup having removed some code next to removed s390 code.
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        [S390] kernel: Pass correct stack for smp_call_ipl_cpu()
        [S390] Ensure that vmcore_info pointer is never accessed directly
        [S390] dasd: prevent validate server for offline devices
        [S390] Remove monolithic build option for zcrypt driver.
        [S390] stack dump: fix indentation in output
        [S390] kernel: Add OS info memory interface
        [S390] Use block_sigmask()
        [S390] kernel: Add z/VM LGR detection
        [S390] irq: external interrupt code passing
        [S390] irq: set __ARCH_IRQ_EXIT_IRQS_DISABLED
        [S390] zfcpdump: Implement async sdias event processing
        [S390] Use copy_to_absolute_zero() instead of "stura/sturg"
        [S390] rework idle code
        [S390] rework smp code
        [S390] rename lowcore field
        [S390] Fix gcc 4.6.0 compile warning
    • Linus Torvalds's avatar
      security: optimize avc_audit() common path · 48aab2f7
      Linus Torvalds authored
      avc_audit() did a lot of jumping around and had a big stack frame, all
      for the uncommon case.
      Split up the uncommon case (which we really can't make go fast anyway)
      into its own slow function, and mark the conditional branches
      appropriately for the common likely case.
      This causes avc_audit() to no longer show up as one of the hottest
      functions on the branch profiles (the new "perf -b" thing), and makes
      the cycle profiles look really nice and dense too.
      The whole audit path is still annoyingly very much one of the biggest
      costs of name lookup, so these things are worth optimizing for.  I wish
      we could just tell people to turn it off, but realistically we do need
      it: we just need to make sure that the overhead of the necessary evil is
      as low as possible.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
  3. 22 Mar, 2012 26 commits
    • Linus Torvalds's avatar
      vfs: tidy up sparse warnings in fs/namei.c · f7493e5d
      Linus Torvalds authored
      While doing the fs/namei.c cleanups, I ran sparse on it, and it pointed
      out other large integers and a couple of cases of us using '0' instead
      of the proper 'NULL'.
      Sparse still doesn't understand some of the conditional locking going
      on, but that's no excuse for not fixing up the trivial stuff.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      vfs: tidy up fs/namei.c byte-repeat word constants · 989412bb
      Linus Torvalds authored
      In commit commit 1de5b41c
       ("fs/namei.c: fix warnings on 32-bit")
      Andrew said that there must be a tidier way of doing this.
      This is that tidier way.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Randy Dunlap's avatar
      fs: fix kernel-doc warnings in dcache.c · 1f1e6e52
      Randy Dunlap authored
      Fix kernel-doc warnings in fs/dcache.c:
        Warning(fs/dcache.c:1743): No description found for parameter 'seqp'
        Warning(fs/dcache.c:1743): Excess function parameter 'seq' description in '__d_lookup_rcu'
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Al Viro's avatar
      Fix full_name_hash() behaviour when length is a multiple of 8 · f132c5be
      Al Viro authored
      We want it to match what hash_name() is doing, which means extra
      multiply by 9 in this case...
      Reported-and-Tested-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'drm-nouveau-destage' of git://people.freedesktop.org/~airlied/linux · ba331d5d
      Linus Torvalds authored
      Pull nouveau destaging + Kelper modesetting support from Dave Airlie:
       "This pull request is unexpected and not something I had mentioned
        So NVIDIA announced new Kepler GPUs this morning, and Ben has killed
        himself getting modesetting support for them together to have on
        launch day.  Most of the code to support the new chips has already
        gone in, however this pull contains a few more pieces along with the
        final enables so the driver binds to the new Kepler cards.  Its quite
        amazing that nouveau can support a GPU on its launch day even if its
        just unaccelerated modesetting, and I'd like to have support in the
        next kernel.
        In order to sweeten the deal, Ben has also requested nouveau destage
        and become ABI stable, the only change is the version number bump
        which he prepared userspace for quite a long time ago.  The driver
        hasn't broken ABI since that one big break that caused a lot of fuss.
        It's also quite a small set of code, and not likely to break anything."
      * 'drm-nouveau-destage' of git://people.freedesktop.org/~airlied/linux:
        drm/nouveau/dp: support version 4.0 of DP table
        drm/nve0/disp: nvidia randomly decided to move the dithering method
        drm/nve0: initial modesetting support for kepler chipsets
        drm/nouveau: add bios connector type for dms59
        drm/nouveau: move out of staging drivers
        drm/nouveau: bump version to 1.0.0
        drm/nvd0/disp: ignore clock set if no pclk
        drm/nouveau: oops, increase channel dispc_vma to 4
        drm/nouveau: inform userspace of new kernel subchannel requirements
        drm/nouveau: remove m2mf creation on userspace channels
        drm/nvc0-/disp: reimplement flip completion method as fifo method
        drm/nouveau: move fence sequence check to start of loop
        drm/nouveau: remove subchannel names from places where it doesn't matter
        drm/nouveau/ttm: always do buffer moves on kernel channel
    • Linus Torvalds's avatar
      Merge branch 'drm-radeon-sitn-support' of git://people.freedesktop.org/~airlied/linux · 09fa3022
      Linus Torvalds authored
      Pull radeon southern islands / trinity support from Dave Airlie:
       "This is support from AMD for their newest GPU and APUs.  The products
        called RadeonHD 7xxx, and the Trinity APU series.
        This did come in a bit late, due to some over-complicated AMD internal
        review process, which from the outside seems unnecessary once the
        company has decided it wants to support open source.  However as I
        said previously I'd rather not put the people who've got this hw for 3
        months now being forced to use fglrx on it if there is open code.
        Its pretty well self contained and just plugs into the driver in
        various places."
      * 'drm-radeon-sitn-support' of git://people.freedesktop.org/~airlied/linux: (48 commits)
        drm/radeon/kms: update duallink checks for DCE6
        drm/radeon/kms: add trinity pci ids
        drm/radeon/kms: add radeon_asic struct for trinity
        drm/radeon/kms: add support for ucode loading on trinity (v2)
        drm/radeon/kms/vm: set vram base offset properly for TN
        drm/radeon/kms: Update evergreen functions for trinity
        drm/radeon/kms: cayman gpu init updates for trinity
        drm/radeon/kms: Add checks for TN in the DP bridge code
        drm/radeon/kms/DCE6.1: ss is not supported on the internal pplls
        drm/radeon/kms: disable PPLL0 on DCE6.1 when not in use
        drm/radeon/kms: Adjust pll picker for DCE6.1
        drm/radeon/kms: DCE6.1 disp eng pll updates
        drm/radeon/kms: DCE6.1 watermark updates for TN
        drm/radeon/kms: no support for internal thermal sensor on TN yet
        drm/radeon/kms: add trinity (TN) chip family
        drm/radeon/kms: Add SI pci ids
        drm/radeon: Update radeon_info_ioctl for SI. (v2)
        drm/radeon/kms: add radeon_asic struct for SI
        drm/radeon/kms: add support for compute rings in CS ioctl on SI
        drm/radeon/kms: fill in startup/shutdown callbacks for SI
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · be53bfdb
      Linus Torvalds authored
      Pull drm main changes from Dave Airlie:
       "This is the main drm pull request, I'm probably going to send two more
        smaller ones, will explain below.
        This contains a patch that is also in the fbdev tree, but it should be
        the same patch, it added an API for hot unplugging framebuffer
        devices, and I need that API for a new driver.
        It also contains some changes to the i2c tree which Jean has acked,
        and one change to moorestown platform stuff in x86.
         - new drivers: UDL driver for USB displaylink devices, kms only,
           should support correct hotplug operations.
         - core: i2c speedups + better hotplug support, EDID overriding via
           firmware interface - allows user to load a firmware for a broken
           monitor/kvm from userspace, it even has documentation for it.
         - exynos: new HDMI audio + hdmi 1.4 + virtual output driver
         - gma500: code cleanup
         - radeon: cleanups, CS optimisations, streamout support and pageflip
         - nouveau: NVD9 displayport support + more reclocking work
         - i915: re-enabling GMBUS, finish gpu patch (might help hibernation
           who knows), missed irq fixes, stencil tiling fixes, interlaced
           support, aliasesd PPGTT support for SNB/IVB, swizzling for SNB/IVB,
           semaphore fixes
        As well as the usual bunch of cleanups and fixes all over the place.
        I've got two things I'd like to merge a bit later:
         a) AMD support for all their new radeonhd 7000 series GPU and APUs.
            AMD dropped this a bit late due to insane internal review
            processes, (please AMD just follow Intel and let open source guys
            ship stuff early) however I don't want to penalise people who own
            this hardware (since its been on sale for 3-4 months and GPU hw
            doesn't exactly have a lifetime in years) and consign them to
            using closed drivers for longer than necessary.  The changes are
            well contained and just plug into the driver new gpu functionality
            so they should be fairly regression proof.  I just want to give
            them a bit of a run on the hw AMD kindly sent me.
         b) drm prime/dma-buf interface code.  This is just infrastructure
            code to expose the dma-buf stuff to drm drivers and to userspace.
            I'm not planning on pushing any driver support in this cycle
            (except maybe exynos), but I'd like to get the infrastructure code
            in so for the next cycle I can start getting the driver support
            into the individual drivers.  We have started driver support for
            i915, nouveau and udl along with I think exynos and omap in
            staging.  However this code relies on the dma-buf tree being
            pulled into your tree first since it needs the latest interfaces
            from that tree.  I'll push to get that tree sent asap.
        (oh and any warnings you see in i915 are gcc's fault from what anyone
        can see)."
      Fix up trivial conflicts in arch/x86/platform/mrst/mrst.c due to the new
      msic_thermal_platform_data() thermal function being added next to the
      tc35876x_platform_data() i2c device function..
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (326 commits)
        drm/i915: use DDC_ADDR instead of hard-coding it
        drm/radeon: use DDC_ADDR instead of hard-coding it
        drm: remove unneeded redefinition of DDC_ADDR
        drm/exynos: added virtual display driver.
        drm: allow loading an EDID as firmware to override broken monitor
        drm/exynos: enable hdmi audio feature
        drm/exynos: add default pixel format for plane
        drm/exynos: cleanup exynos_hdmi.h
        drm/exynos: add is_local member in exynos_drm_subdrv struct
        drm/exynos: add subdrv open/close functions
        drm/exynos: remove module of exynos drm subdrv
        drm/exynos: release pending pageflip events when closed
        drm/exynos: added new funtion to get/put dma address.
        drm/exynos: update gem and buffer framework.
        drm/exynos: added mode_fixup feature and code clean.
        drm/exynos: add HDMI version 1.4 support
        drm/exynos: remove exynos_mixer.h
        gma500: Fix mmap frambuffer
        drm/radeon: Drop radeon_gem_object_(un)pin.
        drm/radeon: Restrict offset for legacy display engine.
    • Linus Torvalds's avatar
      Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · b2094ef8
      Linus Torvalds authored
      Pull updates of sound stuff from Takashi Iwai:
       "Here is the first big update chunk of sound stuff for 3.4-rc1.
        In the common sound infrastructure, there are a few changes for
        dynamic PCM support (used in ASoC) and a few clean-ups.  Majority of
        changes are found, as usual, in HD-audio and ASoC.
        Some highlights of HD-audio changes:
         - All the long-standing static quirk codes for Realtek codec were
           finally removed by fixing and extending the Realtek auto-parser.
         - The mute-LED control is standardized over all HD-audio codec
           drivers using the extended vmaster hook.
         - The vmaster slave mixer elements are initialized to 0dB as default
           so that the user won't be annoyed by the silent output after
           updates, e.g.  due to the additions of new elements.
         - Other many fix-ups for the misc HD-audio devices.
        In the ASoC side, this is a very active release, including a quite a
        few framework enhancements.  Some highlights:
         - Support for widgets not associated with a CODEC, an important part
           of the dynamic PCM framework.
         - A library factoring out the common code shared by dmaengine based
           DMA drivers contributed by Lars-Peter Clausen.  This will save a
           lot of code and make it much easier to deploy enhancements to
         - Support for binary controls, used for providing runtime
           configuration of algorithm coefficients.
         - A new DAPM widget type for regulator supplies allowing drivers for
           devices that can power down unused supplies while active to do
           without any per-driver code.
         - DAPM widgets for DAIs, initially giving a speed boost for playback
           startup and shutdown and also the basis for CODEC<->CODEC DAI link
         - Support for specifying the number of significant bits on audio
           interfaces, useful for allowing applications to know how much
           effort to put into generating data for a larger sample format.
         - Conversion of the FSI driver used on some SH processors to
         - Conversion of EP93xx drivers to DMAEngine.
         - New CODEC drivers for Maxim MAX9768 and Wolfson Microelectronics
         - Move audmux driver from arc/arm to sound/soc
         - McBSP move from arch/ to sound/ and updates
        Also, a few small updates and fixes for other drivers like au88x0,
        ymfpci, USB 6fire, USB usx2yaudio are included."
      * tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (446 commits)
        ASoC: wm8994: Provide VMID mode control and fix default sequence
        ASoC: wm8994: Add missing break in resume
        ASoC: wm_hubs: Don't actively manage LINEOUT_VMID_BUF
        ASoC: pxa-ssp: atomically set stream active masks
        ASoC: fsl: p1022ds: tell the WM8776 codec driver that it's the master
        ASoC: Samsung: Added to support mono recording
        ALSA: hda - Fix build with CONFIG_PM=n
        ALSA: au88x0 - Avoid possible Oops at unbinding
        ALSA: usb-audio - Fix build error by consitification of rate list
        ASoC: core: Fix obscure leak of runtime array
        ALSA: pcm - Avoid GFP_ATOMIC in snd_pcm_link()
        ALSA: pcm: Constify the list in snd_pcm_hw_constraint_list
        ASoC: wm8996: Add 44.1kHz support
        ALSA: hda - Fix build of patch_sigmatel.c without CONFIG_SND_HDA_POWER_SAVE
        ASoC: mx27vis-aic32x4: Convert it to platform driver
        ALSA: hda - fix printing of high HDMI sample rates
        ALSA: ymfpci - Fix legacy registers on S3/S4 resume
        ALSA: control - Fixe a trailing white space error
        ALSA: hda - Add expose_enum_ctl flag to snd_hda_add_vmaster_hook()
        ALSA: hda - Add "Mute-LED Mode" enum control
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 424a6f6e
      Linus Torvalds authored
      SCSI updates from James Bottomley:
       "The update includes the usual assortment of driver updates (lpfc,
        qla2xxx, qla4xxx, bfa, bnx2fc, bnx2i, isci, fcoe, hpsa) plus a huge
        amount of infrastructure work in the SAS library and transport class
        as well as an iSCSI update.  There's also a new SCSI based virtio
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (177 commits)
        [SCSI] qla4xxx: Update driver version to 5.02.00-k15
        [SCSI] qla4xxx: trivial cleanup
        [SCSI] qla4xxx: Fix sparse warning
        [SCSI] qla4xxx: Add support for multiple session per host.
        [SCSI] qla4xxx: Export CHAP index as sysfs attribute
        [SCSI] scsi_transport: Export CHAP index as sysfs attribute
        [SCSI] qla4xxx: Add support to display CHAP list and delete CHAP entry
        [SCSI] iscsi_transport: Add support to display CHAP list and delete CHAP entry
        [SCSI] pm8001: fix endian issue with code optimization.
        [SCSI] pm8001: Fix possible racing condition.
        [SCSI] pm8001: Fix bogus interrupt state flag issue.
        [SCSI] ipr: update PCI ID definitions for new adapters
        [SCSI] qla2xxx: handle default case in qla2x00_request_firmware()
        [SCSI] isci: improvements in driver unloading routine
        [SCSI] isci: improve phy event warnings
        [SCSI] isci: debug, provide state-enum-to-string conversions
        [SCSI] scsi_transport_sas: 'enable' phys on reset
        [SCSI] libsas: don't recover end devices attached to disabled phys
        [SCSI] libsas: fixup target_port_protocols for expanders that don't report sata
        [SCSI] libsas: set attached device type and target protocols for local phys
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 1ab142d4
      Linus Torvalds authored
      Pull SCSI target updates from Nicholas Bellinger:
       "This contains the usual set of updates and bugfixes to target-core +
        existing fabric module code, along with a handful of the patches
        destined for v3.3 stable.
        It also contains the necessary target-core infrastructure pieces
        required to run using tcm_qla2xxx.ko WWPNs with the new Qlogic Fibre
        Channel fabric module currently queued in target-pending/for-next-merge,
        and coming for round 2.
        The highlights for this series include:
         - Add target_submit_tmr() helper function for fabric task management
         - Convert tcm_fc to use target_submit_tmr() (andy)
         - Replace target core various cmd flags with a transport state (hch)
         - Convert loopback to use workqueue submission (hch)
         - Convert target core to use array_zalloc for tpg_lun_list (joern)
         - Convert target core to use array_zalloc for device_list (joern)
         - Add target core support for TMR_ABORT_TASK (nab)
         - Add target core se_sess->sess_kref + get/put helpers (nab)
         - Add target core se_node_acl->acl_kref for ->acl_free_comp usage
         - Convert iscsi-target to use target_put_session + sess_kref (nab)
         - Fix tcm_fc fc_exch memory leak in ft_send_resp_status (nab)
         - Fix ib_srpt srpt_handle_cmd send_ioctx->ioctx_kref leak on
           exception (nab)
         - Fix target core up handling of short INQUIRY buffers (roland)
         - Untangle target-core front-end and back-end meanings of max_sectors
           attribute (roland)
         - Set loopback residual field for SCSI commands (roland)
         - Fix target-core 16-bit target ports for SET TARGET PORT GROUPS
           emulation (roland)
        Thanks again to Andy, Christoph, Joern, Roland, and everyone who has
        contributed this round!"
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (64 commits)
        ib_srpt: Fix srpt_handle_cmd send_ioctx->ioctx_kref leak on exception
        loopback: Fix transport_generic_allocate_tasks error handling
        iscsi-target: remove improper externs
        iscsi-target: Remove unused variables in iscsi_target_parameters.c
        target: remove obvious warnings
        target: Use array_zalloc for device_list
        target: Use array_zalloc for tpg_lun_list
        target: Fix sense code for unsupported SERVICE ACTION IN
        target: Remove hack to make READ CAPACITY(10) lie if thin provisioning is enabled
        target: Bump core version to v4.1.0-rc2-ml + fabric versions
        tcm_fc: Fix fc_exch memory leak in ft_send_resp_status
        target: Drop unused legacy target_core_fabric_ops API callers
        iscsi-target: Convert to use target_put_session + sess_kref
        target: Convert se_node_acl->acl_group removal to use ->acl_kref
        target: Add se_node_acl->acl_kref for ->acl_free_comp usage
        target: Add se_node_acl->acl_free_comp for NodeACL release path
        target: Add se_sess->sess_kref + get/put helpers
        target: Convert session_lock to irqsave
        target: Fix typo in drivers/target
        iscsi-target: Fix dynamic -> explict NodeACL pointer reference
    • Linus Torvalds's avatar
      Merge tag 'md-3.4' of git://neil.brown.name/md · 267d7b23
      Linus Torvalds authored
      Pull md updates for 3.4 from Neil Brown:
       "Mostly tidying up code in preparation for some bigger changes next
        A few bug fixes tagged for -stable.
        Main functionality change is that some RAID10 arrays can now grow to
        use extra space that may have been made available on the individual
      Fixed up trivial conflicts with the k[un]map_atomic() cleanups in
      * tag 'md-3.4' of git://neil.brown.name/md: (22 commits)
        md: Add judgement bb->unacked_exist in function md_ack_all_badblocks().
        md: fix clearing of the 'changed' flags for the bad blocks list.
        md/bitmap: discard CHUNK_BLOCK_SHIFT macro
        md/bitmap: remove unnecessary indirection when allocating.
        md/bitmap: remove some pointless locking.
        md/bitmap: change a 'goto' to a normal 'if' construct.
        md/bitmap: move printing of bitmap status to bitmap.c
        md/bitmap: remove some unused noise from bitmap.h
        md/raid10 - support resizing some RAID10 arrays.
        md/raid1: handle merge_bvec_fn in member devices.
        md/raid10: handle merge_bvec_fn in member devices.
        md: add proper merge_bvec handling to RAID0 and Linear.
        md: tidy up rdev_for_each usage.
        md/raid1,raid10: avoid deadlock during resync/recovery.
        md/bitmap: ensure to load bitmap when creating via sysfs.
        md: don't set md arrays to readonly on shutdown.
        md: allow re-add to failed arrays.
        md/raid5: use atomic_dec_return() instead of atomic_dec() and atomic_read().
        md: Use existed macros instead of numbers
        md/raid5: removed unused 'added_devices' variable.
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 28f23d1f
      Linus Torvalds authored
      Pull x86 "urgent" leftovers from Ingo Molnar:
       "Pending x86/urgent bits that were not high prio enough to warrant
        -rc-less v3.3-final inclusion."
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, efi: Fix pointer math issue in handle_ramdisks()
        x86/ioapic: Add register level checks to detect bogus io-apic entries
        x86, mce: Fix rcu splat in drain_mce_log_buffer()
        x86, memblock: Move mem_hole_size() to .init
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 23904815
      Linus Torvalds authored
      Pull x86 platform changes from Ingo Molnar.
      Removes the Moorestown platform that nobody ever used.
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/platform: Move APIC ID validity check into platform APIC code
        x86/olpc/xo15/sci: Enable lid close wakeup control
        x86/geode/net5501: Add platform driver for Soekris Engineering net5501
        x86/geode/alix2: Supplement driver to include GPIO button support
        x86/mid/powerbtn: Use MSIC read/write instead of ipc_scu
        x86/mid/thermal: Turn off thermistor
        x86/mid/thermal: Add msic_thermal alias
        x86/mid/thermal: Convert to use Intel MSIC API
        x86/mid/scu_ipc: Remove Moorestown support
        x86/mid: Kill off Moorestown
        x86/mrst: Add msic_thermal platform support
        x86/config: Select MSIC MFD driver on Intel Medfield platform
        x86/mid: Remove Intel Moorestown
        x86/mrst: Set ISA bus type for fake MP IRQs
        x86/ioapic: Use legacy_pic to set correct gsi-irq mapping
    • Linus Torvalds's avatar
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 754b9800
      Linus Torvalds authored
      Pull MCE changes from Ingo Molnar.
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mce: Fix return value of mce_chrdev_read() when erst is disabled
        x86/mce: Convert static array of pointers to per-cpu variables
        x86/mce: Replace hard coded hex constants with symbolic defines
        x86/mce: Recognise machine check bank signature for data path error
        x86/mce: Handle "action required" errors
        x86/mce: Add mechanism to safely save information in MCE handler
        x86/mce: Create helper function to save addr/misc when needed
        HWPOISON: Add code to handle "action required" errors.
        HWPOISON: Clean up memory_failure() vs. __memory_failure()
    • Linus Torvalds's avatar
      Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 35cb8d9e
      Linus Torvalds authored
      Pull x86/fpu changes from Ingo Molnar.
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        i387: Split up <asm/i387.h> into exported and internal interfaces
        i387: Uninline the generic FP helpers that we expose to kernel modules
    • Linus Torvalds's avatar
      Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 02c50256
      Linus Torvalds authored
      Pull x86/build changes from Ingo Molnar.
      * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, build: Fix portability issues when cross-building
        x86, tools: Remove unneeded header files from tools/build.c
        USB: ffs-test: Don't duplicate {get,put}_unaligned*() functions
        x86, efi: Fix endian issues and unaligned accesses
        x86, boot: Restrict CFLAGS for hostprogs
        x86, mkpiggy: Don't open code put_unaligned_le32()
        x86, relocs: Don't open code put_unaligned_le32()
        tools/include: Add byteshift headers for endian access
    • Linus Torvalds's avatar
      Merge branch 'x86-eficross-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f06fc0c0
      Linus Torvalds authored
      Pull x86/eficross (booting 32/64-bit kernel from 64/32-bit EFI) from Ingo Molnar
      * 'x86-eficross-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, efi: Allow basic init with mixed 32/64-bit efi/kernel
        x86, efi: Add basic error handling
        x86, efi: Cleanup config table walking
        x86, efi: Convert printk to pr_*()
        x86, efi: Refactor efi_init() a bit
    • Linus Torvalds's avatar
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4c64616b
      Linus Torvalds authored
      Pull x86/debug changes from Ingo Molnar.
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Fix section warnings
        x86-64: Fix CFI data for common_interrupt()
        x86: Properly _init-annotate NMI selftest code
        x86/debug: Fix/improve the show_msr=<cpus> debug print out
    • Linus Torvalds's avatar
      Merge branches 'x86-cpu-for-linus', 'x86-boot-for-linus',... · c5c7fb8f
      Linus Torvalds authored
      Merge branches 'x86-cpu-for-linus', 'x86-boot-for-linus', 'x86-cpufeature-for-linus', 'x86-process-for-linus' and 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      Pull trivial x86 branches from Ingo Molnar: small one-liners to fix up
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Remove some noise from boot log when starting cpus
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, boot: Fix port argument to inl() function
      * 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, cpufeature: Add CPU features from Intel document 319433-012A
      * 'x86-process-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86_64: Record stack pointer before task execution begins
      * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/UV: Lower UV rtc clocksource rating
    • Linus Torvalds's avatar
      Merge branch 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1b674bf1
      Linus Torvalds authored
      Pull x86/atomic changes from Ingo Molnar.
      * 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: atomic64 assembly improvements
        x86: Adjust asm constraints in atomic64 wrappers
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e17fdf5c
      Linus Torvalds authored
      Pull x86/asm changes from Ingo Molnar
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Include probe_roms.h in probe_roms.c
        x86/32: Print control and debug registers for kerenel context
        x86: Tighten dependencies of CPU_SUP_*_32
        x86/numa: Improve internode cache alignment
        x86: Fix the NMI nesting comments
        x86-64: Improve insn scheduling in SAVE_ARGS_IRQ
        x86-64: Fix CFI annotations for NMI nesting code
        bitops: Add missing parentheses to new get_order macro
        bitops: Optimise get_order()
        bitops: Adjust the comment on get_order() to describe the size==0 case
        x86/spinlocks: Eliminate TICKET_MASK
        x86-64: Handle byte-wise tail copying in memcpy() without a loop
        x86-64: Fix memcpy() to support sizes of 4Gb and above
        x86-64: Fix memset() to support sizes of 4Gb and above
        x86-64: Slightly shorten copy_page()
    • Linus Torvalds's avatar
      Merge branch 'akpm' (Andrew's patch-bomb) · 95211279
      Linus Torvalds authored
      Merge first batch of patches from Andrew Morton:
       "A few misc things and all the MM queue"
      * emailed from Andrew Morton <akpm@linux-foundation.org>: (92 commits)
        memcg: avoid THP split in task migration
        thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE
        memcg: clean up existing move charge code
        mm/memcontrol.c: remove unnecessary 'break' in mem_cgroup_read()
        mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event()
        mm/memcontrol.c: s/stealed/stolen/
        memcg: fix performance of mem_cgroup_begin_update_page_stat()
        memcg: remove PCG_FILE_MAPPED
        memcg: use new logic for page stat accounting
        memcg: remove PCG_MOVE_LOCK flag from page_cgroup
        memcg: simplify move_account() check
        memcg: remove EXPORT_SYMBOL(mem_cgroup_update_page_stat)
        memcg: kill dead prev_priority stubs
        memcg: remove PCG_CACHE page_cgroup flag
        memcg: let css_get_next() rely upon rcu_read_lock()
        cgroup: revert ss_id_lock to spinlock
        idr: make idr_get_next() good for rcu_read_lock()
        memcg: remove unnecessary thp check in page stat accounting
        memcg: remove redundant returns
        memcg: enum lru_list lru
    • Dave Airlie's avatar
      Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-next · 1898f442
      Dave Airlie authored
      * 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6:
        drm/nouveau/dp: support version 4.0 of DP table
        drm/nve0/disp: nvidia randomly decided to move the dithering method
        drm/nve0: initial modesetting support for kepler chipsets
        drm/nouveau: add bios connector type for dms59
        drm/nouveau: move out of staging drivers
        drm/nouveau: bump version to 1.0.0
        drm/nvd0/disp: ignore clock set if no pclk
        drm/nouveau: oops, increase channel dispc_vma to 4
        drm/nouveau: inform userspace of new kernel subchannel requirements
        drm/nouveau: remove m2mf creation on userspace channels
        drm/nvc0-/disp: reimplement flip completion method as fifo method
        drm/nouveau: move fence sequence check to start of loop
        drm/nouveau: remove subchannel names from places where it doesn't matter
        drm/nouveau/ttm: always do buffer moves on kernel channel
    • Ben Skeggs's avatar
    • Ben Skeggs's avatar
    • Ben Skeggs's avatar