1. 01 1月, 2015 2 次提交
  2. 31 12月, 2014 8 次提交
    • T
      nios2: Use preempt_schedule_irq · 1b0f4492
      Tobias Klauser 提交于
      Follow aa0d5326 ("ia64: Use preempt_schedule_irq") and use
      preempt_schedule_irq instead of enabling/disabling interrupts and
      messing around with PREEMPT_ACTIVE in the nios2 low-level preemption
      code ourselves. Also get rid of the now needless re-check for
      TIF_NEED_RESCHED, preempt_schedule_irq will already take care of
      rescheduling.
      
      This also fixes the following build error when building with
      CONFIG_PREEMPT:
      
      arch/nios2/kernel/built-in.o: In function `need_resched':
      arch/nios2/kernel/entry.S:374: undefined reference to `PREEMPT_ACTIVE'
      
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NTobias Klauser <tklauser@distanz.ch>
      Acked-by: NLey Foon Tan <lftan@altera.com>
      1b0f4492
    • W
      nios2: Initialize cpuinfo.mmu · 6f3d2b00
      Walter Goossens 提交于
      This patch initializes the mmu field of the cpuinfo structure to the
      value supplied by the devicetree.
      Signed-off-by: NWalter Goossens <waltergoossens@home.nl>
      Acked-by: NLey Foon Tan <lftan@altera.com>
      6f3d2b00
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 9bb29b6b
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Arnd Bergmann:
       "A very small set of fixes for 3.19, as everyone was out.
      
        The clocksource patch was something I missed for the merge window
        after the change that broke arm64 was merged through arm-soc.  The
        other two patches are a fix for an undetected merge problem in mvebu
        and a defconfig change to make some exynos boards work with the normal
        multi_v7_defconfig"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        Add USB_EHCI_EXYNOS to multi_v7_defconfig
        ARM: mvebu: Fix pinctrl configuration for Armada 370 DB
        clocksource: arch_timer: Only use the virtual counter (CNTVCT) on arm64
      9bb29b6b
    • L
      Merge tag 'fbdev-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · e4811a27
      Linus Torvalds 提交于
      Pull fbdev fixes from Tomi Valkeinen:
      
       - Fix regression with Nokia N900 display
      
       - Fix crash on fbdev using freed __initdata logos
      
       - Fix fb_deferred_io_fsync() return value.
      
      * tag 'fbdev-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        OMAPDSS: SDI: fix output port_num
        video/fbdev: fix defio's fsync
        video/logo: prevent use of logos after they have been freed
        OMAPDSS: pll: NULL dereference in error handling
        OMAPDSS: HDMI: remove double initializer entries
      e4811a27
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · bac22980
      Linus Torvalds 提交于
      Pull input layer fixes from Dmitry Torokhov:
       "Fixes for v7 protocol for ALPS devices and few other driver fixes.
      
        Also users can request input events to be stamped with boot time
        timestamps, in addition to real and monotonic timestamps"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: hil_kbd - fix incorrect use of init_completion
        Input: alps - v7: document the v7 touchpad packet protocol
        Input: alps - v7: fix finger counting for > 2 fingers on clickpads
        Input: alps - v7: sometimes a single touch is reported in mt[1]
        Input: alps - v7: ignore new packets
        Input: evdev - add CLOCK_BOOTTIME support
        Input: psmouse - expose drift duration for IBM trackpoints
        Input: stmpe - bias keypad columns properly
        Input: stmpe - enforce device tree only mode
        mfd: stmpe: add pull up/down register offsets for STMPE
        Input: optimize events_per_packet count calculation
        Input: edt-ft5x06 - fixed a macro coding style issue
        Input: gpio_keys - replace timer and workqueue with delayed workqueue
        Input: gpio_keys - allow separating gpio and irq in device tree
      bac22980
    • J
      Revert "cfg80211: make WEXT compatibility unselectable" · 831a39c2
      Jiri Kosina 提交于
      This reverts commit 24a0aa21.
      
      It's causing severe userspace breakage.  Namely, all the utilities from
      wireless-utils which are relying on CONFIG_WEXT (which means tools like
      'iwconfig', 'iwlist', etc) are not working anymore.  There is a 'iw'
      utility in newer wireless-tools, which is supposed to be a replacement
      for all the "deprecated" binaries, but it's far away from being
      massively adopted.
      
      Please see [1] for example of the userspace breakage this is causing.
      
      In addition to that, Larry Finger reports [2] that this patch is also
      causing ipw2200 driver being impossible to build.
      
      To me this clearly shows that CONFIG_WEXT is far, far away from being
      "deprecated enough" to be removed.
      
      [1] http://thread.gmane.org/gmane.linux.kernel/1857010
      [2] http://thread.gmane.org/gmane.linux.network/343688Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      831a39c2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 2c90331c
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Fix double SKB free in bluetooth 6lowpan layer, from Jukka Rissanen.
      
       2) Fix receive checksum handling in enic driver, from Govindarajulu
          Varadarajan.
      
       3) Fix NAPI poll list corruption in virtio_net and caif_virtio, from
          Herbert Xu.  Also, add code to detect drivers that have this mistake
          in the future.
      
       4) Fix doorbell endianness handling in mlx4 driver, from Amir Vadai.
      
       5) Don't clobber IP6CB() before xfrm6_policy_check() is called in TCP
          input path,f rom Nicolas Dichtel.
      
       6) Fix MPLS action validation in openvswitch, from Pravin B Shelar.
      
       7) Fix double SKB free in vxlan driver, also from Pravin.
      
       8) When we scrub a packet, which happens when we are switching the
          context of the packet (namespace, etc.), we should reset the
          secmark.  From Thomas Graf.
      
       9) ->ndo_gso_check() needs to do more than return true/false, it also
          has to allow the driver to clear netdev feature bits in order for
          the caller to be able to proceed properly.  From Jesse Gross.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (62 commits)
        genetlink: A genl_bind() to an out-of-range multicast group should not WARN().
        netlink/genetlink: pass network namespace to bind/unbind
        ne2k-pci: Add pci_disable_device in error handling
        bonding: change error message to debug message in __bond_release_one()
        genetlink: pass multicast bind/unbind to families
        netlink: call unbind when releasing socket
        netlink: update listeners directly when removing socket
        genetlink: pass only network namespace to genl_has_listeners()
        netlink: rename netlink_unbind() to netlink_undo_bind()
        net: Generalize ndo_gso_check to ndo_features_check
        net: incorrect use of init_completion fixup
        neigh: remove next ptr from struct neigh_table
        net: xilinx: Remove unnecessary temac_property in the driver
        net: phy: micrel: use generic config_init for KSZ8021/KSZ8031
        net/core: Handle csum for CHECKSUM_COMPLETE VXLAN forwarding
        openvswitch: fix odd_ptr_err.cocci warnings
        Bluetooth: Fix accepting connections when not using mgmt
        Bluetooth: Fix controller configuration with HCI_QUIRK_INVALID_BDADDR
        brcmfmac: Do not crash if platform data is not populated
        ipw2200: select CFG80211_WEXT
        ...
      2c90331c
    • L
      Merge tag 'linux-kselftest-3.19-fixes' of... · 6ab1e8de
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest fix from Shuah Khan:
       "Fix exec test compile warnings"
      
      * tag 'linux-kselftest-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests/exec: Use %zu to format size_t
      6ab1e8de
  3. 30 12月, 2014 17 次提交
    • S
      Add USB_EHCI_EXYNOS to multi_v7_defconfig · 007487f1
      Steev Klimaszewski 提交于
      Currently we enable Exynos devices in the multi v7 defconfig, however, when
      testing on my ODROID-U3, I noticed that USB was not working.  Enabling this
      option causes USB to work, which enables networking support as well since the
      ODROID-U3 has networking on the USB bus.
      
      [arnd] Support for odroid-u3 was added in 3.10, so it would be nice to
      backport this fix at least that far.
      Signed-off-by: NSteev Klimaszewski <steev@gentoo.org>
      Cc: stable@vger.kernel.org # 3.10
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      007487f1
    • A
      Merge tag 'mvebu-fixes-3.19' of git://git.infradead.org/linux-mvebu into fixes · 7ebdfaa5
      Arnd Bergmann 提交于
      Pull "Fixes for 3.19" from Andrew Lunn:
      
      Jason is taking a back seat this cycle and i'm doing all the patch
      wrangling for mvebu.
      
      * tag 'mvebu-fixes-3.19' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: Fix pinctrl configuration for Armada 370 DB
      
      Also update to Linux 3.19-rc1, which this was based on.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      7ebdfaa5
    • T
      OMAPDSS: SDI: fix output port_num · a32442d4
      Tomi Valkeinen 提交于
      After the commit ef691ff4 (OMAPDSS: DT: Get source endpoint by
      matching reg-id) we look for the SDI output using the port number.
      However, the SDI driver doesn't set the port number, which causes the
      SDI display to not initialize.
      
      Fix this by setting the SDI port number to 1. We use a hardcoded value,
      as SDI was used only on OMAP3 and it's always port number 1 there.
      Reported-by: NAaro Koskinen <aaro.koskinen@iki.fi>
      Reported-by: NPavel Machek <pavel@ucw.cz>
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      a32442d4
    • T
      video/fbdev: fix defio's fsync · 30ea9c52
      Tomi Valkeinen 提交于
      fb_deferred_io_fsync() returns the value of schedule_delayed_work() as
      an error code, but schedule_delayed_work() does not return an error. It
      returns true/false depending on whether the work was already queued.
      
      Fix this by ignoring the return value of schedule_delayed_work().
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      Cc: stable@vger.kernel.org
      30ea9c52
    • L
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · 5faa0154
      Linus Torvalds 提交于
      Pull CIFS fixes from Steve French:
       "A set of three minor cifs fixes"
      
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: make new inode cache when file type is different
        Fix signed/unsigned pointer warning
        Convert MessageID in smb2_hdr to LE
      5faa0154
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · b9d4a35f
      Linus Torvalds 提交于
      Pull UDF & isofs fixes from Jan Kara:
       "A couple of UDF fixes of handling of corrupted media and one iso9660
        fix of the same"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        udf: Reduce repeated dereferences
        udf: Check component length before reading it
        udf: Check path length when reading symlink
        udf: Verify symlink size before loading it
        udf: Verify i_size when loading inode
        isofs: Fix unchecked printing of ER records
      b9d4a35f
    • L
      Merge tag 'pm+acpi-3.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · df90dcd1
      Linus Torvalds 提交于
      Pull power management and ACPI material from Rafael J Wysocki:
       "These are fixes (operating performance points library, cpufreq-dt
        driver, cpufreq core, ACPI backlight, cpupower tool), cleanups
        (cpuidle), new processor IDs for the RAPL (Running Average Power
        Limit) power capping driver, and a modification of the generic power
        domains framework allowing modular drivers to call one of its helper
        functions.
      
        Specifics:
      
         - Fix for a potential NULL pointer dereference in the cpufreq core
           due to an initialization race condition (Ethan Zhao).
      
         - Fixes for abuse of the OPP (Operating Performance Points) API
           related to RCU and other minor issues in the OPP library and the
           cpufreq-dt driver (Dmitry Torokhov).
      
         - cpuidle governors cleanup making them measure idle duration in a
           better way without using the CPUIDLE_FLAG_TIME_INVALID flag which
           allows that flag to be dropped from the ACPI cpuidle driver and
           from the core too (Len Brown).
      
         - New ACPI backlight blacklist entries for Samsung machines without a
           working native backlight interface that need to use the ACPI
           backlight instead (Aaron Lu).
      
         - New CPU IDs of future Intel Xeon CPUs for the Intel RAPL power
           capping driver (Jacob Pan).
      
         - Generic power domains framework modification to export the
           of_genpd_get_from_provider() function to modular drivers that will
           allow future driver modifications to be based on the mainline (Amit
           Daniel Kachhap).
      
         - Two fixes for the cpupower tool (Michal Privoznik, Prarit
           Bhargava)"
      
      * tag 'pm+acpi-3.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / video: Add some Samsung models to disable_native_backlight list
        tools / cpupower: Fix no idle state information return value
        tools / cpupower: Correctly detect if running as root
        cpufreq: fix a NULL pointer dereference in __cpufreq_governor()
        cpufreq-dt: defer probing if OPP table is not ready
        PM / OPP: take RCU lock in dev_pm_opp_get_opp_count
        PM / OPP: fix warning in of_free_opp_table()
        PM / OPP: add some lockdep annotations
        powercap / RAPL: add IDs for future Xeon CPUs
        PM / Domains: Export of_genpd_get_from_provider function
        cpuidle / ACPI: remove unused CPUIDLE_FLAG_TIME_INVALID
        cpuidle: ladder: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
        cpuidle: menu: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
      df90dcd1
    • D
      genetlink: A genl_bind() to an out-of-range multicast group should not WARN(). · dc97a1a9
      David S. Miller 提交于
      Users can request to bind to arbitrary multicast groups, so warning
      when the requested group number is out of range is not appropriate.
      
      And with the warning removed, and the 'err' variable properly given
      an initial value, we can remove 'found' altogether.
      Reported-by: NSedat Dilek <sedat.dilek@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      dc97a1a9
    • L
      Merge tag 'spi-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 346eef2f
      Linus Torvalds 提交于
      Pull spi fixes from Mark Brown:
       "A few driver specific fixes here, the DMA burst size increase in the
        spfi driver is a fix to make the hardware happier in some situations"
      
      * tag 'spi-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: img-spfi: Increase DMA burst size
        spi: img-spfi: Enable controller before starting TX DMA
        spi: sh-msiof: Add runtime PM lock in initializing
      346eef2f
    • L
      Merge tag 'regulator-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 034496f4
      Linus Torvalds 提交于
      Pull one regulator fix from Mark Brown:
       "One fix here, a fix for the voltage mapping on one of the s2mps11
        regulators which broke systems using it including apparently the
        Gear 2 smartwatches"
      
      * tag 'regulator-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: s2mps11: Fix dw_mmc failure on Gear 2
      034496f4
    • L
      Merge tag 'mmc-v3.19-2' of git://git.linaro.org/people/ulf.hansson/mmc · 5e6c2c97
      Linus Torvalds 提交于
      Pull one MMC fix from Ulf Hansson:
       "MMC core:
      
         - Fix selection of buswidth for mmc hosts supporting 1-bit only"
      
      * tag 'mmc-v3.19-2' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: core: stop trying to switch width when only one bit is supported
      5e6c2c97
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 4c5d4995
      Linus Torvalds 提交于
      Pull thermal management updates from Zhang Rui:
       "First of all, the most important change is the thermal cpu cooling
        fixes.  The major fix here is to have proper sequencing between
        cpufreq layer and thermal cpu cooling registration.  A take away of
        this fix is an improvement in the thermal drivers code.  Thermal
        drivers that require cpu cooling do not need to check for cpufreq
        layer.  The requirement now is to propagate the error code, if any,
        while registering cpu cooling device.  Thanks to Viresh for
        implementing the required CPUfreq changes.
      
        Second, a new driver is introduced for int340x processor thermal
        device.  Given that int340x thermal is disabled by default, and this
        processor thermal device is only available on limited platforms, plus
        the driver does nothing but exposes some thermal limitation
        information for user space to use, thus I think it is safe to include
        it in this pull request after missing 3.19-rc2.
      
        Specifics:
      
         - Thermal cpu cooling fixes and cleanups.
      
         - introduce INT340X processor thermal reporting device driver.
      
         - several small fixes and cleanups for int340x thermal drivers"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (43 commits)
        Thermal/int340x/int3403: Free acpi notification handler
        Thermal/int340x/processor_thermal: Fix memory leak
        Thermal/int340x/int3403: Fix memory leak
        thermal: int340x: Introduce processor reporting device
        thermal: int340x_thermal: drop owner assignment from platform_drivers
        thermal: drop owner assignment from platform_drivers
        thermal: cpu_cooling: document node in struct cpufreq_cooling_device
        thermal/powerclamp: add ids for future xeon cpus
        Thermal/int340x: Handle properly the case when _trt or _art acpi entry is missing
        thermal: cpu_cooling: return ERR_PTR() for !CPU_THERMAL or !THERMAL_OF
        thermal: cpu_cooling: small memory leak on error
        thermal: ti-soc-thermal: Do not print error message in the EPROBE_DEFER case
        thermal: db8500: Do not print error message in the EPROBE_DEFER case
        thermal: imx: Do not print error message in the EPROBE_DEFER case
        thermal: Fix cdev registration with THERMAL_NO_LIMIT on 64bit
        drivers: thermal: Remove ARCH_HAS_BANDGAP dependency for samsung
        thermal:core:fix: Check return code of the ->get_max_state() callback
        thermal: cpu_cooling: update copyright tags
        thermal: cpu_cooling: Use cpufreq_dev->freq_table for finding level/freq
        thermal: cpu_cooling: Store frequencies in descending order
        ...
      4c5d4995
    • M
      mm: get rid of radix tree gfp mask for pagecache_get_page · 45f87de5
      Michal Hocko 提交于
      Commit 2457aec6 ("mm: non-atomically mark page accessed during page
      cache allocation where possible") has added a separate parameter for
      specifying gfp mask for radix tree allocations.
      
      Not only this is less than optimal from the API point of view because it
      is error prone, it is also buggy currently because
      grab_cache_page_write_begin is using GFP_KERNEL for radix tree and if
      fgp_flags doesn't contain FGP_NOFS (mostly controlled by fs by
      AOP_FLAG_NOFS flag) but the mapping_gfp_mask has __GFP_FS cleared then
      the radix tree allocation wouldn't obey the restriction and might
      recurse into filesystem and cause deadlocks.  This is the case for most
      filesystems unfortunately because only ext4 and gfs2 are using
      AOP_FLAG_NOFS.
      
      Let's simply remove radix_gfp_mask parameter because the allocation
      context is same for both page cache and for the radix tree.  Just make
      sure that the radix tree gets only the sane subset of the mask (e.g.  do
      not pass __GFP_WRITE).
      
      Long term it is more preferable to convert remaining users of
      AOP_FLAG_NOFS to use mapping_gfp_mask instead and simplify this
      interface even further.
      Reported-by: NDave Chinner <david@fromorbit.com>
      Signed-off-by: NMichal Hocko <mhocko@suse.cz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      45f87de5
    • R
      Merge branch 'acpi-video' · 651c3293
      Rafael J. Wysocki 提交于
      * acpi-video:
        ACPI / video: Add some Samsung models to disable_native_backlight list
      651c3293
    • R
      Merge branches 'pm-domains', 'powercap' and 'pm-tools' · 4f2f2777
      Rafael J. Wysocki 提交于
      * pm-domains:
        PM / Domains: Export of_genpd_get_from_provider function
      
      * powercap:
        powercap / RAPL: add IDs for future Xeon CPUs
      
      * pm-tools:
        tools / cpupower: Fix no idle state information return value
        tools / cpupower: Correctly detect if running as root
      4f2f2777
    • R
      Merge branches 'pm-cpufreq' and 'pm-cpuidle' · ff23ab24
      Rafael J. Wysocki 提交于
      * pm-cpufreq:
        cpufreq: fix a NULL pointer dereference in __cpufreq_governor()
        cpufreq-dt: defer probing if OPP table is not ready
      
      * pm-cpuidle:
        cpuidle / ACPI: remove unused CPUIDLE_FLAG_TIME_INVALID
        cpuidle: ladder: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
        cpuidle: menu: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
      ff23ab24
    • R
      Merge branch 'pm-opp' · e0288b0e
      Rafael J. Wysocki 提交于
      * pm-opp:
        PM / OPP: take RCU lock in dev_pm_opp_get_opp_count
        PM / OPP: fix warning in of_free_opp_table()
        PM / OPP: add some lockdep annotations
      e0288b0e
  4. 29 12月, 2014 7 次提交
  5. 28 12月, 2014 6 次提交