1. 23 May, 2016 8 commits
  2. 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
  3. 21 May, 2016 30 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: Nicolas Chauvet's 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
    • Linus Torvalds's avatar
      Merge tag 'staging-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 2f37dd13
      Linus Torvalds authored
      Pull staging and IIO driver updates from Greg KH:
       "Here's the big staging and iio driver update for 4.7-rc1.
      
        I think we almost broke even with this release, only adding a few more
        lines than we removed, which isn't bad overall given that there's a
        bunch of new iio drivers added.
      
        The Lustre developers seem to have woken up from their sleep and have
        been doing a great job in cleaning up the code and pruning unused or
        old cruft, the filesystem is almost readable :)
      
        Other than that, just a lot of basic coding style cleanups in the
        churn.  All have been in linux-next for a while with no reported
        issues"
      
      * tag 'staging-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (938 commits)
        Staging: emxx_udc: emxx_udc: fixed coding style issue
        staging/gdm724x: fix "alignment should match open parenthesis" issues
        staging/gdm724x: Fix avoid CamelCase
        staging: unisys: rename misleading var ii with frag
        staging: unisys: visorhba: switch success handling to error handling
        staging: unisys: visorhba: main path needs to flow down the left margin
        staging: unisys: visorinput: handle_locking_key() simplifications
        staging: unisys: visorhba: fail gracefully for thread creation failures
        staging: unisys: visornic: comment restructuring and removing bad diction
        staging: unisys: fix format string %Lx to %llx for u64
        staging: unisys: remove unused struct members
        staging: unisys: visorchannel: correct variable misspelling
        staging: unisys: visorhba: replace functionlike macro with function
        staging: dgnc: Need to check for NULL of ch
        staging: dgnc: remove redundant condition check
        staging: dgnc: fix 'line over 80 characters'
        staging: dgnc: clean up the dgnc_get_modem_info()
        staging: lustre: lnet: enable configuration per NI interface
        staging: lustre: o2iblnd: properly set ibr_why
        staging: lustre: o2iblnd: remove last of kiblnd_tunables_fini
        ...
      2f37dd13
    • Linus Torvalds's avatar
      Merge tag 'driver-core-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 3aa2fc16
      Linus Torvalds authored
      Pull driver core updates from Greg KH:
       "Here's the "big" driver core update for 4.7-rc1.
      
        Mostly just debugfs changes, the long-known and messy races with
        removing debugfs files should be fixed thanks to the great work of
        Nicolai Stange.  We also have some isa updates in here (the x86
        maintainers told me to take it through this tree), a new warning when
        we run out of dynamic char major numbers, and a few other assorted
        changes, details in the shortlog.
      
        All have been in linux-next for some time with no reported issues"
      
      * tag 'driver-core-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (32 commits)
        Revert "base: dd: don't remove driver_data in -EPROBE_DEFER case"
        gpio: ws16c48: Utilize the ISA bus driver
        gpio: 104-idio-16: Utilize the ISA bus driver
        gpio: 104-idi-48: Utilize the ISA bus driver
        gpio: 104-dio-48e: Utilize the ISA bus driver
        watchdog: ebc-c384_wdt: Utilize the ISA bus driver
        iio: stx104: Utilize the module_isa_driver and max_num_isa_dev macros
        iio: stx104: Add X86 dependency to STX104 Kconfig option
        Documentation: Add ISA bus driver documentation
        isa: Implement the max_num_isa_dev macro
        isa: Implement the module_isa_driver macro
        pnp: pnpbios: Add explicit X86_32 dependency to PNPBIOS
        isa: Decouple X86_32 dependency from the ISA Kconfig option
        driver-core: use 'dev' argument in dev_dbg_ratelimited stub
        base: dd: don't remove driver_data in -EPROBE_DEFER case
        kernfs: Move faulting copy_user operations outside of the mutex
        devcoredump: add scatterlist support
        debugfs: unproxify files created through debugfs_create_u32_array()
        debugfs: unproxify files created through debugfs_create_blob()
        debugfs: unproxify files created through debugfs_create_bool()
        ...
      3aa2fc16
    • Linus Torvalds's avatar
      Merge tag 'char-misc-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 5af23440
      Linus Torvalds authored
      Pull char / misc driver updates from Greg KH:
       "Here's the big char and misc driver update for 4.7-rc1.
      
        Lots of different tiny driver subsystems have updates here with new
        drivers and functionality.  Details in the shortlog.
      
        All have been in linux-next with no reported issues for a while"
      
      * tag 'char-misc-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (125 commits)
        mcb: Delete num_cells variable which is not required
        mcb: Fixed bar number assignment for the gdd
        mcb: Replace ioremap and request_region with the devm version
        mcb: Implement bus->dev.release callback
        mcb: export bus information via sysfs
        mcb: Correctly initialize the bus's device
        mei: bus: call mei_cl_read_start under device lock
        coresight: etb10: adjust read pointer only when needed
        coresight: configuring ETF in FIFO mode when acting as link
        coresight: tmc: implementing TMC-ETF AUX space API
        coresight: moving struct cs_buffers to header file
        coresight: tmc: keep track of memory width
        coresight: tmc: make sysFS and Perf mode mutually exclusive
        coresight: tmc: dump system memory content only when needed
        coresight: tmc: adding mode of operation for link/sinks
        coresight: tmc: getting rid of multiple read access
        coresight: tmc: allocating memory when needed
        coresight: tmc: making prepare/unprepare functions generic
        coresight: tmc: splitting driver in ETB/ETF and ETR components
        coresight: tmc: cleaning up header file
        ...
      5af23440
    • Linus Torvalds's avatar
      Merge tag 'usb-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 19e36ad2
      Linus Torvalds authored
      Pull USB updates from Greg KH:
       "Here's the big pull request for USB and PHY drivers for 4.7-rc1
      
        Full details in the shortlog, but it's the normal major gadget driver
        updates, phy updates, new usbip code, as well as a bit of lots of
        other stuff.
      
        All have been in linux-next with no reported issues"
      
      * tag 'usb-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (164 commits)
        USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support
        USB: serial: fix minor-number allocation
        USB: serial: quatech2: fix use-after-free in probe error path
        USB: serial: mxuport: fix use-after-free in probe error path
        USB: serial: keyspan: fix debug and error messages
        USB: serial: keyspan: fix URB unlink
        USB: serial: keyspan: fix use-after-free in probe error path
        USB: serial: io_edgeport: fix memory leaks in probe error path
        USB: serial: io_edgeport: fix memory leaks in attach error path
        usb: Remove unnecessary space before operator ','.
        usb: Remove unnecessary space before open square bracket.
        USB: FHCI: avoid redundant condition
        usb: host: xhci-rcar: Avoid long wait in xhci_reset()
        usb/host/fotg210: remove dead code in create_sysfs_files
        usb: wusbcore: Do not initialise statics to 0.
        usb: wusbcore: Remove space before ',' and '(' .
        USB: serial: cp210x: clean up CRTSCTS flag code
        USB: serial: cp210x: get rid of magic numbers in CRTSCTS flag code
        USB: serial: cp210x: fix hardware flow-control disable
        USB: serial: option: add even more ZTE device ids
        ...
      19e36ad2
    • Linus Torvalds's avatar
      Merge tag 'tty-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · e10abc62
      Linus Torvalds authored
      Pull tty and serial driver updates from Greg KH:
       "Here's the large TTY and Serial driver update for 4.7-rc1.
      
        A few new serial drivers are added here, and Peter has fixed a bunch
        of long-standing bugs in the tty layer and serial drivers as normal.
        Full details in the shortlog.
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'tty-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (88 commits)
        MAINTAINERS: 8250: remove website reference
        serial: core: Fix port mutex assert if lockdep disabled
        serial: 8250_dw: fix wrong logic in dw8250_check_lcr()
        tty: vt, finish looping on duplicate
        tty: vt, return error when con_startup fails
        QE-UART: add "fsl,t1040-ucc-uart" to of_device_id
        serial: mctrl_gpio: Drop support for out1-gpios and out2-gpios
        serial: 8250dw: Add device HID for future AMD UART controller
        Fix OpenSSH pty regression on close
        serial: mctrl_gpio: add IRQ locking
        serial: 8250: Integrate Fintek into 8250_base
        serial: mps2-uart: add support for early console
        serial: mps2-uart: add MPS2 UART driver
        dt-bindings: document the MPS2 UART bindings
        serial: sirf: Use generic uart-has-rtscts DT property
        serial: sirf: Introduce helper variable struct device_node *np
        serial: mxs-auart: Use generic uart-has-rtscts DT property
        serial: imx: Use generic uart-has-rtscts DT property
        doc: DT: Add Generic Serial Device Tree Bindings
        serial: 8250: of: Make tegra_serial_handle_break() static
        ...
      e10abc62
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · 0eff4589
      Linus Torvalds authored
      Pull clk updates from Stephen Boyd:
       "It's the usual big pile of driver updates and additions, but we do
        have a couple core changes in here as well.
      
        Core:
      
         - CLK_IS_CRITICAL support has been added.  This should allow drivers
           to properly express that a certain clk should stay on even if their
           prepare/enable count drops to 0 (and in turn the parents of these
           clks should stay enabled).
      
         - A clk registration API has been added, clk_hw_register(), and an OF
           clk provider API has been added, of_clk_add_hw_provider().  These
           APIs have been put in place to further split clk providers from clk
           consumers, with the goal being to have clk providers never deal
           with struct clk pointers at all.  Conversion of provider drivers is
           on going.  clkdev has also gained support for registering clk_hw
           pointers directly so we can convert drivers that don't use
           devicetree.
      
        New Drivers:
      
         - Marvell ap806 and cp110 system controllers (with clks inside!)
         - Hisilicon Hi3519 clock and reset controller
         - Axis ARTPEC-6 clock controllers
         - Oxford Semiconductor OXNAS clock controllers
         - AXS10X I2S PLL
         - Rockchip RK3399 clock and reset controller
      
        Updates:
      
         - MMC2 and UART2 clks on Samsung Exynos 3250, ACLK on Samsung Exynos
           542x SoCs, and some more clk ID exporting for bus frequency scaling
         - Proper BCM2835 PCM clk support and various other clks
         - i.MX clk updates for i.MX6SX, i.MX7, and VF610
         - Renesas updates for R-Car H3
         - Tegra210 got updates for DisplayPort and HDMI 2.0
         - Rockchip driver refactorings and fixes due to adding RK3399 support"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (139 commits)
        clk: fix critical clock locking
        clk: qcom: mmcc-8996: Remove clocks that should be controlled by RPM
        clk: ingenic: Allow divider value to be divided
        clk: sunxi: Add display and TCON0 clocks driver
        clk: rockchip: drop old_rate calculation on pll rate changes
        clk: rockchip: simplify GRF handling in pll clocks
        clk: rockchip: lookup General Register Files in rockchip_clk_init
        clk: rockchip: fix the rk3399 sdmmc sample / drv name
        clk: mvebu: new driver for Armada CP110 system controller
        dt-bindings: arm: add DT binding for Marvell CP110 system controller
        clk: mvebu: new driver for Armada AP806 system controller
        clk: hisilicon: add CRG driver for hi3519 soc
        clk: hisilicon: export some hisilicon APIs to modules
        reset: hisilicon: add reset controller driver for hisilicon SOCs
        clk: bcm/kona: Do not use sizeof on pointer type
        clk: qcom: msm8916: Fix crypto clock flags
        clk: nxp: lpc18xx: Initialize clk_init_data::flags to 0
        clk/axs10x: Add I2S PLL clock driver
        clk: imx7d: fix ahb clock mux 1
        clk: fix comment of devm_clk_hw_register()
        ...
      0eff4589
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 087afe8a
      Linus Torvalds authored
      Pull networking fixes and more updates from David Miller:
      
       1) Tunneling fixes from Tom Herbert and Alexander Duyck.
      
       2) AF_UNIX updates some struct sock bit fields with the socket lock,
          whereas setsockopt() sets overlapping ones with locking.  Seperate
          out the synchronized vs.  the AF_UNIX unsynchronized ones to avoid
          corruption.  From Andrey Ryabinin.
      
       3) Mount BPF filesystem with mount_nodev rather than mount_ns, from
          Eric Biederman.
      
       4) A couple kmemdup conversions, from Muhammad Falak R Wani.
      
       5) BPF verifier fixes from Alexei Starovoitov.
      
       6) Don't let tunneled UDP packets get stuck in socket queues, if
          something goes wrong during the encapsulation just drop the packet
          rather than signalling an error up the call stack.  From Hannes
          Frederic Sowa.
      
       7) SKB ref after free in batman-adv, from Florian Westphal.
      
       8) TCP iSCSI, ocfs2, rds, and tipc have to disable BH in it's TCP
          callbacks since the TCP stack runs pre-emptibly now.  From Eric
          Dumazet.
      
       9) Fix crash in fixed_phy_add, from Rabin Vincent.
      
      10) Fix length checks in xen-netback, from Paul Durrant.
      
      11) Fix mixup in KEY vs KEYID macsec attributes, from Sabrina Dubroca.
      
      12) RDS connection spamming bug fixes from Sowmini Varadhan
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (152 commits)
        net: suppress warnings on dev_alloc_skb
        uapi glibc compat: fix compilation when !__USE_MISC in glibc
        udp: prevent skbs lingering in tunnel socket queues
        bpf: teach verifier to recognize imm += ptr pattern
        bpf: support decreasing order in direct packet access
        net: usb: ch9200: use kmemdup
        ps3_gelic: use kmemdup
        net:liquidio: use kmemdup
        bpf: Use mount_nodev not mount_ns to mount the bpf filesystem
        net: cdc_ncm: update datagram size after changing mtu
        tuntap: correctly wake up process during uninit
        intel: Add support for IPv6 IP-in-IP offload
        ip6_gre: Do not allow segmentation offloads GRE_CSUM is enabled with FOU/GUE
        RDS: TCP: Avoid rds connection churn from rogue SYNs
        RDS: TCP: rds_tcp_accept_worker() must exit gracefully when terminating rds-tcp
        net: sock: move ->sk_shutdown out of bitfields.
        ipv6: Don't reset inner headers in ip6_tnl_xmit
        ip4ip6: Support for GSO/GRO
        ip6ip6: Support for GSO/GRO
        ipv6: Set features for IPv6 tunnels
        ...
      087afe8a
    • Peter Zijlstra's avatar
      locking,qspinlock: Fix spin_is_locked() and spin_unlock_wait() · 54cf809b
      Peter Zijlstra authored
      Similar to commits:
      
        51d7d520 ("powerpc: Add smp_mb() to arch_spin_is_locked()")
        d86b8da0 ("arm64: spinlock: serialise spin_unlock_wait against concurrent lockers")
      
      qspinlock suffers from the fact that the _Q_LOCKED_VAL store is
      unordered inside the ACQUIRE of the lock.
      
      And while this is not a problem for the regular mutual exclusive
      critical section usage of spinlocks, it breaks creative locking like:
      
      	spin_lock(A)			spin_lock(B)
      	spin_unlock_wait(B)		if (!spin_is_locked(A))
      	do_something()			  do_something()
      
      In that both CPUs can end up running do_something at the same time,
      because our _Q_LOCKED_VAL store can drop past the spin_unlock_wait()
      spin_is_locked() loads (even on x86!!).
      
      To avoid making the normal case slower, add smp_mb()s to the less used
      spin_unlock_wait() / spin_is_locked() side of things to avoid this
      problem.
      Reported-and-tested-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
      Reported-by: default avatarGiovanni Gherdovich <ggherdovich@suse.com>
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: stable@vger.kernel.org   # v4.2 and later
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      54cf809b
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · b99a9e87
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "Two small cifs fixes, including one spnego upcall cifs security fix
        for stable"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        CIFS: Remove some obsolete comments
        cifs: Create dedicated keyring for spnego operations
      b99a9e87
    • Nitin Gupta's avatar
      sparc64: Reduce TLB flushes during hugepte changes · 24e49ee3
      Nitin Gupta authored
      During hugepage map/unmap, TSB and TLB flushes are currently
      issued at every PAGE_SIZE'd boundary which is unnecessary.
      We now issue the flush at REAL_HPAGE_SIZE boundaries only.
      
      Without this patch workloads which unmap a large hugepage
      backed VMA region get CPU lockups due to excessive TLB
      flush calls.
      
      Orabug: 22365539, 22643230, 22995196
      Signed-off-by: default avatarNitin Gupta <nitin.m.gupta@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      24e49ee3
    • Sam Ravnborg's avatar
      aeroflex/greth: fix warning about unused variable · b1ac6b7b
      Sam Ravnborg authored
      Fix following warning:
      aeroflex/greth.c:1326:11: warning: unused variable 'phy' [-Wunused-variable]
      
      The variable was unused - remove it.
      It looks like this warning has been there forever - was found by an
      allyesconfig build of sparc32.
      Signed-off-by: Sam Ravnborg's avatarSam Ravnborg <sam@ravnborg.org>
      Cc: Kristoffer Glembo <kristoffer@gaisler.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b1ac6b7b
    • Sam Ravnborg's avatar
      openprom: fix warning · 21916a4a
      Sam Ravnborg authored
      Fix following warnings:
      openprom.c:510:2: warning: 'tmp' may be used uninitialized in this function [-Wmaybe-uninitialized]
      openprom.c:503:3: warning: 'str' may be used uninitialized in this function [-Wmaybe-uninitialized]
      openprom.c:459:8: warning: 'str' may be used uninitialized in this function [-Wmaybe-uninitialized]
      openprom.c:422:7: warning: 'str' may be used uninitialized in this function [-Wmaybe-uninitialized]
      
      Fixed by introducing PTR_ERR etc.
      This simplified the code as a nice side effect.
      Signed-off-by: Sam Ravnborg's avatarSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      21916a4a
    • Huang Shijie's avatar
      samples/kprobes: print out the symbol name for the hooks · ea9b5013
      Huang Shijie authored
      Print out the symbol name for the hooks, it makes the logs more
      readable.
      
      Link: http://lkml.kernel.org/r/1463535417-29637-2-git-send-email-shijie.huang@arm.comSigned-off-by: default avatarHuang Shijie <shijie.huang@arm.com>
      Cc: Petr Mladek <pmladek@suse.com>
      Cc: Steve Capper <steve.capper@arm.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ea9b5013
    • Huang Shijie's avatar
      samples/kprobes: add a new module parameter · d04659ac
      Huang Shijie authored
      Add a new module parameter which can be used as the symbol name.
      
      Without this patch, we can only test the "_do_fork" function with this
      kernel module.  With this patch, the module becomes more flexible; we
      can test any functions with this module with
      
      	# insmod kprobe_example.ko symbol="xxx"
      
      Link: http://lkml.kernel.org/r/1463535417-29637-1-git-send-email-shijie.huang@arm.comSigned-off-by: default avatarHuang Shijie <shijie.huang@arm.com>
      Cc: Petr Mladek <pmladek@suse.com>
      Cc: Steve Capper <steve.capper@arm.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d04659ac
    • Huang Shijie's avatar
      kprobes: add the "tls" argument for j_do_fork · 603ac5df
      Huang Shijie authored
      Commit 3033f14a ("clone: support passing tls argument via C rather
      than pt_regs magic") added the tls argument for _do_fork().  This patch
      adds the "tls" argument for j_do_fork to make it match _do_fork().
      Signed-off-by: default avatarHuang Shijie <shijie.huang@arm.com>
      Acked-by: default avatarSteve Capper <steve.capper@arm.com>
      Reviewed-by: Josh Triplett's avatarJosh Triplett <josh@joshtriplett.org>
      Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      Cc: Andy Lutomirski <luto@kernel.org>
      Cc: Thiago Macieira <thiago.macieira@intel.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      603ac5df