1. 04 Oct, 2012 7 commits
    • David Howells's avatar
    • David Howells's avatar
      UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k) · f3dfd599
      David Howells authored
      The m68k arch doesn't have a kvm_para.h (unlike most or maybe all other
      arches), but there is one in asm-generic.  This means that:
      
      	ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
      			  $(srctree)/include/asm-$(SRCARCH)/kvm_para.h \
      			  $(INSTALL_HDR_PATH)/include/asm-*/kvm_para.h),)
      	header-y += kvm_para.h
      	endif
      
      gets it wrong because it is invoked twice during the header installation - and
      on the second occasion, asm-generic/kvm_para.h has been installed in usr/,
      thus triggering a attempt to install asm-m68k/kvm_para.h which will fail.
      
      There are three headers with this sort of conditional logic: a.out.h, kvm.h
      and kvm_para.h.  For all three of them, change the logic to be something like:
      
      	ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
      			  $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h),)
      
      which finds the header in only the two places it should be found, and doesn't
      get incorrectly triggered by the installation of asm-generic's version.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      f3dfd599
    • David Howells's avatar
      Merge remote-tracking branch 'c6x/for-linux-next' into uapi-prep · b2249fbd
      David Howells authored
      Avoid later problems with c6x's asm/signal.h lacking __KERNEL__ guards.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      b2249fbd
    • Mark Salter's avatar
      c6x: remove c6x signal.h · 2e919f76
      Mark Salter authored
      The c6x signal.h includes the asm-generic version and provides
      a couple of extern declarations. David Howells pointed out that
      the externs needed to be protected by ifdef __KERNEL__. As it
      turns out, the externs aren't really needed since the functions
      are only called from asm code. So this patch gets rid of the
      c6x signal.h and uses just the asm-generic version.
      Signed-off-by: default avatarMark Salter <msalter@redhat.com>
      2e919f76
    • David Howells's avatar
      UAPI: Split compound conditionals containing __KERNEL__ in Arm64 · 1c1e4362
      David Howells authored
      Split compound conditionals containing __KERNEL__ in Arm64 where possible to
      make it easier for the UAPI disintegration scripts to handle them.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      1c1e4362
    • David Howells's avatar
      UAPI: Fix the guards on various asm/unistd.h files · 89013952
      David Howells authored
      asm-generic/unistd.h and a number of asm/unistd.h files have been given
      reinclusion guards that allow the guard to be overridden if __SYSCALL is
      defined.  Unfortunately, these files define __SYSCALL and don't undefine it
      when they've finished with it, thus rendering the guard ineffective.
      
      The reason for this override is to allow the file to be #included multiple
      times with different settings on __SYSCALL for purposes like generating syscall
      tables.
      
      The following guards are problematic:
      
      arch/arm64/include/asm/unistd.h:#if !defined(__ASM_UNISTD_H) || defined(__SYSCALL)
      arch/arm64/include/asm/unistd32.h:#if !defined(__ASM_UNISTD32_H) || defined(__SYSCALL)
      arch/c6x/include/asm/unistd.h:#if !defined(_ASM_C6X_UNISTD_H) || defined(__SYSCALL)
      arch/hexagon/include/asm/unistd.h:#if !defined(_ASM_HEXAGON_UNISTD_H) || defined(__SYSCALL)
      arch/openrisc/include/asm/unistd.h:#if !defined(__ASM_OPENRISC_UNISTD_H) || defined(__SYSCALL)
      arch/score/include/asm/unistd.h:#if !defined(_ASM_SCORE_UNISTD_H) || defined(__SYSCALL)
      arch/tile/include/asm/unistd.h:#if !defined(_ASM_TILE_UNISTD_H) || defined(__SYSCALL)
      arch/unicore32/include/asm/unistd.h:#if !defined(__UNICORE_UNISTD_H__) || defined(__SYSCALL)
      include/asm-generic/unistd.h:#if !defined(_ASM_GENERIC_UNISTD_H) || defined(__SYSCALL)
      
      On the assumption that the guards' ineffectiveness has passed unnoticed, just
      remove these guards entirely.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      89013952
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 612a9aab
      Linus Torvalds authored
      Pull drm merge (part 1) from Dave Airlie:
       "So first of all my tree and uapi stuff has a conflict mess, its my
        fault as the nouveau stuff didn't hit -next as were trying to rebase
        regressions out of it before we merged.
      
        Highlights:
         - SH mobile modesetting driver and associated helpers
         - some DRM core documentation
         - i915 modesetting rework, haswell hdmi, haswell and vlv fixes, write
           combined pte writing, ilk rc6 support,
         - nouveau: major driver rework into a hw core driver, makes features
           like SLI a lot saner to implement,
         - psb: add eDP/DP support for Cedarview
         - radeon: 2 layer page tables, async VM pte updates, better PLL
           selection for > 2 screens, better ACPI interactions
      
        The rest is general grab bag of fixes.
      
        So why part 1? well I have the exynos pull req which came in a bit
        late but was waiting for me to do something they shouldn't have and it
        looks fairly safe, and David Howells has some more header cleanups
        he'd like me to pull, that seem like a good idea, but I'd like to get
        this merge out of the way so -next dosen't get blocked."
      
      Tons of conflicts mostly due to silly include line changes, but mostly
      mindless.  A few other small semantic conflicts too, noted from Dave's
      pre-merged branch.
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (447 commits)
        drm/nv98/crypt: fix fuc build with latest envyas
        drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering
        drm/nv41/vm: fix and enable use of "real" pciegart
        drm/nv44/vm: fix and enable use of "real" pciegart
        drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie
        drm/nouveau: store supported dma mask in vmmgr
        drm/nvc0/ibus: initial implementation of subdev
        drm/nouveau/therm: add support for fan-control modes
        drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
        drm/nouveau/therm: calculate the pwm divisor on nv50+
        drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster
        drm/nouveau/therm: move thermal-related functions to the therm subdev
        drm/nouveau/bios: parse the pwm divisor from the perf table
        drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices
        drm/nouveau/therm: rework thermal table parsing
        drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table
        drm/nouveau: fix pm initialization order
        drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it
        drm/nouveau: log channel debug/error messages from client object rather than drm client
        drm/nouveau: have drm debugging macros build on top of core macros
        ...
      612a9aab
  2. 03 Oct, 2012 33 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 3a494318
      Linus Torvalds authored
      Pull user namespace compile fix from Eric W Biederman:
       "This tree contains a trivial build fix for one of the staging drivers
        when user namespace support is enabled"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        userns: Fix build of drivers/staging/dgrp
      3a494318
    • Linus Torvalds's avatar
      firmware: teach the kernel to load firmware files directly from the filesystem · abb139e7
      Linus Torvalds authored
      This is a first step in allowing people to by-pass udev for loading
      device firmware.  Current versions of udev will deadlock (causing us to
      block for the 30 second timeout) under some circumstances if the
      firmware is loaded as part of the module initialization path, and this
      is causing problems for media drivers in particular.
      
      The current patch hardcodes the firmware path that udev uses by default,
      and will fall back to the legacy udev mode if the firmware cannot be
      found there.  We'd like to add support for both configuring the paths
      and the fallback behaviour, but in the meantime this hopefully fixes the
      immediate problem, while also giving us a way forward.
      
      [ v2: Some VFS layer interface cleanups suggested by Al Viro ]
      [ v3: use the default udev paths suggested by Kay Sievers ]
      Suggested-by: default avatarIvan Kalvachev <ikalvachev@gmail.com>
      Acked-by: default avatarGreg KH <gregkh@linuxfoundation.org>
      Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
      Cc: Kay Sievers <kay@redhat.com>
      Cc: Ming Lei <ming.lei@canonical.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      abb139e7
    • Mark Salter's avatar
      c6x: make dsk6455 the default config · 37d11ab8
      Mark Salter authored
      C6X had no defconfig, so DSK6455 is as good as any.
      Signed-off-by: default avatarMark Salter <msalter@redhat.com>
      37d11ab8
    • Linus Torvalds's avatar
      Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · df5a2a1f
      Linus Torvalds authored
      Pull firewire updates from Stefan Richter:
        - feed GUIDs of FireWire nodes to the random pool
        - more complete quirk handling of a TI S400B phy
        - avoid holding a core lock while calling into highlevel drivers
      
      * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: addendum to address handler RCU conversion
        firewire: remove global lock around address handlers, convert to RCU
        firewire: ohci: get IR bit from TSB41BA3D phy
        firewire: core: feed /dev/random with devices' GUIDs
      df5a2a1f
    • Linus Torvalds's avatar
      Merge tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers · 9b2e077c
      Linus Torvalds authored
      Pull preparatory patches for user API disintegration from David Howells:
       "The patches herein prepare for the extraction of the Userspace API
        bits from the various header files named in the Kbuild files.
      
        New subdirectories are created under either include/uapi/ or
        arch/x/include/uapi/ that correspond to the subdirectory containing
        that file under include/ or arch/x/include/.
      
        The new subdirs under the uapi/ directory are populated with Kbuild
        files that mostly do nothing at this time.  Further patches will
        disintegrate the headers in each original directory and fill in the
        Kbuild files as they do it.
      
        These patches also:
      
         (1) fix up #inclusions of "foo.h" rather than <foo.h>.
      
         (2) Remove some redundant #includes from the DRM code.
      
         (3) Make the kernel build infrastructure handle Kbuild files both in
             the old places and the new UAPI place that both specify headers
             to be exported.
      
         (4) Fix some kernel tools that #include kernel headers during their
             build.
      
        I have compile tested this with allyesconfig against x86_64,
        allmodconfig against i386 and a scattering of additional defconfigs of
        other arches.  Prepared for main script
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Acked-by: default avatarMichael Kerrisk <mtk.manpages@gmail.com>
      Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      Acked-by: default avatarDave Jones <davej@redhat.com>
        Acked-by: H. Peter Anvin <hpa@zytor.com>"
      
      * tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: Plumb the UAPI Kbuilds into the user header installation and checking
        UAPI: x86: Differentiate the generated UAPI and internal headers
        UAPI: Remove the objhdr-y export list
        UAPI: Move linux/version.h
        UAPI: Set up uapi/asm/Kbuild.asm
        UAPI: x86: Fix insn_sanity build failure after UAPI split
        UAPI: x86: Fix the test_get_len tool
        UAPI: (Scripted) Set up UAPI Kbuild files
        UAPI: Partition the header include path sets and add uapi/ header directories
        UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
        UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/
        UAPI: (Scripted) Remove redundant DRM UAPI header #inclusions from drivers/gpu/.
        UAPI: Refer to the DRM UAPI headers with <...> and from certain headers only
      9b2e077c
    • Eric W. Biederman's avatar
      userns: Fix build of drivers/staging/dgrp · 702e4902
      Eric W. Biederman authored
      Explicitly test for GLOBAL_ROOT_UID and GLOBAL_ROOT_GID
      instead of using 0, allowing dgrp to compile and work
      properly when user namespace support is enabled.
      
      Cc: Bill Pemberton <wfp5p@virginia.edu>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      702e4902
    • Linus Torvalds's avatar
      Merge tag 'dt-for-3.7' of git://sources.calxeda.com/kernel/linux · a54dfb1a
      Linus Torvalds authored
      Pull devicetree updates from Rob Herring:
       - Import of latest upstream device tree compiler (dtc)
       - New function of_get_child_by_name
       - Support for #size-cells of 0 and #addr-cells of >2
       - Couple of DT binding documentation updates
      
      Fix up trivial conflicts due to of_get_child_by_name() having been added
      next to the new of_get_next_available_child().
      
      * tag 'dt-for-3.7' of git://sources.calxeda.com/kernel/linux:
        MAINTAINERS: add scripts/dtc under Devicetree maintainers
        dtc: import latest upstream dtc
        dt: Document general interrupt controller bindings
        dt/s3c64xx/spi: Use of_get_child_by_name to get a named child
        dt: introduce of_get_child_by_name to get child node by name
        of: i2c: add support for wakeup-source property
        of/address: Handle #address-cells > 2 specially
        DT: export of_irq_to_resource_table()
        devicetree: serial: Add documentation for imx serial
        devicetree: pwm: mxs-pwm.txt: Fix reg field annotation
        of: Allow busses with #size-cells=0
      a54dfb1a
    • Linus Torvalds's avatar
      Merge tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy · eb0ad9c0
      Linus Torvalds authored
      Pull JFS update from Dave Kleikamp:
       "JFS TRIM support and some minor fixes"
      
      * tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy:
        jfs: Fix do_div precision in commit b40c2e66
        JFS: use list_move instead of list_del/list_add
        jfs: Remove obsolete email address
        fs/jfs: TRIM support for JFS Filesystem
      eb0ad9c0
    • Matt Fleming's avatar
      MAINTAINERS: Add EFI maintainer entry · 1f7df953
      Matt Fleming authored
      We're starting to need a channel through which we can funnel EFI
      patches to make sure they get merged in a timely fashion. Matthew and
      Peter seem happy enough for me to take that bullet.
      Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
      Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
      Acked-by: default avatarIngo Molnar <mingo@kernel.org>
      Cc: Matthew Garrett <mjg@redhat.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Tony Luck <tony.luck@intel.com>
      Cc: Len Brown <len.brown@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1f7df953
    • Linus Torvalds's avatar
      Merge tag 'cris-for-linus-3.7' of git://jni.nu/cris · b463036a
      Linus Torvalds authored
      Pull CRIS changes from Jesper Nilsson:
       "Removal of some unused code from the CRIS port"
      
      * tag 'cris-for-linus-3.7' of git://jni.nu/cris:
        CRIS: Remove VCS simulator specific code
        cris/PCI: remove pcibios_assign_resources()
      b463036a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · a06cb1ae
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
       "Some quick fixes after today's merge-window pull"
      
       1) Add missing dependency on Sparc DES driver, oops.  From Dave Jones.
      
       2) Tell GCC that prom_printf() is printf-like and fix the few
          resultiing warnings.  From Akinobu Mita.
      
       3) Niagara-2 memcpy doesn't provide it's return value correctly in some
          circumstances.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: fix format string argument for prom_printf()
        crypto: Build SPARC DES algorithms on SPARC only.
        sparc64: Fix return value of Niagara-2 memcpy.
      a06cb1ae
    • Jesper Nilsson's avatar
      CRIS: Remove VCS simulator specific code · d75d806c
      Jesper Nilsson authored
      The VCS simulator was a tool used in the development of the chip
      and is no longer used or necessary.
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      d75d806c
    • Bjorn Helgaas's avatar
      cris/PCI: remove pcibios_assign_resources() · 227c6fc2
      Bjorn Helgaas authored
      There's no caller of pcibios_assign_resources() in the tree.  It is
      exported, so an out-of-tree module *could* call it, but no other arch
      exports pcibios_assign_resources(), so it would have to be a CRIS-specific
      module.  I doubt such a caller exists.
      
      CC: Mikael Starvik <starvik@axis.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      227c6fc2
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.7-x86-tag' of... · 56d92aa5
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.7-x86-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen update from Konrad Rzeszutek Wilk:
       "Features:
         - When hotplugging PCI devices in a PV guest we can allocate
           Xen-SWIOTLB later.
         - Cleanup Xen SWIOTLB.
         - Support pages out grants from HVM domains in the backends.
         - Support wild cards in xen-pciback.hide=(BDF) arguments.
         - Update grant status updates with upstream hypervisor.
         - Boot PV guests with more than 128GB.
         - Cleanup Xen MMU code/add comments.
         - Obtain XENVERS using a preferred method.
         - Lay out generic changes to support Xen ARM.
         - Allow privcmd ioctl for HVM (used to do only PV).
         - Do v2 of mmap_batch for privcmd ioctls.
         - If hypervisor saves the LED keyboard light - we will now instruct
           the kernel about its state.
        Fixes:
         - More fixes to Xen PCI backend for various calls/FLR/etc.
         - With more than 4GB in a 64-bit PV guest disable native SWIOTLB.
         - Fix up smatch warnings.
         - Fix up various return values in privmcmd and mm."
      
      * tag 'stable/for-linus-3.7-x86-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (48 commits)
        xen/pciback: Restore the PCI config space after an FLR.
        xen-pciback: properly clean up after calling pcistub_device_find()
        xen/vga: add the xen EFI video mode support
        xen/x86: retrieve keyboard shift status flags from hypervisor.
        xen/gndev: Xen backend support for paged out grant targets V4.
        xen-pciback: support wild cards in slot specifications
        xen/swiotlb: Fix compile warnings when using plain integer instead of NULL pointer.
        xen/swiotlb: Remove functions not needed anymore.
        xen/pcifront: Use Xen-SWIOTLB when initting if required.
        xen/swiotlb: For early initialization, return zero on success.
        xen/swiotlb: Use the swiotlb_late_init_with_tbl to init Xen-SWIOTLB late when PV PCI is used.
        xen/swiotlb: Move the error strings to its own function.
        xen/swiotlb: Move the nr_tbl determination in its own function.
        xen/arm: compile and run xenbus
        xen: resynchronise grant table status codes with upstream
        xen/privcmd: return -EFAULT on error
        xen/privcmd: Fix mmap batch ioctl error status copy back.
        xen/privcmd: add PRIVCMD_MMAPBATCH_V2 ioctl
        xen/mm: return more precise error from xen_remap_domain_range()
        xen/mmu: If the revector fails, don't attempt to revector anything else.
        ...
      56d92aa5
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm · 33c2a174
      Linus Torvalds authored
      Pull frontswap update from Konrad Rzeszutek Wilk:
       "Features:
         - Support exlusive get if backend is capable.
        Bug-fixes:
         - Fix compile warnings
         - Add comments/cleanup doc
         - Fix wrong if condition"
      
      * tag 'stable/for-linus-3.7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
        frontswap: support exclusive gets if tmem backend is capable
        mm: frontswap: fix a wrong if condition in frontswap_shrink
        mm/frontswap: fix uninit'ed variable warning
        mm/frontswap: cleanup doc and comment error
        mm: frontswap: remove unneeded headers
      33c2a174
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 88265322
      Linus Torvalds authored
      Pull security subsystem updates from James Morris:
       "Highlights:
      
         - Integrity: add local fs integrity verification to detect offline
           attacks
         - Integrity: add digital signature verification
         - Simple stacking of Yama with other LSMs (per LSS discussions)
         - IBM vTPM support on ppc64
         - Add new driver for Infineon I2C TIS TPM
         - Smack: add rule revocation for subject labels"
      
      Fixed conflicts with the user namespace support in kernel/auditsc.c and
      security/integrity/ima/ima_policy.c.
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (39 commits)
        Documentation: Update git repository URL for Smack userland tools
        ima: change flags container data type
        Smack: setprocattr memory leak fix
        Smack: implement revoking all rules for a subject label
        Smack: remove task_wait() hook.
        ima: audit log hashes
        ima: generic IMA action flag handling
        ima: rename ima_must_appraise_or_measure
        audit: export audit_log_task_info
        tpm: fix tpm_acpi sparse warning on different address spaces
        samples/seccomp: fix 31 bit build on s390
        ima: digital signature verification support
        ima: add support for different security.ima data types
        ima: add ima_inode_setxattr/removexattr function and calls
        ima: add inode_post_setattr call
        ima: replace iint spinblock with rwlock/read_lock
        ima: allocating iint improvements
        ima: add appraise action keywords and default rules
        ima: integrity appraisal extension
        vfs: move ima_file_free before releasing the file
        ...
      88265322
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubi · 65b99c74
      Linus Torvalds authored
      Pull UBI changes from Artem Bityutskiy:
       "The main change is the way we reserve eraseblocks for bad blocks
        handling.  We used to reserve 2% of the partition, but now we are more
        aggressive and we reserve 2% of the entire chip, which is what
        actually manufacturers specify in data sheets.  We introduced an
        option to users to override the default, though.
      
        There are a couple of fixes as well, and a number of cleanups."
      
      * tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubi: (24 commits)
        UBI: fix trivial typo 'it' => 'is'
        UBI: load after mtd device drivers
        UBI: print less
        UBI: use pr_ helper instead of printk
        UBI: comply with coding style
        UBI: erase free PEB with bitflip in EC header
        UBI: fix autoresize handling in R/O mode
        UBI: add max_beb_per1024 to attach ioctl
        UBI: allow specifying bad PEBs limit using module parameter
        UBI: check max_beb_per1024 value in ubi_attach_mtd_dev
        UBI: prepare for max_beb_per1024 module parameter addition
        UBI: introduce MTD_PARAM_MAX_COUNT
        UBI: separate bad_peb_limit in a function
        arm: sam9_l9260_defconfig: correct CONFIG_MTD_UBI_BEB_LIMIT
        UBI: use the whole MTD device size to get bad_peb_limit
        mtd: mtdparts: introduce mtd_get_device_size
        mtd: mark mtd_is_partition argument as constant
        arm: sam9_l9260_defconfig: remove non-existing config option
        UBI: kill CONFIG_MTD_UBI_BEB_RESERVE
        UBI: limit amount of reserved eraseblocks for bad PEB handling
        ...
      65b99c74
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs · 782c3fb2
      Linus Torvalds authored
      Pull ubifs changes from Artem Bityutskiy:
       "No big changes for 3.7 in UBIFS:
         - Error reporting and debug printing improvements
         - Power cut emulation fixes
         - Minor cleanups"
      
      Fix trivial conflict in fs/ubifs/debug.c due to the user namespace
      changes.
      
      * tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs:
        UBIFS: print less
        UBIFS: use pr_ helper instead of printk
        UBIFS: comply with coding style
        UBIFS: use __aligned() attribute
        UBIFS: remove __DATE__ and __TIME__
        UBIFS: fix power cut emulation for mtdram
        UBIFS: improve scanning debug output
        UBIFS: always print full error reports
        UBIFS: print PID in debug messages
      782c3fb2
    • Linus Torvalds's avatar
      Merge tag 'for-linus-v3.7-rc1' of git://oss.sgi.com/xfs/xfs · 60c7b4df
      Linus Torvalds authored
      Pull xfs update from Ben Myers:
       "Several enhancements and cleanups:
      
         - make inode32 and inode64 remountable options
         - SEEK_HOLE/SEEK_DATA enhancements
         - cleanup struct declarations in xfs_mount.h"
      
      * tag 'for-linus-v3.7-rc1' of git://oss.sgi.com/xfs/xfs:
        xfs: Make inode32 a remountable option
        xfs: add inode64->inode32 transition into xfs_set_inode32()
        xfs: Fix mp->m_maxagi update during inode64 remount
        xfs: reduce code duplication handling inode32/64 options
        xfs: make inode64 as the default allocation mode
        xfs: Fix m_agirotor reset during AG selection
        Make inode64 a remountable option
        xfs: stop the sync worker before xfs_unmountfs
        xfs: xfs_seek_hole() refinement with hole searching from page cache for unwritten extents
        xfs: xfs_seek_data() refinement with unwritten extents check up from page cache
        xfs: Introduce a helper routine to probe data or hole offset from page cache
        xfs: Remove type argument from xfs_seek_data()/xfs_seek_hole()
        xfs: fix race while discarding buffers [V4]
        xfs: check for possible overflow in xfs_ioc_trim
        xfs: unlock the AGI buffer when looping in xfs_dialloc
        xfs: kill struct declarations in xfs_mount.h
        xfs: fix uninitialised variable in xfs_rtbuf_get()
      60c7b4df
    • Dave Airlie's avatar
      Merge branch 'drm-nouveau-next' of... · 268d2837
      Dave Airlie authored
      Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
      
      This is a major rework of the nouveau driver core, to reflect more closely
      how the hw is used and to make it easier to implement newer features now
      that the GPUs are more clearly understood than when nouveau started.
      
      It also contains a few other bits:
      thermal patches
      nv41/44 pcie gart fixes
      i2c unregistering fixes.
      
      * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (191 commits)
        drm/nv98/crypt: fix fuc build with latest envyas
        drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering
        drm/nv41/vm: fix and enable use of "real" pciegart
        drm/nv44/vm: fix and enable use of "real" pciegart
        drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie
        drm/nouveau: store supported dma mask in vmmgr
        drm/nvc0/ibus: initial implementation of subdev
        drm/nouveau/therm: add support for fan-control modes
        drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
        drm/nouveau/therm: calculate the pwm divisor on nv50+
        drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster
        drm/nouveau/therm: move thermal-related functions to the therm subdev
        drm/nouveau/bios: parse the pwm divisor from the perf table
        drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices
        drm/nouveau/therm: rework thermal table parsing
        drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table
        drm/nouveau: fix pm initialization order
        drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it
        drm/nouveau: log channel debug/error messages from client object rather than drm client
        drm/nouveau: have drm debugging macros build on top of core macros
        ...
      
      Conflicts:
      	drivers/gpu/drm/nouveau/nouveau_dp.c
      268d2837
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · aab174f0
      Linus Torvalds authored
      Pull vfs update from Al Viro:
      
       - big one - consolidation of descriptor-related logics; almost all of
         that is moved to fs/file.c
      
         (BTW, I'm seriously tempted to rename the result to fd.c.  As it is,
         we have a situation when file_table.c is about handling of struct
         file and file.c is about handling of descriptor tables; the reasons
         are historical - file_table.c used to be about a static array of
         struct file we used to have way back).
      
         A lot of stray ends got cleaned up and converted to saner primitives,
         disgusting mess in android/binder.c is still disgusting, but at least
         doesn't poke so much in descriptor table guts anymore.  A bunch of
         relatively minor races got fixed in process, plus an ext4 struct file
         leak.
      
       - related thing - fget_light() partially unuglified; see fdget() in
         there (and yes, it generates the code as good as we used to have).
      
       - also related - bits of Cyrill's procfs stuff that got entangled into
         that work; _not_ all of it, just the initial move to fs/proc/fd.c and
         switch of fdinfo to seq_file.
      
       - Alex's fs/coredump.c spiltoff - the same story, had been easier to
         take that commit than mess with conflicts.  The rest is a separate
         pile, this was just a mechanical code movement.
      
       - a few misc patches all over the place.  Not all for this cycle,
         there'll be more (and quite a few currently sit in akpm's tree)."
      
      Fix up trivial conflicts in the android binder driver, and some fairly
      simple conflicts due to two different changes to the sock_alloc_file()
      interface ("take descriptor handling from sock_alloc_file() to callers"
      vs "net: Providing protocol type via system.sockprotoname xattr of
      /proc/PID/fd entries" adding a dentry name to the socket)
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (72 commits)
        MAX_LFS_FILESIZE should be a loff_t
        compat: fs: Generic compat_sys_sendfile implementation
        fs: push rcu_barrier() from deactivate_locked_super() to filesystems
        btrfs: reada_extent doesn't need kref for refcount
        coredump: move core dump functionality into its own file
        coredump: prevent double-free on an error path in core dumper
        usb/gadget: fix misannotations
        fcntl: fix misannotations
        ceph: don't abuse d_delete() on failure exits
        hypfs: ->d_parent is never NULL or negative
        vfs: delete surplus inode NULL check
        switch simple cases of fget_light to fdget
        new helpers: fdget()/fdput()
        switch o2hb_region_dev_write() to fget_light()
        proc_map_files_readdir(): don't bother with grabbing files
        make get_file() return its argument
        vhost_set_vring(): turn pollstart/pollstop into bool
        switch prctl_set_mm_exe_file() to fget_light()
        switch xfs_find_handle() to fget_light()
        switch xfs_swapext() to fget_light()
        ...
      aab174f0
    • Akinobu Mita's avatar
      sparc: fix format string argument for prom_printf() · 5da444aa
      Akinobu Mita authored
      prom_printf() takes printf style arguments.  Specifing GCC's format
      attribute reveals that there are several wrong usages of prom_printf().
      
      This fixes those wrong format strings and arguments, and also leaves
      format attributes in order to detect similar mistakes at compile time.
      Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: sparclinux@vger.kernel.org
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5da444aa
    • Ben Skeggs's avatar
      b9f10852
    • Ben Skeggs's avatar
      drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering · 7234d023
      Ben Skeggs authored
      Details of the problem, and solution, are in comments in the commit
      proper.
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      7234d023
    • Ben Skeggs's avatar
      drm/nv41/vm: fix and enable use of "real" pciegart · 002d0c73
      Ben Skeggs authored
      Hopefully fixed the tlb flush timeout issue.  Was able to observe this
      condition occur occasionally, and it appears the binary driver doesn't
      wait on the old condition either..
      
      Should give 39-bit DMA addressing on the relevant chipsets.
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      002d0c73
    • Ben Skeggs's avatar
      drm/nv44/vm: fix and enable use of "real" pciegart · e5f186c4
      Ben Skeggs authored
      Something seems to be missing in regards to flushing specific ranges of
      the TLB.  For the moment, flushing the entire thing seems to make it
      work alright.
      
      Should give 39-bit DMA addressing on the relevant chipsets.
      
      v2: allocate contig 16KiB for dummy pages, reported by mwk on irc
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      e5f186c4
    • Ben Skeggs's avatar
      drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie · 8a57d279
      Ben Skeggs authored
      We don't need to pull the page address out of the page tables on nv4x
      chips that have a real GART.
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      8a57d279
    • Ben Skeggs's avatar
      drm/nouveau: store supported dma mask in vmmgr · dc73b45a
      Ben Skeggs authored
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      dc73b45a
    • Ben Skeggs's avatar
      c0abf5c9
    • Martin Peres's avatar
      drm/nouveau/therm: add support for fan-control modes · 2f951a5d
      Martin Peres authored
      For now, only 2 control modes are available:
      - NONE: The fan is never touched (default)
      - MANUAL: The fan is set to the user-defined fan speed (pwm1)
      
      This patch introduces a distinction between ptherm internal fan management
      and external fan management. The latter is bound to respect the fan mode
      while the first can still select the speed it wants unless the NONE mode
      is selected. This is important for automatic fan management.
      Signed-off-by: default avatarMartin Peres <martin.peres@labri.fr>
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      2f951a5d
    • Martin Peres's avatar
      drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules · c9cbf135
      Martin Peres authored
      This was reported by tizbac on IRC.
      Signed-off-by: default avatarMartin Peres <martin.peres@labri.fr>
      Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      c9cbf135
    • Martin Peres's avatar
      drm/nouveau/therm: calculate the pwm divisor on nv50+ · cfc732bb
      Martin Peres authored
      v2: Martin Peres <martin.peres@labri.fr>
      - fixed unintentional use of floating point
      Signed-off-by: default avatarMartin Peres <martin.peres@labri.fr>
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      cfc732bb
    • Martin Peres's avatar
      drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster · bf6546b4
      Martin Peres authored
      The previous driver waited for 250ms to accumulate data. This version times a
      complete fan rotation and extrapolates to RPM.
      
      The fan rotational speed should now be read in less than 250ms (worst case)
      and usually in less 50ms.
      Signed-off-by: default avatarMartin Peres <martin.peres@labri.fr>
      Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      bf6546b4