1. 02 3月, 2015 5 次提交
  2. 01 3月, 2015 17 次提交
  3. 24 2月, 2015 1 次提交
  4. 18 2月, 2015 17 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · f5af19d1
      Linus Torvalds 提交于
      Pull networking updates from David Miller:
      
       1) Missing netlink attribute validation in nft_lookup, from Patrick
          McHardy.
      
       2) Restrict ipv6 partial checksum handling to UDP, since that's the
          only case it works for.  From Vlad Yasevich.
      
       3) Clear out silly device table sentinal macros used by SSB and BCMA
          drivers.  From Joe Perches.
      
       4) Make sure the remote checksum code never creates a situation where
          the remote checksum is applied yet the tunneling metadata describing
          the remote checksum transformation is still present.  Otherwise an
          external entity might see this and apply the checksum again.  From
          Tom Herbert.
      
       5) Use msecs_to_jiffies() where applicable, from Nicholas Mc Guire.
      
       6) Don't explicitly initialize timer struct fields, use setup_timer()
          and mod_timer() instead.  From Vaishali Thakkar.
      
       7) Don't invoke tg3_halt() without the tp->lock held, from Jun'ichi
          Nomura.
      
       8) Missing __percpu annotation in ipvlan driver, from Eric Dumazet.
      
       9) Don't potentially perform skb_get() on shared skbs, also from Eric
          Dumazet.
      
      10) Fix COW'ing of metrics for non-DST_HOST routes in ipv6, from Martin
          KaFai Lau.
      
      11) Fix merge resolution error between the iov_iter changes in vhost and
          some bug fixes that occurred at the same time.  From Jason Wang.
      
      12) If rtnl_configure_link() fails we have to perform a call to
          ->dellink() before unregistering the device.  From WANG Cong.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (39 commits)
        net: dsa: Set valid phy interface type
        rtnetlink: call ->dellink on failure when ->newlink exists
        com20020-pci: add support for eae single card
        vhost_net: fix wrong iter offset when setting number of buffers
        net: spelling fixes
        net/core: Fix warning while make xmldocs caused by dev.c
        net: phy: micrel: disable NAND-tree for KSZ8021, KSZ8031, KSZ8051, KSZ8081
        ipv6: fix ipv6_cow_metrics for non DST_HOST case
        openvswitch: Fix key serialization.
        r8152: restore hw settings
        hso: fix rx parsing logic when skb allocation fails
        tcp: make sure skb is not shared before using skb_get()
        bridge: netfilter: Move sysctl-specific error code inside #ifdef
        ipv6: fix possible deadlock in ip6_fl_purge / ip6_fl_gc
        ipvlan: add a missing __percpu pcpu_stats
        tg3: Hold tp->lock before calling tg3_halt() from tg3_init_one()
        bgmac: fix device initialization on Northstar SoCs (condition typo)
        qlcnic: Delete existing multicast MAC list before adding new
        net/mlx5_core: Fix configuration of log_uar_page_sz
        sunvnet: don't change gso data on clones
        ...
      f5af19d1
    • L
      Merge tag 'md/3.20-fixes' of git://neil.brown.name/md · 0d695d6d
      Linus Torvalds 提交于
      Pull md bugfixes from Neil Brown:
       "Three bug md fixes for 3.20
      
        yet-another-livelock in raid5, and a problem with write errors to
        4K-block devices"
      
      * tag 'md/3.20-fixes' of git://neil.brown.name/md:
        md/raid5: Fix livelock when array is both resyncing and degraded.
        md/raid10: round up to bdev_logical_block_size in narrow_write_error.
        md/raid1: round up to bdev_logical_block_size in narrow_write_error
      0d695d6d
    • L
      Merge tag 'please-pull-fixmcelog' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras · d96c757e
      Linus Torvalds 提交于
      Pull mcelog regression fix from Tony Luck:
       "Fix regression - functions on the mce notifier chain should not be
        able to decide that an event should not be logged"
      
      * tag 'please-pull-fixmcelog' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
        x86/mce: Fix regression. All error records should report via /dev/mcelog
      d96c757e
    • L
      Merge tag 'docs-fix' of git://git.lwn.net/linux-2.6 · fbe4da49
      Linus Torvalds 提交于
      Pull DocBook build fix from Jonathan Corbet:
       "Fix the DocBook build failure caused by the move of the i2o subsystem
        to the staging tree"
      
      * tag 'docs-fix' of git://git.lwn.net/linux-2.6:
        Fix docs build failure caused by i2o removal
      fbe4da49
    • L
      Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux · 533cf7ae
      Linus Torvalds 提交于
      Pull nfsd bugfixes from Bruce Fields:
       "These are fixes for two bugs introduced during the merge window"
      
      * 'for-3.20' of git://linux-nfs.org/~bfields/linux:
        nfsd4: fix v3-less build
        nfsd: fix comparison in fh_fsid_match()
      533cf7ae
    • N
      md/raid5: Fix livelock when array is both resyncing and degraded. · 26ac1073
      NeilBrown 提交于
      Commit a7854487:
        md: When RAID5 is dirty, force reconstruct-write instead of read-modify-write.
      
      Causes an RCW cycle to be forced even when the array is degraded.
      A degraded array cannot support RCW as that requires reading all data
      blocks, and one may be missing.
      
      Forcing an RCW when it is not possible causes a live-lock and the code
      spins, repeatedly deciding to do something that cannot succeed.
      
      So change the condition to only force RCW on non-degraded arrays.
      Reported-by: NManibalan P <pmanibalan@amiindia.co.in>
      Bisected-by: NJes Sorensen <Jes.Sorensen@redhat.com>
      Tested-by: NJes Sorensen <Jes.Sorensen@redhat.com>
      Signed-off-by: NNeilBrown <neilb@suse.de>
      Fixes: a7854487
      Cc: stable@vger.kernel.org (v3.7+)
      26ac1073
    • L
      Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 03891159
      Linus Torvalds 提交于
      Pull lazytime mount option support from Al Viro:
       "Lazytime stuff from tytso"
      
      * 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        ext4: add optimization for the lazytime mount option
        vfs: add find_inode_nowait() function
        vfs: add support for a lazytime mount option
      03891159
    • L
      Merge branch 'iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 66dc830d
      Linus Torvalds 提交于
      Pull iov_iter updates from Al Viro:
       "More iov_iter work - missing counterpart of iov_iter_init() for
        bvec-backed ones and vfs_read_iter()/vfs_write_iter() - wrappers for
        sync calls of ->read_iter()/->write_iter()"
      
      * 'iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        fs: add vfs_iter_{read,write} helpers
        new helper: iov_iter_bvec()
      66dc830d
    • L
      Merge branch 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 05016b0f
      Linus Torvalds 提交于
      Pull getname/putname updates from Al Viro:
       "Rework of getname/getname_kernel/etc., mostly from Paul Moore.  Gets
        rid of quite a pile of kludges between namei and audit..."
      
      * 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        audit: replace getname()/putname() hacks with reference counters
        audit: fix filename matching in __audit_inode() and __audit_inode_child()
        audit: enable filename recording via getname_kernel()
        simpler calling conventions for filename_mountpoint()
        fs: create proper filename objects using getname_kernel()
        fs: rework getname_kernel to handle up to PATH_MAX sized filenames
        cut down the number of do_path_lookup() callers
      05016b0f
    • L
      Merge branch 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · c6b1de1b
      Linus Torvalds 提交于
      Pull debugfs patches from Al Viro:
       "debugfs patches, mostly to make it possible for something like tracefs
        to be transparently automounted on given directory in debugfs.
      
        New primitive in there is debugfs_create_automount(name, parent, func,
        arg), which creates a directory and makes its ->d_automount() return
        func(arg).  Another missing primitive was debugfs_create_file_size() -
        open-coded in quite a few places.  Dave's patch adds it and converts
        the open-code instances to calling it"
      
      * 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        debugfs: Provide a file creation function that also takes an initial size
        new primitive: debugfs_create_automount()
        debugfs: split end_creating() into success and failure cases
        debugfs: take mode-dependent parts of debugfs_get_inode() into callers
        fold debugfs_mknod() into callers
        fold debugfs_create() into caller
        fold debugfs_mkdir() into caller
        debugfs_mknod(): get rid useless arguments
        fold debugfs_link() into caller
        debugfs: kill __create_file()
        debugfs: split the beginning and the end of __create_file() off
        debugfs_{mkdir,create,link}(): get rid of redundant argument
      c6b1de1b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 50652963
      Linus Torvalds 提交于
      Pull misc VFS updates from Al Viro:
       "This cycle a lot of stuff sits on topical branches, so I'll be sending
        more or less one pull request per branch.
      
        This is the first pile; more to follow in a few.  In this one are
        several misc commits from early in the cycle (before I went for
        separate branches), plus the rework of mntput/dput ordering on umount,
        switching to use of fs_pin instead of convoluted games in
        namespace_unlock()"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        switch the IO-triggering parts of umount to fs_pin
        new fs_pin killing logics
        allow attaching fs_pin to a group not associated with some superblock
        get rid of the second argument of acct_kill()
        take count and rcu_head out of fs_pin
        dcache: let the dentry count go down to zero without taking d_lock
        pull bumping refcount into ->kill()
        kill pin_put()
        mode_t whack-a-mole: chelsio
        file->f_path.dentry is pinned down for as long as the file is open...
        get rid of lustre_dump_dentry()
        gut proc_register() a bit
        kill d_validate()
        ncpfs: get rid of d_validate() nonsense
        selinuxfs: don't open-code d_genocide()
      50652963
    • L
      Merge branch 'akpm' (patches from Andrew) · e2b74f23
      Linus Torvalds 提交于
      Merge yet more updates from Andrew Morton:
      
       - a pile of minor fs fixes and cleanups
      
       - kexec updates
      
       - random misc fixes in various places: vmcore, rbtree, eventfd, ipc, seccomp.
      
       - a series of python-based kgdb helper scripts
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (58 commits)
        seccomp: cap SECCOMP_RET_ERRNO data to MAX_ERRNO
        samples/seccomp: improve label helper
        ipc,sem: use current->state helpers
        scripts/gdb: disable pagination while printing from breakpoint handler
        scripts/gdb: define maintainer
        scripts/gdb: convert CpuList to generator function
        scripts/gdb: convert ModuleList to generator function
        scripts/gdb: use a generator instead of iterator for task list
        scripts/gdb: ignore byte-compiled python files
        scripts/gdb: port to python3 / gdb7.7
        scripts/gdb: add basic documentation
        scripts/gdb: add lx-lsmod command
        scripts/gdb: add class to iterate over CPU masks
        scripts/gdb: add lx_current convenience function
        scripts/gdb: add internal helper and convenience function for per-cpu lookup
        scripts/gdb: add get_gdbserver_type helper
        scripts/gdb: add internal helper and convenience function to retrieve thread_info
        scripts/gdb: add is_target_arch helper
        scripts/gdb: add helper and convenience function to look up tasks
        scripts/gdb: add task iteration class
        ...
      e2b74f23
    • K
      seccomp: cap SECCOMP_RET_ERRNO data to MAX_ERRNO · 580c57f1
      Kees Cook 提交于
      The value resulting from the SECCOMP_RET_DATA mask could exceed MAX_ERRNO
      when setting errno during a SECCOMP_RET_ERRNO filter action.  This makes
      sure we have a reliable value being set, so that an invalid errno will not
      be ignored by userspace.
      Signed-off-by: NKees Cook <keescook@chromium.org>
      Reported-by: NDmitry V. Levin <ldv@altlinux.org>
      Cc: Andy Lutomirski <luto@amacapital.net>
      Cc: Will Drewry <wad@chromium.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      580c57f1
    • K
      samples/seccomp: improve label helper · 3a9af0bd
      Kees Cook 提交于
      Fixes a potential corruption with uninitialized stack memory in the
      seccomp BPF sample program.
      
      [akpm@linux-foundation.org: coding-style fixlet]
      Signed-off-by: NKees Cook <keescook@chromium.org>
      Reported-by: NRobert Swiecki <swiecki@google.com>
      Tested-by: NRobert Swiecki <swiecki@google.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3a9af0bd
    • D
      ipc,sem: use current->state helpers · 52644c9a
      Davidlohr Bueso 提交于
      Call __set_current_state() instead of assigning the new state directly.
      These interfaces also aid CONFIG_DEBUG_ATOMIC_SLEEP environments, keeping
      track of who changed the state.
      Signed-off-by: NDavidlohr Bueso <dbueso@suse.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      52644c9a
    • J
      scripts/gdb: disable pagination while printing from breakpoint handler · a9c5bcfa
      Jan Kiszka 提交于
      While reporting the (refreshed) list of modules on automatic updates we
      may hit the page boundary of the output console and cause a stop if
      pagination is enabled.  However, gdb does not accept user input while
      running over the breakpoint handler.  So we get stuck, and the user is
      forced to interrupt gdb.
      
      Resolve this by disabling pagination during automatic symbol updates.  We
      restore the user's configuration once done.
      Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Jason Wessel <jason.wessel@windriver.com>
      Cc: Andi Kleen <andi@firstfloor.org>
      Cc: Ben Widawsky <ben@bwidawsk.net>
      Cc: Borislav Petkov <bp@suse.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a9c5bcfa
    • J
      scripts/gdb: define maintainer · 158daf16
      Jan Kiszka 提交于
      I'm proposing myself for keeping an eye on these scripts and integrating
      contributions.
      Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Jason Wessel <jason.wessel@windriver.com>
      Cc: Andi Kleen <andi@firstfloor.org>
      Cc: Ben Widawsky <ben@bwidawsk.net>
      Cc: Borislav Petkov <bp@suse.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      158daf16