1. 24 May, 2016 19 commits
  2. 23 May, 2016 4 commits
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 7639dad9
      Linus Torvalds authored
      Pull motr tracing updates from Steven Rostedt:
       "Three more changes.
      
         - I forgot that I had another selftest to stress test the ftrace
           instance creation.  It was actually suppose to go into the 4.6
           merge window, but I never committed it.  I almost forgot about it
           again, but noticed it was missing from your tree.
      
         - Soumya PN sent me a clean up patch to not disable interrupts when
           taking the tasklist_lock for read, as it's unnecessary because that
           lock is never taken for write in irq context.
      
         - Newer gcc's can cause the jump in the function_graph code to the
           global ftrace_stub label to be a short jump instead of a long one.
           As that jump is dynamically converted to jump to the trace code to
           do function graph tracing, and that conversion expects a long jump
           it can corrupt the ftrace_stub itself (it's directly after that
           call).  One way to prevent gcc from using a short jump is to
           declare the ftrace_stub as a weak function, which we do here to
           keep gcc from optimizing too much"
      
      * tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftrace/x86: Set ftrace_stub to weak to prevent gcc from using short jumps to it
        ftrace: Don't disable irqs when taking the tasklist_lock read_lock
        ftracetest: Add instance created, delete, read and enable event test
      7639dad9
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 77ed402b
      Linus Torvalds authored
      Pull m68knommu update from Greg Ungerer:
       "Only a single change to update my email address in the MAINTAINERS
        file"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68k: change m68knommu maintainer email address
      77ed402b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 21f9debf
      Linus Torvalds authored
      Pull sparc updates from David Miller:
       "Some 32-bit kgdb cleanups from Sam Ravnborg, and a hugepage TLB flush
        overhead fix on 64-bit from Nitin Gupta"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Reduce TLB flushes during hugepte changes
        aeroflex/greth: fix warning about unused variable
        openprom: fix warning
        sparc32: drop superfluous cast in calls to __nocache_pa()
        sparc32: fix build with STRICT_MM_TYPECHECKS
        sparc32: use proper prototype for trapbase
        sparc32: drop local prototype in kgdb_32
        sparc32: drop hardcoding trap_level in kgdb_trap
      21f9debf
    • Linus Torvalds's avatar
      x86: remove more uaccess_32.h complexity · bd28b145
      Linus Torvalds authored
      I'm looking at trying to possibly merge the 32-bit and 64-bit versions
      of the x86 uaccess.h implementation, but first this needs to be cleaned
      up.
      
      For example, the 32-bit version of "__copy_from_user_inatomic()" is
      mostly the special cases for the constant size, and it's actually almost
      never relevant.  Most users aren't actually using a constant size
      anyway, and the few cases that do small constant copies are better off
      just using __get_user() instead.
      
      So get rid of the unnecessary complexity.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bd28b145
  3. 22 May, 2016 2 commits
    • Linus Torvalds's avatar
      x86: remove pointless uaccess_32.h complexity · 5b09c3ed
      Linus Torvalds authored
      I'm looking at trying to possibly merge the 32-bit and 64-bit versions
      of the x86 uaccess.h implementation, but first this needs to be cleaned
      up.
      
      For example, the 32-bit version of "__copy_to_user_inatomic()" is mostly
      the special cases for the constant size, and it's actually never
      relevant.  Every user except for one aren't actually using a constant
      size anyway, and the one user that uses it is better off just using
      __put_user() instead.
      
      So get rid of the unnecessary complexity.
      
      [ The same cleanup should likely happen to __copy_from_user_inatomic()
        as well, but that one has a lot more users that I need to take a look
        at first ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5b09c3ed
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · f6c658df
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "In this round, as Ted pointed out, fscrypto allows one more key prefix
        given by filesystem to resolve backward compatibility issues.  Other
        than that, we've fixed several error handling cases by introducing
        a fault injection facility.  We've also achieved performance
        improvement in some workloads as well as a bunch of bug fixes.
      
        Summary:
      
        Enhancements:
         - fs-specific prefix for fscrypto
         - fault injection facility
         - expose validity bitmaps for user to be aware of fragmentation
         - fallocate/rm/preallocation speed up
         - use percpu counters
      
        Bug fixes:
         - some inline_dentry/inline_data bugs
         - error handling for atomic/volatile/orphan inodes
         - recover broken superblock"
      
      * tag 'for-f2fs-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (73 commits)
        f2fs: fix to update dirty page count correctly
        f2fs: flush pending bios right away when error occurs
        f2fs: avoid ENOSPC fault in the recovery process
        f2fs: make exit_f2fs_fs more clear
        f2fs: use percpu_counter for total_valid_inode_count
        f2fs: use percpu_counter for alloc_valid_block_count
        f2fs: use percpu_counter for # of dirty pages in inode
        f2fs: use percpu_counter for page counters
        f2fs: use bio count instead of F2FS_WRITEBACK page count
        f2fs: manipulate dirty file inodes when DATA_FLUSH is set
        f2fs: add fault injection to sysfs
        f2fs: no need inc dirty pages under inode lock
        f2fs: fix incorrect error path handling in f2fs_move_rehashed_dirents
        f2fs: fix i_current_depth during inline dentry conversion
        f2fs: correct return value type of f2fs_fill_super
        f2fs: fix deadlock when flush inline data
        f2fs: avoid f2fs_bug_on during recovery
        f2fs: show # of orphan inodes
        f2fs: support in batch fzero in dnode page
        f2fs: support in batch multi blocks preallocation
        ...
      f6c658df
  4. 21 May, 2016 15 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 07be1337
      Linus Torvalds authored
      Pull btrfs updates from Chris Mason:
       "This has our merge window series of cleanups and fixes.  These target
        a wide range of issues, but do include some important fixes for
        qgroups, O_DIRECT, and fsync handling.  Jeff Mahoney moved around a
        few definitions to make them easier for userland to consume.
      
        Also whiteout support is included now that issues with overlayfs have
        been cleared up.
      
        I have one more fix pending for page faults during btrfs_copy_from_user,
        but I wanted to get this bulk out the door first"
      
      * 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (90 commits)
        btrfs: fix memory leak during RAID 5/6 device replacement
        Btrfs: add semaphore to synchronize direct IO writes with fsync
        Btrfs: fix race between block group relocation and nocow writes
        Btrfs: fix race between fsync and direct IO writes for prealloc extents
        Btrfs: fix number of transaction units for renames with whiteout
        Btrfs: pin logs earlier when doing a rename exchange operation
        Btrfs: unpin logs if rename exchange operation fails
        Btrfs: fix inode leak on failure to setup whiteout inode in rename
        btrfs: add support for RENAME_EXCHANGE and RENAME_WHITEOUT
        Btrfs: pin log earlier when renaming
        Btrfs: unpin log if rename operation fails
        Btrfs: don't do unnecessary delalloc flushes when relocating
        Btrfs: don't wait for unrelated IO to finish before relocation
        Btrfs: fix empty symlink after creating symlink and fsync parent dir
        Btrfs: fix for incorrect directory entries after fsync log replay
        btrfs: build fixup for qgroup_account_snapshot
        btrfs: qgroup: Fix qgroup accounting when creating snapshot
        Btrfs: fix fspath error deallocation
        btrfs: make find_workspace warn if there are no workspaces
        btrfs: make find_workspace always succeed
        ...
      07be1337
    • Linus Torvalds's avatar
      Merge tag 'rtc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 63d222b9
      Linus Torvalds authored
      Pull RTC updates from Alexandre Belloni:
       "Subsystem wide cleanups:
         - Use IS_ENABLED() instead of checking for built-in or module
         - remove useless DRV_VERSION
         - remove CLK_IS_ROOT
         - remove UIE signaling
      
        Drivers:
         - ds1302: rewritten to be a proper SPI device driver
         - m41t80: huge cleanup, alarm, wakelarm ans oscialltor failure
           detection support
         - rv3029: switch to regmap to handle rv3049, alarm support, fixes
         - zynqmp: enable switching to battery power, fixes
         - small fixes for at91sam9, da9053, ds1307, ds1685, ds3232, r2025,
           sa1100, snvs, stmp3xxx, tps6586x"
      
      * tag 'rtc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (40 commits)
        rtc: tps6586x: rename so module can be autoloaded
        rtc: rv3029: hide unused i2c device table
        rtc: rs5c372: r2025: fix check for 'oscillator halted' condition
        rtc: rv3029: add alarm IRQ
        rtc: rv3029: fix set_time function
        rtc: rv3029: fix alarm support
        rtc: rv3029: Remove some checks and warnings
        rtc: rv3029: Add support of RV3049
        rtc: rv3029: convert to use regmap
        rtc: rv3029: remove 'i2c' in functions names
        rtc: stmp3xxx: print message on error
        rtc: Use IS_ENABLED() instead of checking for built-in or module
        rtc: ds3232: fix call trace when rtc->ops_lock is used as NULL
        rtc: snvs: return error in case enable_irq_wake fails
        rtc: zynqmp: Update seconds time programming logic
        rtc: sa1100: DT spelling s/interrupt-name/interrupt-names/
        rtc: mc13xxx: remove UIE signaling
        rtc: mxc: remove UIE signaling
        rtc: ds1307: Remove CLK_IS_ROOT
        rtc: hym8563: Remove CLK_IS_ROOT
        ...
      63d222b9
    • Linus Torvalds's avatar
      Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 10cd7158
      Linus Torvalds authored
      Pull mailbox updates from Jassi Brar:
       "OMAP:
         - Remove non-DT support from mailbox driver
         - Move PM from client calls to native driver suspend/resume
         - Trivial cleanups to make checkpatch happy
      
        STI:
         - Check return from devm_ioremap_resource as ERR_PTR, not NULL"
      
      * 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox: Fix devm_ioremap_resource error detection code
        mailbox/omap: kill omap_mbox_{save/restore}_ctx() functions
        mailbox/omap: check for any unread messages during suspend
        mailbox/omap: add support for suspend/resume
        mailbox/omap: store mailbox interrupt type in omap_mbox_device
        mailbox/omap: add blank lines after declarations
        mailbox/omap: remove FSF mailing address paragraph
        mailbox/omap: use variable name for sizeof() operator
        mailbox/omap: drop legacy platform device support
      10cd7158
    • Linus Torvalds's avatar
      x86 isa: add back X86_32 dependency on CONFIG_ISA · 51e68d05
      Linus Torvalds authored
      Commit b3c1be1b ("base: isa: Remove X86_32 dependency") made ISA
      support available on x86-64 too.  That's not right - while there are
      some LPC-style devices that might be useful still and be based on
      ISA-like IP blocks, that is *not* an excuse to try to enable any random
      legacy drivers.
      
      Such drivers should be individually enabled and made to perhaps depend
      on ISA_DMA_API instead (which we have continued to support on x86-64).
      Or we could add another "ISA_XYZ_API" that we support that doesn't
      enable random old drivers that aren't even 64-bit clean nor do we have
      any test coverage for.
      
      Turning off ISA will now also turn off some drivers that have been
      marked as depending on it as part of this series, and that used to work
      on modern platforms.
      
      See for example commits ad7afc38..cc736607, which may also need
      to be reverted.
      
      This commit means that the warnings that came in due to enabling ISA
      widely are now gone again.
      Acked-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Guenter Roeck <linux@roeck-us.net>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      51e68d05
    • Nicolas Chauvet's avatar
      rtc: tps6586x: rename so module can be autoloaded · b9ba1eb0
      Nicolas Chauvet authored
      This module is loaded by the related mfd driver which has
      the needed MODULE_DEVICE_TABLE(i2c,...).
      
      This patch fix the modalias when the rtc driver is built
      as a module, so the right name is used.
      Everything operates correctly when this module is builtin.
      
      Fixes: esdc59ed38 ("rtc: add RTC driver for TPS6586x")
      Signed-off-by: default avatarNicolas Chauvet <kwizart@gmail.com>
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      b9ba1eb0
    • Arnd Bergmann's avatar
      rtc: rv3029: hide unused i2c device table · 814db2bc
      Arnd Bergmann authored
      The added support for SPI mode made it possible to configure the driver
      when I2C is disabled, leaving an unused device table:
      
      drivers/rtc/rtc-rv3029c2.c:794:29: error: 'rv3029_id' defined but not used [-Werror=unused-variable]
      
      This moves the table inside of the #ifdef section that has the
      only user, to avoid the harmless warning.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Fixes: d08f50dd0afc ("rtc: rv3029: Add support of RV3049")
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      814db2bc
    • Thomas Koeller's avatar
      rtc: rs5c372: r2025: fix check for 'oscillator halted' condition · a9dbe558
      Thomas Koeller authored
      The R2025SD chip, according to its data sheet, sets the /XST
      bit to zero if the oscillator stops. Hence the check for this
      condition was wrong.
      Signed-off-by: default avatarThomas Koeller <thomas.koeller@baslerweb.com>
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      a9dbe558
    • Mylène Josserand's avatar
      rtc: rv3029: add alarm IRQ · 0ddc5b89
      Mylène Josserand authored
      Add the alarm IRQ functionality.
      Signed-off-by: default avatarMylène Josserand <mylene.josserand@free-electrons.com>
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      0ddc5b89
    • Mylène Josserand's avatar
      rtc: rv3029: fix set_time function · 38201ca3
      Mylène Josserand authored
      The bin2bcd function in set_time is uncorrect on weekdays as the
      bit mask should be done at the end of arithmetic operations.
      Signed-off-by: default avatarMylène Josserand <mylene.josserand@free-electrons.com>
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      38201ca3
    • Mylène Josserand's avatar
      rtc: rv3029: fix alarm support · dc492e86
      Mylène Josserand authored
      The RTC RV3029 handles different types of alarms : seconds, minutes, ...
      These alarms can be enabled or disabled individually using an AE_x bit
      which is the last bit (BIT(7)) on each alarm registers.
      
      To prepare the alarm IRQ support, the current code enables all the alarm
      types by setting each AE_x to 1.
      It also fixes others alarms issues :
         - month and weekday errors : it was performing -1 instead of +1.
         - wrong use of bit mask with bin2bcd
      Signed-off-by: default avatarMylène Josserand <mylene.josserand@free-electrons.com>
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      dc492e86
    • Mylène Josserand's avatar
      rtc: rv3029: Remove some checks and warnings · abe2f551
      Mylène Josserand authored
      Remove some checks from checkpatch such as spaces around arithmetic
      operations or prefer "unsigned int".
      Signed-off-by: default avatarMylène Josserand <mylene.josserand@free-electrons.com>
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      abe2f551
    • Mylène Josserand's avatar
      rtc: rv3029: Add support of RV3049 · c2a1c145
      Mylène Josserand authored
      Add support of Microcrystal RV3049 RTC (SPI) using regmap on the
      RV3029 (I2C) driver.
      Signed-off-by: default avatarMylène Josserand <mylene.josserand@free-electrons.com>
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      c2a1c145
    • Mylène Josserand's avatar
      rtc: rv3029: convert to use regmap · e6e38082
      Mylène Josserand authored
      To add support of rv3049, the current driver is converted to use regmap.
      Signed-off-by: default avatarMylène Josserand <mylene.josserand@free-electrons.com>
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      e6e38082
    • Mylène Josserand's avatar
      rtc: rv3029: remove 'i2c' in functions names · 4e7f1a60
      Mylène Josserand authored
      To prepare the use of regmap to add the support of RV-3049, all the
      'i2c' in functions's names are removed.
      Signed-off-by: default avatarMylène Josserand <mylene.josserand@free-electrons.com>
      Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
      4e7f1a60
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 5469dc27
      Linus Torvalds authored
      Merge more updates from Andrew Morton:
      
       - the rest of MM
      
       - KASAN updates
      
       - procfs updates
      
       - exit, fork updates
      
       - printk updates
      
       - lib/ updates
      
       - radix-tree testsuite updates
      
       - checkpatch updates
      
       - kprobes updates
      
       - a few other misc bits
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (162 commits)
        samples/kprobes: print out the symbol name for the hooks
        samples/kprobes: add a new module parameter
        kprobes: add the "tls" argument for j_do_fork
        init/main.c: simplify initcall_blacklisted()
        fs/efs/super.c: fix return value
        checkpatch: improve --git <commit-count> shortcut
        checkpatch: reduce number of `git log` calls with --git
        checkpatch: add support to check already applied git commits
        checkpatch: add --list-types to show message types to show or ignore
        checkpatch: advertise the --fix and --fix-inplace options more
        checkpatch: whine about ACCESS_ONCE
        checkpatch: add test for keywords not starting on tabstops
        checkpatch: improve CONSTANT_COMPARISON test for structure members
        checkpatch: add PREFER_IS_ENABLED test
        lib/GCD.c: use binary GCD algorithm instead of Euclidean
        radix-tree: free up the bottom bit of exceptional entries for reuse
        dax: move RADIX_DAX_ definitions to dax.c
        radix-tree: make radix_tree_descend() more useful
        radix-tree: introduce radix_tree_replace_clear_tags()
        radix-tree: tidy up __radix_tree_create()
        ...
      5469dc27