1. 03 2月, 2014 1 次提交
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · e4c0da21
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "Here's a set of patches for (hopefully) -rc1.  Some of them are fixes,
        but a good number of them also do things such as enable new drivers in
        the defconfigs for platforms that have such devices, increases
        coverage of the multiplatform defconfig and some DTS changes that
        plumbs up some of the devices that now have bindings and driver
        support.
      
        The commit dates are recent; we've mostly collected these fixes in the
        last few days but I also had to rebuild the branch yesterday to sort
        out some internal conflicts which reset the timestamps.  The changes
        should have been tested by each platform maintainer already (and few
        of them have cross-platform impact) so I'm personally not too
        concerned by it at this time"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
        ARM: multi_v7_defconfig: remove redundant entries and re-enable TI_EDMA
        ARM: multi_v7_defconfig: add mvebu drivers
        clocksource: kona: Add basic use of external clock
        drivers: bus: fix CCI driver kcalloc call parameters swap
        ARM: dts: bcm28155-ap: Fix Card Detection GPIO
        ARM: multi_v7_defconfig: Select CONFIG_AT803X_PHY
        ARM: keystone: config: fix build warning when CONFIG_DMADEVICES is not set
        MAINTAINERS: ARM: SiRF: use regex patterns to involve all SiRF drivers
        ARM: dts: zynq: Add SDHCI nodes
        ARM: hisi: don't select SMP
        ARM: tegra: rebuild tegra_defconfig to add DEBUG_FS
        ARM: multi_v7: copy most options from tegra_defconfig
        ARM: iop32x: fix power off handling for the EM7210 board
        ARM: integrator: restore static map on the CP
        ARM: msm_defconfig: Enable MSM clock drivers
        ARM: dts: msm: Add clock controller nodes and hook into uart
        ARM: OMAP4+: move errata initialization to omap4_pm_init_early
        ARM: OMAP4460: cpuidle: Extend PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD on cpuidle
        ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)
        ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference
        ...
      e4c0da21
  2. 02 2月, 2014 7 次提交
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 5cb480f6
      Linus Torvalds 提交于
      Pull misc kbuild changes from Michal Marek:
       "The non-critical part of kbuild is small this time:
         - Three fixes for make deb-pkg
         - A new coccinelle check
      
        One of the deb-pkg fixes is a leftover from the last merge window,
        hence the merge commit"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        deb-pkg: Fix building for MIPS big-endian or ARM OABI
        deb-pkg: Fix cross-building linux-headers package
        scripts: Coccinelle script for pm_runtime_* return checks with IS_ERR_VALUE
        deb-pkg: Inhibit initramfs builders if CONFIG_BLK_DEV_INITRD is not set
      5cb480f6
    • P
      afs: proc cells and rootcell are writeable · 1bda2ac0
      Pali Rohár 提交于
      Both proc files are writeable and used for configuring cells. But
      there is missing correct mode flag for writeable files. Without
      this patch both proc files are read only.
      
      [ It turns out they aren't really read-only, since root can write to
        them even if the write bit isn't set due to CAP_DAC_OVERRIDE ]
      Signed-off-by: NPali Rohár <pali.rohar@gmail.com>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1bda2ac0
    • H
      tile: remove compat_sys_lookup_dcookie declaration to fix compile error · 5a5e75f4
      Heiko Carstens 提交于
      With commit d8d14bd0 ("fs/compat: fix lookup_dcookie() parameter
      handling") I changed the type of the len parameter of the
      lookup_dcookie() syscall.
      
      However I missed that there was still a stale declaration in
      arch/tile/..  which now causes a compile error on tile:
      
        In file included from fs/dcookies.c:28:0:
        include/linux/compat.h:425:17: error: conflicting types for 'compat_sys_lookup_dcookie'
        fs/dcookies.c:207:1: error: conflicting types for 'compat_sys_lookup_dcookie'
      
      Simply remove the declaration in the tile architecture, which is only a
      leftover from before the different compat lookup_dcookie() versions have
      been merged.  The correct declaration is now in include/linux/compat.h
      
      The build error was reported by Fenguang's build bot.
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Acked-by: NChris Metcalf <cmetcalf@tilera.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5a5e75f4
    • L
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · 0f44bc36
      Linus Torvalds 提交于
      Pull cifs fixes from Steve French:
       "A set of cifs fixes (mostly for symlinks, and SMB2 xattrs) and
        cleanups"
      
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: Fix check for regular file in couldbe_mf_symlink()
        [CIFS] Fix SMB2 mounts so they don't try to set or get xattrs via cifs
        CIFS: Cleanup cifs open codepath
        CIFS: Remove extra indentation in cifs_sfu_type
        CIFS: Cleanup cifs_mknod
        CIFS: Cleanup CIFSSMBOpen
        cifs: Add support for follow_link on dfs shares under posix extensions
        cifs: move unix extension call to cifs_query_symlink()
        cifs: Re-order M-F Symlink code
        cifs: Add create MFSymlinks to protocol ops struct
        cifs: use protocol specific call for query_mf_symlink()
        cifs: Rename MF symlink function names
        cifs: Rename and cleanup open_query_close_cifs_symlink()
        cifs: Fix memory leak in cifs_hardlink()
      0f44bc36
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · efc518eb
      Linus Torvalds 提交于
      Pull vfs fixes from Al Viro:
       "Several obvious fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        Fix mountpoint reference leakage in linkat
        hfsplus: use xattr handlers for removexattr
        Typo in compat_sys_lseek() declaration
        fs/super.c: sync ro remount after blocking writers
        vfs: unexport the getname() symbol
      efc518eb
    • L
      Merge tag 'staging-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · fea8893d
      Linus Torvalds 提交于
      Pull rtl8812ae staging wireless driver from Greg KH:
       "Here's a single staging driver for a wireless chipset that has shown
        up in the SteamBox hardware.  It is merged separately from the "main"
        staging pull request to sync up with the wireless api changes that
        came in from the networking tree.
      
        It's self-contained and works for me and others.  Larry will be
        replacing it with a "real" driver for 3.15, but for now this one is
        needed"
      
      * tag 'staging-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: r8821ae: Enable build by reverting BROKEN marking
        staging: r8821ae: Fix build problems
        Staging: rtl8812ae: disable due to build errors
        Staging: rtl8821ae: add TODO file
        Staging: rtl8821ae: removed unused functions and variables
        Staging: rtl8821ae: rc.c: fix up function prototypes
        Staging: rtl8812ae: Add Realtek 8821 PCI WIFI driver
      fea8893d
    • R
      Revert "PCI: Remove from bus_list and release resources in pci_release_dev()" · 04480094
      Rafael J. Wysocki 提交于
      Revert commit ef83b078 "PCI: Remove from bus_list and release
      resources in pci_release_dev()" that made some nasty race conditions
      become possible.  For example, if a Thunderbolt link is unplugged
      and then replugged immediately, the pci_release_dev() resulting from
      the hot-remove code path may be racing with the hot-add code path
      which after that commit causes various kinds of breakage to happen
      (up to and including a hard crash of the whole system).
      
      Moreover, the problem that commit ef83b078 attempted to address
      cannot happen any more after commit 8a4c5c32 "PCI: Check parent
      kobject in pci_destroy_dev()", because pci_destroy_dev() will now
      return immediately if it has already been executed for the given
      device.
      
      Note, however, that the invocation of msi_remove_pci_irq_vectors()
      removed by commit ef83b078 from pci_free_resources() along with
      the other changes made by it is not added back because of subsequent
      code changes depending on that modification.
      
      Fixes: ef83b078 (PCI: Remove from bus_list and release resources in pci_release_dev())
      Reported-by: NMika Westerberg <mika.westerberg@linux.intel.com>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      04480094
  3. 01 2月, 2014 32 次提交