1. 07 1月, 2015 2 次提交
    • L
      Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 3b421b80
      Linus Torvalds 提交于
      Pull ext4 bugfixes from Ted Ts'o:
       "Revert a potential seek_data/hole regression which shows up when using
        ext4 to handle ext3 file systems, plus two minor bug fixes"
      
      * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: remove spurious KERN_INFO from ext4_warning call
        Revert "ext4: fix suboptimal seek_{data,hole} extents traversial"
        ext4: prevent online resize with backup superblock
      3b421b80
    • L
      mm: propagate error from stack expansion even for guard page · fee7e49d
      Linus Torvalds 提交于
      Jay Foad reports that the address sanitizer test (asan) sometimes gets
      confused by a stack pointer that ends up being outside the stack vma
      that is reported by /proc/maps.
      
      This happens due to an interaction between RLIMIT_STACK and the guard
      page: when we do the guard page check, we ignore the potential error
      from the stack expansion, which effectively results in a missing guard
      page, since the expected stack expansion won't have been done.
      
      And since /proc/maps explicitly ignores the guard page (commit
      d7824370: "mm: fix up some user-visible effects of the stack guard
      page"), the stack pointer ends up being outside the reported stack area.
      
      This is the minimal patch: it just propagates the error.  It also
      effectively makes the guard page part of the stack limit, which in turn
      measn that the actual real stack is one page less than the stack limit.
      
      Let's see if anybody notices.  We could teach acct_stack_growth() to
      allow an extra page for a grow-up/grow-down stack in the rlimit test,
      but I don't want to add more complexity if it isn't needed.
      Reported-and-tested-by: NJay Foad <jay.foad@gmail.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      fee7e49d
  2. 06 1月, 2015 4 次提交
  3. 05 1月, 2015 2 次提交
  4. 04 1月, 2015 2 次提交
  5. 03 1月, 2015 5 次提交
  6. 01 1月, 2015 4 次提交
  7. 31 12月, 2014 9 次提交
    • 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
    • A
      SCSI: fix regression in scsi_send_eh_cmnd() · 511833ac
      Alan Stern 提交于
      Commit ac61d195 (scsi: set correct completion code in
      scsi_send_eh_cmnd()) introduced a bug.  It changed the stored return
      value from a queuecommand call, but it didn't take into account that
      the return value was used again later on.  This patch fixes the bug by
      changing the later usage.
      
      There is a big comment in the middle of scsi_send_eh_cmnd() which
      does a good job of explaining how the routine works.  But it mentions
      a "rtn = FAILURE" value that doesn't exist in the code.  This patch
      adjusts the code to match the comment (I assume the comment is right
      and the code is wrong).
      
      This fixes Bugzilla #88341.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Reported-by: NАндрей Аладьев <aladjev.andrew@gmail.com>
      Tested-by: NАндрей Аладьев <aladjev.andrew@gmail.com>
      Fixes: ac61d195Acked-by: NHannes Reinecke <hare@suse.de>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NJames Bottomley <JBottomley@Parallels.com>
      511833ac
  8. 30 12月, 2014 12 次提交