1. 02 Mar, 2017 4 commits
    • Linus Torvalds's avatar
      Merge tag 'watchdog-for-linus-v4.11-2' of... · 4f1f2b8f
      Linus Torvalds authored
      Merge tag 'watchdog-for-linus-v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull more watchdog updates from Guenter Roeck:
      
       - fix fallout from enabling COMPILE_TEST
      
       - fix gcc-4.3 build of kempld watchdog driver
      
       - use hrtimer in softdog
      
      * tag 'watchdog-for-linus-v4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        watchdog: retu: restore MFD dependency
        watchdog: db8500: add back prmcu dependency
        watchdog: kempld: fix gcc-4.3 build
        watchdog: softdog: fire watchdog even if softirqs do not get to run
        watchdog: kempld: revert to full dependency
        watchdog: bcm2835: add CONFIG_OF dependency
        watchdog: sp805: add back AMBA dependency
        watchdog: menf21bmc: add I2C dependency
        watchdog: geode: restore hard CS5535_MFGPT dependency
        watchdog: wm831x watchdog really needs mfd
      4f1f2b8f
    • Linus Torvalds's avatar
      give up on gcc ilog2() constant optimizations · 474c9015
      Linus Torvalds authored
      gcc-7 has an "optimization" pass that completely screws up, and
      generates the code expansion for the (impossible) case of calling
      ilog2() with a zero constant, even when the code gcc compiles does not
      actually have a zero constant.
      
      And we try to generate a compile-time error for anybody doing ilog2() on
      a constant where that doesn't make sense (be it zero or negative).  So
      now gcc7 will fail the build due to our sanity checking, because it
      created that constant-zero case that didn't actually exist in the source
      code.
      
      There's a whole long discussion on the kernel mailing about how to work
      around this gcc bug.  The gcc people themselevs have discussed their
      "feature" in
      
         https://gcc.gnu.org/bugzilla/show_bug.cgi?id=72785
      
      but it's all water under the bridge, because while it looked at one
      point like it would be solved by the time gcc7 was released, that was
      not to be.
      
      So now we have to deal with this compiler braindamage.
      
      And the only simple approach seems to be to just delete the code that
      tries to warn about bad uses of ilog2().
      
      So now "ilog2()" will just return 0 not just for the value 1, but for
      any non-positive value too.
      
      It's not like I can recall anybody having ever actually tried to use
      this function on any invalid value, but maybe the sanity check just
      meant that such code never made it out in public.
      Reported-by: default avatarLaura Abbott <labbott@redhat.com>
      Cc: John Stultz <john.stultz@linaro.org>,
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      474c9015
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4977ab6e
      Linus Torvalds authored
      Pull objtool relocation fixes from Ingo Molnar:
       "Two fixes related to the module loading regression introduced by the
        recent objtool changes"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        objtool, modules: Discard objtool annotation sections for modules
        objtool, compiler.h: Fix __unreachable section relocation size
      4977ab6e
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.11-1' of git://git.linux-nfs.org/projects/anna/linux-nfs · 8f03cf50
      Linus Torvalds authored
      Pull NFS client updates from Anna Schumaker:
       "Highlights include:
      
        Stable bugfixes:
         - NFSv4: Fix memory and state leak in _nfs4_open_and_get_state
         - xprtrdma: Fix Read chunk padding
         - xprtrdma: Per-connection pad optimization
         - xprtrdma: Disable pad optimization by default
         - xprtrdma: Reduce required number of send SGEs
         - nlm: Ensure callback code also checks that the files match
         - pNFS/flexfiles: If the layout is invalid, it must be updated before
           retrying
         - NFSv4: Fix reboot recovery in copy offload
         - Revert "NFSv4.1: Handle NFS4ERR_BADSESSION/NFS4ERR_DEADSESSION
           replies to OP_SEQUENCE"
         - NFSv4: fix getacl head length estimation
         - NFSv4: fix getacl ERANGE for sum ACL buffer sizes
      
        Features:
         - Add and use dprintk_cont macros
         - Various cleanups to NFS v4.x to reduce code duplication and
           complexity
         - Remove unused cr_magic related code
         - Improvements to sunrpc "read from buffer" code
         - Clean up sunrpc timeout code and allow changing TCP timeout
           parameters
         - Remove duplicate mw_list management code in xprtrdma
         - Add generic functions for encoding and decoding xdr streams
      
        Bugfixes:
         - Clean up nfs_show_mountd_netid
         - Make layoutreturn_ops static and use NULL instead of 0 to fix
           sparse warnings
         - Properly handle -ERESTARTSYS in nfs_rename()
         - Check if register_shrinker() failed during rpcauth_init()
         - Properly clean up procfs/pipefs entries
         - Various NFS over RDMA related fixes
         - Silence unititialized variable warning in sunrpc"
      
      * tag 'nfs-for-4.11-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (64 commits)
        NFSv4: fix getacl ERANGE for some ACL buffer sizes
        NFSv4: fix getacl head length estimation
        Revert "NFSv4.1: Handle NFS4ERR_BADSESSION/NFS4ERR_DEADSESSION replies to OP_SEQUENCE"
        NFSv4: Fix reboot recovery in copy offload
        pNFS/flexfiles: If the layout is invalid, it must be updated before retrying
        NFSv4: Clean up owner/group attribute decode
        SUNRPC: Add a helper function xdr_stream_decode_string_dup()
        NFSv4: Remove bogus "struct nfs_client" argument from decode_ace()
        NFSv4: Fix the underestimation of delegation XDR space reservation
        NFSv4: Replace callback string decode function with a generic
        NFSv4: Replace the open coded decode_opaque_inline() with the new generic
        NFSv4: Replace ad-hoc xdr encode/decode helpers with xdr_stream_* generics
        SUNRPC: Add generic helpers for xdr_stream encode/decode
        sunrpc: silence uninitialized variable warning
        nlm: Ensure callback code also checks that the files match
        sunrpc: Allow xprt->ops->timer method to sleep
        xprtrdma: Refactor management of mw_list field
        xprtrdma: Handle stale connection rejection
        xprtrdma: Properly recover FRWRs with in-flight FASTREG WRs
        xprtrdma: Shrink send SGEs array
        ...
      8f03cf50
  2. 01 Mar, 2017 24 commits
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · 25c4e6c3
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "This round introduces several interesting features such as on-disk NAT
        bitmaps, IO alignment, and a discard thread. And it includes a couple
        of major bug fixes as below.
      
        Enhancements:
      
         - introduce on-disk bitmaps to avoid scanning NAT blocks when getting
           free nids
      
         - support IO alignment to prepare open-channel SSD integration in
           future
      
         - introduce a discard thread to avoid long latency during checkpoint
           and fstrim
      
         - use SSR for warm node and enable inline_xattr by default
      
         - introduce in-memory bitmaps to check FS consistency for debugging
      
         - improve write_begin by avoiding needless read IO
      
        Bug fixes:
      
         - fix broken zone_reset behavior for SMR drive
      
         - fix wrong victim selection policy during GC
      
         - fix missing behavior when preparing discard commands
      
         - fix bugs in atomic write support and fiemap
      
         - workaround to handle multiple f2fs_add_link calls having same name
      
        ... and it includes a bunch of clean-up patches as well"
      
      * tag 'for-f2fs-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (97 commits)
        f2fs: avoid to flush nat journal entries
        f2fs: avoid to issue redundant discard commands
        f2fs: fix a plint compile warning
        f2fs: add f2fs_drop_inode tracepoint
        f2fs: Fix zoned block device support
        f2fs: remove redundant set_page_dirty()
        f2fs: fix to enlarge size of write_io_dummy mempool
        f2fs: fix memory leak of write_io_dummy mempool during umount
        f2fs: fix to update F2FS_{CP_}WB_DATA count correctly
        f2fs: use MAX_FREE_NIDS for the free nids target
        f2fs: introduce free nid bitmap
        f2fs: new helper cur_cp_crc() getting crc in f2fs_checkpoint
        f2fs: update the comment of default nr_pages to skipping
        f2fs: drop the duplicate pval in f2fs_getxattr
        f2fs: Don't update the xattr data that same as the exist
        f2fs: kill __is_extent_same
        f2fs: avoid bggc->fggc when enough free segments are avaliable after cp
        f2fs: select target segment with closer temperature in SSR mode
        f2fs: show simple call stack in fault injection message
        f2fs: no need lock_op in f2fs_write_inline_data
        ...
      25c4e6c3
    • Josh Poimboeuf's avatar
      objtool, modules: Discard objtool annotation sections for modules · e390f9a9
      Josh Poimboeuf authored
      The '__unreachable' and '__func_stack_frame_non_standard' sections are
      only used at compile time.  They're discarded for vmlinux but they
      should also be discarded for modules.
      
      Since this is a recurring pattern, prefix the section names with
      ".discard.".  It's a nice convention and vmlinux.lds.h already discards
      such sections.
      
      Also remove the 'a' (allocatable) flag from the __unreachable section
      since it doesn't make sense for a discarded section.
      Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
      Cc: Jessica Yu <jeyu@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Fixes: d1091c7f ("objtool: Improve detection of BUG() and other dead ends")
      Link: http://lkml.kernel.org/r/20170301180444.lhd53c5tibc4ns77@trebleSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      e390f9a9
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 6053dc98
      Linus Torvalds authored
      Pull arm64 fixes from Will Deacon:
       "The main fix here addresses a kernel panic triggered on Qualcomm
        QDF2400 due to incorrect register usage in an erratum workaround
        introduced during the merge window.
      
        Summary:
      
         - Fix kernel panic on specific Qualcomm platform due to broken
           erratum workaround
      
         - Revert contiguous bit support due to TLB conflict aborts in
           simulation
      
         - Don't treat all CPU ID register fields as 4-bit quantities"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64/cpufeature: check correct field width when updating sys_val
        Revert "arm64: mm: set the contiguous bit for kernel mappings where appropriate"
        arm64: Avoid clobbering mm in erratum workaround on QDF2400
      6053dc98
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · b286cedd
      Linus Torvalds authored
      Pull more powerpc updates from Michael Ellerman:
       "Highlights include:
      
         - an update of the disassembly code used by xmon to the latest
           versions in binutils. We've received permission from all the
           authors of the relevant binutils changes to relicense their changes
           to the relevant files from GPLv3 to GPLv2, for inclusion in Linux.
           Thanks to Peter Bergner for doing the leg work to get permission
           from everyone.
      
         - addition of the "architected" Power9 CPU table entry, allowing us
           to boot in Power9 architected mode under a hypervisor.
      
         - updates to the Power9 PMU code.
      
         - implementation of clear_bit_unlock_is_negative_byte() to optimise
           unlock_page().
      
         - Freescale updates from Scott: "Highlights include 8xx breakpoints
           and perf, t1042rdb display support, and board updates."
      
        Thanks to:
          Al Viro, Andrew Donnellan, Aneesh Kumar K.V, Balbir Singh, Douglas
          Miller, Frédéric Weisbecker, Gavin Shan, Madhavan Srinivasan,
          Michael Roth, Nathan Fontenot, Naveen N. Rao, Nicholas Piggin, Peter
          Bergner, Paul E. McKenney, Rashmica Gupta, Russell Currey, Sahil
          Mehta, Stewart Smith"
      
      * tag 'powerpc-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (48 commits)
        powerpc: Remove leftover cputime_to_nsecs call causing build error
        powerpc/mm/hash: Always clear UPRT and Host Radix bits when setting up CPU
        powerpc/optprobes: Fix TOC handling in optprobes trampoline
        powerpc/pseries: Advertise Hot Plug Event support to firmware
        cxl: fix nested locking hang during EEH hotplug
        powerpc/xmon: Dump memory in CPU endian format
        powerpc/pseries: Revert 'Auto-online hotplugged memory'
        powerpc/powernv: Make PCI non-optional
        powerpc/64: Implement clear_bit_unlock_is_negative_byte()
        powerpc/powernv: Remove unused variable in pnv_pci_sriov_disable()
        powerpc/kernel: Remove error message in pcibios_setup_phb_resources()
        powerpc/mm: Fix typo in set_pte_at()
        pci/hotplug/pnv-php: Disable MSI and PCI device properly
        pci/hotplug/pnv-php: Disable surprise hotplug capability on conflicts
        pci/hotplug/pnv-php: Remove WARN_ON() in pnv_php_put_slot()
        powerpc: Add POWER9 architected mode to cputable
        powerpc/perf: use is_kernel_addr macro in perf_get_misc_flags()
        powerpc/perf: Avoid FAB_*_MATCH checks for power9
        powerpc/perf: Add restrictions to PMC5 in power9 DD1
        powerpc/perf: Use Instruction Counter value
        ...
      b286cedd
    • Benjamin Tissoires's avatar
      Input: rmi4 - f30: detect INPUT_PROP_BUTTONPAD from the button count · 522214d9
      Benjamin Tissoires authored
      INPUT_PROP_BUTTONPAD is currently only set through the platform data.
      The RMI4 header doc says that this property is there to force the
      buttonpad property, so we also need to detect it by looking at
      the exported buttons count.
      Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
      Reported-and-tested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      522214d9
    • Linus Torvalds's avatar
      Merge tag 'sound-fix-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 044d5dfd
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "A few last-minute fixes for rc1:
      
         - ALSA core timer and sequencer fixes for bugs spotted by syzkaller
      
         - a couple of trivial HD-audio fixups
      
         - additional PCI / codec IDs for Intel Geminilake
      
         - fixes for CT-XFi DMA mask bugs"
      
      * tag 'sound-fix-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: seq: Fix link corruption by event error handling
        ALSA: hda - Add subwoofer support for Dell Inspiron 17 7000 Gaming
        ALSA: ctxfi: Fallback DMA mask to 32bit
        ALSA: timer: Reject user params with too small ticks
        ALSA: hda: Add Geminilake HDMI codec ID
        ALSA: hda - Fix micmute hotkey problem for a lenovo AIO machine
        ALSA: hda - Add Geminilake PCI ID
      044d5dfd
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 544a068f
      Linus Torvalds authored
      Pull thermal management updates from Zhang Rui:
      
       - add thermal driver for R-Car Gen3 thermal sensors.
      
       - add thermal driver for ZTE' zx2967 family thermal sensors.
      
       - convert thermal ID allocation from IDR to IDA.
      
       - fix a possible NULL dereference in imx thermal driver.
      
       - fix a ti-soc-thermal driver dependency issue so that critical thermal
         control is still available when CPU_THERMAL is not defined.
      
       - update binding information for QorIQ thermal driver.
      
       - a couple of cleanups in thermal core, intel_powerclamp, exynos,
         dra752-thermal, mtk-thermal driver.
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        powerpc/mpc85xx: Update TMU device tree node for T1023/T1024
        powerpc/mpc85xx: Update TMU device tree node for T1040/T1042
        dt-bindings: Update QorIQ TMU thermal bindings
        thermal: mtk_thermal: Staticise a number of data variables
        thermal: arm: dra752: Remove all TSHUT related definitions
        thermal: arm: dra752: Remove TSHUT configuration
        thermal: ti-soc-thermal: Remove CPU_THERMAL Dependency from TI_THERMAL
        thermal: imx: Fix possible NULL dereference.
        thermal: exynos: Remove parsing unused samsung,tmu_cal_mode property
        thermal: zx2967: add thermal driver for ZTE's zx2967 family
        thermal: use cpumask_var_t for on-stack cpu masks
        dt: bindings: add documentation for zx2967 family thermal sensor
        thermal/intel_powerclamp: Remove set-but-not-used variables
        thermal: rcar_gen3_thermal: Add R-Car Gen3 thermal driver
        thermal: rcar_gen3_thermal: Document the R-Car Gen3
        thermal: convert devfreq_cooling to use an IDA
        thermal: convert cpu_cooling to use an IDA
        thermal: convert clock cooling to use an IDA
        thermal core: convert ID allocation to IDA
      544a068f
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-4.11-rc1' of... · 545b2820
      Linus Torvalds authored
      Merge tag 'pwm/for-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "This set contains mostly fixes to existing drivers as well as cleanup
        of code that's not been in active use for a while"
      
      * tag 'pwm/for-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (27 commits)
        acpi: lpss: call pwm_add_table() for BSW PWM device
        pwm: Try to load modules during pwm_get()
        pwm: Don't hold pwm_lookup_lock longer than necessary
        pwm: Make the PWM_POLARITY flag in DTB optional
        pwm: Print error messages with pr_err() instead of pr_debug()
        pwm: imx: Add polarity inversion support to i.MX's PWMv2
        pwm: imx: doc: Update imx-pwm.txt documentation entry
        pwm: imx: Remove redundant i.MX PWMv2 code
        pwm: imx: Provide atomic PWM support for i.MX PWMv2
        pwm: imx: Move PWMv2 wait for fifo slot code to a separate function
        pwm: imx: Move PWMv2 software reset code to a separate function
        pwm: imx: Rewrite v1 code to facilitate switch to atomic PWM
        pwm: imx: Add separate set of PWM ops for v1 and v2
        pwm: imx: Remove ipg clock and enable per clock when required
        pwm: lpss: Add Intel Gemini Lake PCI ID
        pwm: lpss: Do not export board infos for different PWM types
        pwm: lpss: Avoid reconfiguring while UPDATE bit is still enabled
        pwm: lpss: Switch to new atomic API
        pwm: lpss: Allow duty cycle to be 0
        pwm: lpss: Avoid potential overflow of base_unit
        ...
      545b2820
    • Linus Torvalds's avatar
      Merge tag 'drm-ast-2500-for-v4.11' of git://people.freedesktop.org/~airlied/linux · 3437f9f0
      Linus Torvalds authored
      Pull drm AST2500 support from Dave Airlie:
       "This is a set of changes to enable the AST2500 BMC hardware, and also
        fix some bugs interacting with the older AST hardware.
      
        Some of the bug fixes are cc'ed to stable"
      
      * tag 'drm-ast-2500-for-v4.11' of git://people.freedesktop.org/~airlied/linux:
        drm/ast: Call open_key before enable_mmio in POST code
        drm/ast: Fix test for VGA enabled
        drm/ast: POST code for the new AST2500
        drm/ast: Rename ast_init_dram_2300 to ast_post_chip_2300
        drm/ast: Factor mmc_test code in POST code
        drm/ast: Fixed vram size incorrect issue on POWER
        drm/ast: Base support for AST2500
        drm/ast: Fix calculation of MCLK
        drm/ast: Remove spurious include
        drm/ast: const'ify mode setting tables
        drm/ast: Handle configuration without P2A bridge
        drm/ast: Fix AST2400 POST failure without BMC FW or VBIOS
      3437f9f0
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.11-rc1' of git://people.freedesktop.org/~airlied/linux · f3ecc84b
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Misc fixes for v4.11-rc1.
      
        This is a selection of fixes for recent bugs, the vmwgfx one is
        important to avoid a regression, and compat ioctl one is pretty urgent
        for stable. Otherwise nothing too much.
      
        I've got a separate pull req for some AST hw IBM need to enable"
      
      * tag 'drm-fixes-for-v4.11-rc1' of git://people.freedesktop.org/~airlied/linux:
        dma-buf: add support for compat ioctl
        drm/vmwgfx: Work around drm removal of control nodes
        drm/rockchip: cdn-dp: Fix error handling
        drm/rockchip: add extcon dependency for DP
        drm: zte: fix static checker warning on variable 'fmt'
      f3ecc84b
    • Arnd Bergmann's avatar
      watchdog: retu: restore MFD dependency · 9ad82f11
      Arnd Bergmann authored
      The retu watchdog calls into the respective mfd driver, but fails to
      link if that is diabled:
      
      drivers/watchdog/built-in.o: In function `retu_wdt_set_timeout':
      ziirave_wdt.c:(.text+0x8c88): undefined reference to `retu_write'
      ziirave_wdt.c:(.text+0x8c88): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `retu_write'
      drivers/watchdog/built-in.o: In function `retu_wdt_start':
      ziirave_wdt.c:(.text+0x8cc8): undefined reference to `retu_write'
      ziirave_wdt.c:(.text+0x8cc8): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `retu_write'
      
      This restores the dependency as it was before
      
      Fixes: da2a68b3 ("watchdog: Enable COMPILE_TEST where possible")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      9ad82f11
    • Arnd Bergmann's avatar
      watchdog: db8500: add back prmcu dependency · 9297b652
      Arnd Bergmann authored
      When the db8500 watchdog is enabled without the PRCMU, we get a lot of
      warnings about duplicate or missing helper functions:
      
      In file included from drivers/watchdog/ux500_wdt.c:21:0:
      include/linux/mfd/dbx500-prcmu.h:422:19: error: redefinition of 'prcmu_abb_read'
       static inline int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
      
      This restores the dependency as it was.
      
      Fixes: da2a68b3 ("watchdog: Enable COMPILE_TEST where possible")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      9297b652
    • Arnd Bergmann's avatar
      watchdog: kempld: fix gcc-4.3 build · 3736d4eb
      Arnd Bergmann authored
      gcc-4.3 can't decide whether the constant value in
      kempld_prescaler[PRESCALER_21] is built-time constant or
      not, and gets confused by the logic in do_div():
      
      drivers/watchdog/kempld_wdt.o: In function `kempld_wdt_set_stage_timeout':
      kempld_wdt.c:(.text.kempld_wdt_set_stage_timeout+0x130): undefined reference to `__aeabi_uldivmod'
      
      This adds a call to ACCESS_ONCE() to force it to not consider
      it to be constant, and leaves the more efficient normal case
      in place for modern compilers, using an #ifdef to annotate
      why we do this hack.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      3736d4eb
    • Niklas Cassel's avatar
      watchdog: softdog: fire watchdog even if softirqs do not get to run · 8d5755b3
      Niklas Cassel authored
      Checking for timer expiration is done from the softirq TIMER_SOFTIRQ.
      
      Since commit 4cd13c21 ("softirq: Let ksoftirqd do its job"),
      pending softirqs are no longer always handled immediately, instead,
      if there are pending softirqs, and ksoftirqd is in state TASK_RUNNING,
      the handling of the softirqs are deferred, and are instead supposed
      to be handled by ksoftirqd, when ksoftirqd gets scheduled.
      
      If a user space process with a real-time policy starts to misbehave
      by never relinquishing the CPU while ksoftirqd is in state TASK_RUNNING,
      what will happen is that all softirqs will get deferred, while ksoftirqd,
      which is supposed to handle the deferred softirqs, will never get to run.
      
      To make sure that the watchdog is able to fire even when we do not get
      to run softirqs, replace the timers with hrtimers.
      Signed-off-by: default avatarNiklas Cassel <niklas.cassel@axis.com>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      8d5755b3
    • Arnd Bergmann's avatar
      watchdog: kempld: revert to full dependency · ed4a9eca
      Arnd Bergmann authored
      The kempld watchdog driver requires the respective MFD driver:
      
      drivers/watchdog/built-in.o: In function `kempld_wdt_probe':
      kempld_wdt.c:(.text+0x5c78): undefined reference to `kempld_get_mutex'
      kempld_wdt.c:(.text+0x5c84): undefined reference to `kempld_read8'
      kempld_wdt.c:(.text+0x5c8e): undefined reference to `kempld_release_mutex'
      kempld_wdt.c:(.text+0x5d1c): undefined reference to `kempld_read8'
      kempld_wdt.c:(.text+0x5d2c): undefined reference to `kempld_write8'
      
      This adds the Kconfig dependency back.
      
      Fixes: da2a68b3 ("watchdog: Enable COMPILE_TEST where possible")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      ed4a9eca
    • Arnd Bergmann's avatar
      watchdog: bcm2835: add CONFIG_OF dependency · 2672b7e0
      Arnd Bergmann authored
      Without CONFIG_OF, the driver fails to link:
      
      drivers/watchdog/built-in.o: In function `bcm2835_power_off':
      bcm2835_wdt.c:(.text+0x1946): undefined reference to `of_find_device_by_node'
      
      This adds a new dependency, to allow the COMPILE_TEST check to succeed.
      
      Fixes: da2a68b3 ("watchdog: Enable COMPILE_TEST where possible")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      2672b7e0
    • Arnd Bergmann's avatar
      watchdog: sp805: add back AMBA dependency · 3eafee95
      Arnd Bergmann authored
      The driver fails to link if ARM_AMBA is disabled:
      
      drivers/watchdog/sp805_wdt.o: In function `sp805_wdt_driver_init':
      sp805_wdt.c:(.init.text+0x4): undefined reference to `amba_driver_register'
      
      It seems that the COMPILE_TEST was added in the wrong place, as there
      is no architecture dependency, but a bus dependency. This moves
      the dependency accordingly.
      
      Fixes: da2a68b3 ("watchdog: Enable COMPILE_TEST where possible")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      3eafee95
    • Arnd Bergmann's avatar
      watchdog: menf21bmc: add I2C dependency · 6fb303a8
      Arnd Bergmann authored
      This driver fails to link when CONFIG_I2C is disabled or a loadable module while
      the watchdog is built-in:
      
      drivers/watchdog/built-in.o: In function `menf21bmc_wdt_shutdown':
      menf21bmc_wdt.c:(.text+0x9b44): undefined reference to `i2c_smbus_write_word_data'
      menf21bmc_wdt.c:(.text+0x9b44): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `i2c_smbus_write_word_data'
      
      This adds a Kconfig dependency for it, to enforce a valid configuration.
      
      Fixes: da2a68b3 ("watchdog: Enable COMPILE_TEST where possible")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      6fb303a8
    • Arnd Bergmann's avatar
      watchdog: geode: restore hard CS5535_MFGPT dependency · 0369fdf2
      Arnd Bergmann authored
      Wtihout CONFIG_CS5535_MFGPT, the driver does not link right:
      
      drivers/watchdog/built-in.o: In function `geodewdt_probe':
      geodewdt.c:(.init.text+0xca3): undefined reference to `cs5535_mfgpt_alloc_timer'
      geodewdt.c:(.init.text+0xcd4): undefined reference to `cs5535_mfgpt_write'
      geodewdt.c:(.init.text+0xcef): undefined reference to `cs5535_mfgpt_toggle_event'
      
      This adds back the dependency on this base driver.
      
      Fixes: da2a68b3 ("watchdog: Enable COMPILE_TEST where possible")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      0369fdf2
    • Arnd Bergmann's avatar
      watchdog: wm831x watchdog really needs mfd · d0e32fba
      Arnd Bergmann authored
      The wm831x watchdog driver can now be built without the wm831x mfd
      driver, which results in a link error:
      
      (.text+0x1a95c): undefined reference to `wm831x_set_bits'
      (.text+0x1a95c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `wm831x_set_bits'
      (.text+0x1a968): undefined reference to `wm831x_reg_lock'
      (.text+0x1a968): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `wm831x_reg_lock'
      (.text+0x1a9dc): undefined reference to `wm831x_reg_unlock'
      (.text+0x1a9dc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `wm831x_reg_unlock'
      
      This adds back the dependency that was removed. We can still build test
      this driver on all architectures by enabling the MFD driver for it first.
      
      Fixes: da2a68b3 ("watchdog: Enable COMPILE_TEST where possible")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      d0e32fba
    • Josh Poimboeuf's avatar
      objtool, compiler.h: Fix __unreachable section relocation size · 55149d06
      Josh Poimboeuf authored
      Linus reported the following commit broke module loading on his laptop:
      
        d1091c7f ("objtool: Improve detection of BUG() and other dead ends")
      
      It showed errors like the following:
      
        module: overflow in relocation type 10 val ffffffffc02afc81
        module: 'nvme' likely not compiled with -mcmodel=kernel
      
      The problem is that the __unreachable section addresses are stored using
      the '.long' asm directive, which isn't big enough for .text section
      kernel addresses.  Use relative addresses instead:
      
        ".long %c0b - .\t\n"
      Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Fixes: d1091c7f ("objtool: Improve detection of BUG() and other dead ends")
      Link: http://lkml.kernel.org/r/20170301060504.oltm3iws6fmubnom@trebleSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      55149d06
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.11' of git://git.code.sf.net/p/openipmi/linux-ipmi · 2d6be4ab
      Linus Torvalds authored
      Pull IPMI updates from Corey Minyard:
       "This is a few small fixes to the main IPMI driver, make some things
        const, fix typos, etc.
      
        The last patch came in about a week ago, but IMHO it's best to go in
        now. It is not for the main driver, it's for the bt-bmc driver, which
        runs on the managment controller side, not on the host side, so the
        scope is limited and the change is necessary"
      
      * tag 'for-linus-4.11' of git://git.code.sf.net/p/openipmi/linux-ipmi:
        ipmi: bt-bmc: Use a regmap for register access
        char: ipmi: constify ipmi_smi_handlers structures
        acpi:ipmi: Make IPMI user handler const
        ipmi: make ipmi_usr_hndl const
        Documentation: Fix a typo in IPMI.txt.
      2d6be4ab
    • Linus Torvalds's avatar
      Merge branch 'idr-4.11' of git://git.infradead.org/users/willy/linux-dax · cf393195
      Linus Torvalds authored
      Pull IDR rewrite from Matthew Wilcox:
       "The most significant part of the following is the patch to rewrite the
        IDR & IDA to be clients of the radix tree. But there's much more,
        including an enhancement of the IDA to be significantly more space
        efficient, an IDR & IDA test suite, some improvements to the IDR API
        (and driver changes to take advantage of those improvements), several
        improvements to the radix tree test suite and RCU annotations.
      
        The IDR & IDA rewrite had a good spin in linux-next and Andrew's tree
        for most of the last cycle. Coupled with the IDR test suite, I feel
        pretty confident that any remaining bugs are quite hard to hit. 0-day
        did a great job of watching my git tree and pointing out problems; as
        it hit them, I added new test-cases to be sure not to be caught the
        same way twice"
      
      Willy goes on to expand a bit on the IDR rewrite rationale:
       "The radix tree and the IDR use very similar data structures.
      
        Merging the two codebases lets us share the memory allocation pools,
        and results in a net deletion of 500 lines of code. It also opens up
        the possibility of exposing more of the features of the radix tree to
        users of the IDR (and I have some interesting patches along those
        lines waiting for 4.12)
      
        It also shrinks the size of the 'struct idr' from 40 bytes to 24 which
        will shrink a fair few data structures that embed an IDR"
      
      * 'idr-4.11' of git://git.infradead.org/users/willy/linux-dax: (32 commits)
        radix tree test suite: Add config option for map shift
        idr: Add missing __rcu annotations
        radix-tree: Fix __rcu annotations
        radix-tree: Add rcu_dereference and rcu_assign_pointer calls
        radix tree test suite: Run iteration tests for longer
        radix tree test suite: Fix split/join memory leaks
        radix tree test suite: Fix leaks in regression2.c
        radix tree test suite: Fix leaky tests
        radix tree test suite: Enable address sanitizer
        radix_tree_iter_resume: Fix out of bounds error
        radix-tree: Store a pointer to the root in each node
        radix-tree: Chain preallocated nodes through ->parent
        radix tree test suite: Dial down verbosity with -v
        radix tree test suite: Introduce kmalloc_verbose
        idr: Return the deleted entry from idr_remove
        radix tree test suite: Build separate binaries for some tests
        ida: Use exceptional entries for small IDAs
        ida: Move ida_bitmap to a percpu variable
        Reimplement IDR and IDA using the radix tree
        radix-tree: Add radix_tree_iter_delete
        ...
      cf393195
    • Linus Torvalds's avatar
      Merge tag 'iommu-fix-v4.11-rc0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 5ecc5ac2
      Linus Torvalds authored
      Pull IOMMU fixes from Joerg Roedel:
       "Fix an issue introduced this merge window into the AMD and Intel IOMMU
        drivers that causes an oops when the vendor-specific sysfs-entries are
        accessed.
      
        The reason for this issue is that I forgot to update the sysfs code in
        the drivers when moving the iommu 'struct device' to the iommu-core"
      
      * tag 'iommu-fix-v4.11-rc0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/amd: Fix crash when accessing AMD-Vi sysfs entries
        iommu/vt-d: Fix crash when accessing VT-d sysfs entries
      5ecc5ac2
  3. 28 Feb, 2017 12 commits
    • Linus Torvalds's avatar
      Merge tag 'nfsd-4.11' of git://linux-nfs.org/~bfields/linux · 8313064c
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
       "The nfsd update this round is mainly a lot of miscellaneous cleanups
        and bugfixes.
      
        A couple changes could theoretically break working setups on upgrade.
        I don't expect complaints in practice, but they seem worth calling out
        just in case:
      
         - NFS security labels are now off by default; a new security_label
           export flag reenables it per export. But, having them on by default
           is a disaster, as it generally only makes sense if all your clients
           and servers have similar enough selinux policies. Thanks to Jason
           Tibbitts for pointing this out.
      
         - NFSv4/UDP support is off. It was never really supported, and the
           spec explicitly forbids it. We only ever left it on out of
           laziness; thanks to Jeff Layton for finally fixing that"
      
      * tag 'nfsd-4.11' of git://linux-nfs.org/~bfields/linux: (34 commits)
        nfsd: Fix display of the version string
        nfsd: fix configuration of supported minor versions
        sunrpc: don't register UDP port with rpcbind when version needs congestion control
        nfs/nfsd/sunrpc: enforce transport requirements for NFSv4
        sunrpc: flag transports as having congestion control
        sunrpc: turn bitfield flags in svc_version into bools
        nfsd: remove superfluous KERN_INFO
        nfsd: special case truncates some more
        nfsd: minor nfsd_setattr cleanup
        NFSD: Reserve adequate space for LOCKT operation
        NFSD: Get response size before operation for all RPCs
        nfsd/callback: Drop a useless data copy when comparing sessionid
        nfsd/callback: skip the callback tag
        nfsd/callback: Cleanup callback cred on shutdown
        nfsd/idmap: return nfserr_inval for 0-length names
        SUNRPC/Cache: Always treat the invalid cache as unexpired
        SUNRPC: Drop all entries from cache_detail when cache_purge()
        svcrdma: Poll CQs in "workqueue" mode
        svcrdma: Combine list fields in struct svc_rdma_op_ctxt
        svcrdma: Remove unused sc_dto_q field
        ...
      8313064c
    • Linus Torvalds's avatar
      Merge tag 'ceph-for-4.11-rc1' of git://github.com/ceph/ceph-client · b2deee2d
      Linus Torvalds authored
      Pull ceph updates from Ilya Dryomov:
       "This time around we have:
      
         - support for rbd data-pool feature, which enables rbd images on
           erasure-coded pools (myself). CEPH_PG_MAX_SIZE has been bumped to
           allow erasure-coded profiles with k+m up to 32.
      
         - a patch for ceph_d_revalidate() performance regression introduced
           in 4.9, along with some cleanups in the area (Jeff Layton)
      
         - a set of fixes for unsafe ->d_parent accesses in CephFS (Jeff
           Layton)
      
         - buffered reads are now processed in rsize windows instead of rasize
           windows (Andreas Gerstmayr). The new default for rsize mount option
           is 64M.
      
         - ack vs commit distinction is gone, greatly simplifying ->fsync()
           and MOSDOpReply handling code (myself)
      
        ... also a few filesystem bug fixes from Zheng, a CRUSH sync up (CRUSH
        computations are still serialized though) and several minor fixes and
        cleanups all over"
      
      * tag 'ceph-for-4.11-rc1' of git://github.com/ceph/ceph-client: (52 commits)
        libceph, rbd, ceph: WRITE | ONDISK -> WRITE
        libceph: get rid of ack vs commit
        ceph: remove special ack vs commit behavior
        ceph: tidy some white space in get_nonsnap_parent()
        crush: fix dprintk compilation
        crush: do is_out test only if we do not collide
        ceph: remove req from unsafe list when unregistering it
        rbd: constify device_type structure
        rbd: kill obj_request->object_name and rbd_segment_name_cache
        rbd: store and use obj_request->object_no
        rbd: RBD_V{1,2}_DATA_FORMAT macros
        rbd: factor out __rbd_osd_req_create()
        rbd: set offset and length outside of rbd_obj_request_create()
        rbd: support for data-pool feature
        rbd: introduce rbd_init_layout()
        rbd: use rbd_obj_bytes() more
        rbd: remove now unused rbd_obj_request_wait() and helpers
        rbd: switch rbd_obj_method_sync() to ceph_osdc_call()
        libceph: pass reply buffer length through ceph_osdc_call()
        rbd: do away with obj_request in rbd_obj_read_sync()
        ...
      b2deee2d
    • Takashi Iwai's avatar
      ALSA: seq: Fix link corruption by event error handling · f3ac9f73
      Takashi Iwai authored
      The sequencer FIFO management has a bug that may lead to a corruption
      (shortage) of the cell linked list.  When a sequencer client faces an
      error at the event delivery, it tries to put back the dequeued cell.
      When the first queue was put back, this forgot the tail pointer
      tracking, and the link will be screwed up.
      
      Although there is no memory corruption, the sequencer client may stall
      forever at exit while flushing the pending FIFO cells in
      snd_seq_pool_done(), as spotted by syzkaller.
      
      This patch addresses the missing tail pointer tracking at
      snd_seq_fifo_cell_putback().  Also the patch makes sure to clear the
      cell->enxt pointer at snd_seq_fifo_event_in() for avoiding a similar
      mess-up of the FIFO linked list.
      Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      f3ac9f73
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm · d4f4cf77
      Linus Torvalds authored
      Pull ARM updates from Russell King:
      
       - nommu updates from Afzal Mohammed cleaning up the vectors support
      
       - allow DMA memory "mapping" for nommu Benjamin Gaignard
      
       - fixing a correctness issue with R_ARM_PREL31 relocations in the
         module linker
      
       - add strlen() prototype for the decompressor
      
       - support for DEBUG_VIRTUAL from Florian Fainelli
      
       - adjusting memory bounds after memory reservations have been
         registered
      
       - unipher cache handling updates from Masahiro Yamada
      
       - initrd and Thumb Kconfig cleanups
      
      * 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: (23 commits)
        ARM: mm: round the initrd reservation to page boundaries
        ARM: mm: clean up initrd initialisation
        ARM: mm: move initrd init code out of arm_memblock_init()
        ARM: 8655/1: improve NOMMU definition of pgprot_*()
        ARM: 8654/1: decompressor: add strlen prototype
        ARM: 8652/1: cache-uniphier: clean up active way setup code
        ARM: 8651/1: cache-uniphier: include <linux/errno.h> instead of <linux/types.h>
        ARM: 8650/1: module: handle negative R_ARM_PREL31 addends correctly
        ARM: 8649/2: nommu: remove Hivecs configuration is asm
        ARM: 8648/2: nommu: display vectors base
        ARM: 8647/2: nommu: dynamic exception base address setting
        ARM: 8646/1: mmu: decouple VECTORS_BASE from Kconfig
        ARM: 8644/1: Reduce "CPU: shutdown" message to debug level
        ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol
        ARM: 8640/1: Add support for CONFIG_DEBUG_VIRTUAL
        ARM: 8639/1: Define KERNEL_START and KERNEL_END
        ARM: 8638/1: mtd: lart: Rename partition defines to be prefixed with PART_
        ARM: 8637/1: Adjust memory boundaries after reservations
        ARM: 8636/1: Cleanup sanity_check_meminfo
        ARM: add CPU_THUMB_CAPABLE to indicate possible Thumb support
        ...
      d4f4cf77
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f89db789
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "Two documentation updates, plus a debugging annotation fix"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/crash: Update the stale comment in reserve_crashkernel()
        x86/irq, trace: Add __irq_entry annotation to x86's platform IRQ handlers
        Documentation, x86, resctrl: Recommend locking for resctrlfs
      f89db789
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 65314ed0
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Two rq-clock warnings related fixes, plus a cgroups related crash fix"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/cgroup: Move sched_online_group() back into css_online() to fix crash
        sched/fair: Update rq clock before changing a task's CPU affinity
        sched/core: Fix update_rq_clock() splat on hotplug (and suspend/resume)
      65314ed0
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3f26b0c8
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Misc fixes on the kernel and tooling side - nothing in particular
        stands out"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
        perf/core: Fix the perf_cpu_time_max_percent check
        perf/core: Fix perf_event_enable_on_exec() timekeeping (again)
        perf/core: Remove confusing comment and move put_ctx()
        perf record: Honor --quiet option properly
        perf annotate: Add -q/--quiet option
        perf diff: Add -q/--quiet option
        perf report: Add -q/--quiet option
        perf utils: Check verbose flag properly
        perf utils: Add perf_quiet_option()
        perf record: Add -a as default target
        perf stat: Add -a as default target
        perf tools: Fail on using multiple bits long terms without value
        perf tools: Move new_term arguments into struct parse_events_term template
        perf build: Add special fixdep cleaning rule
        perf tools: Replace _SC_NPROCESSORS_CONF with max_present_cpu in cpu_topology_map
        perf header: Make build_cpu_topology skip offline/absent CPUs
        perf cpumap: Add cpu__max_present_cpu()
        perf session: Fix DEBUG=1 build with clang
        tools lib traceevent: It's preempt not prempt
        perf python: Filter out -specs=/a/b/c from the python binding cc options
        ...
      3f26b0c8
    • Linus Torvalds's avatar
      Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 74efe07b
      Linus Torvalds authored
      Pull locking fixes from Ingo Molnar:
       "The main change is the uninlining of large refcount_t APIs, plus a
        header dependency fix.
      
        Note that the uninlining allowed us to enable the underflow/overflow
        warnings unconditionally and remove the debug Kconfig switch: this
        might trigger new warnings in buggy code and turn
        crashes/use-after-free bugs into less harmful memory leaks"
      
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        locking/refcounts: Add missing kernel.h header to have UINT_MAX defined
        locking/refcounts: Out-of-line everything
      74efe07b
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e72e58fa
      Linus Torvalds authored
      Pull objtool fixes from Ingo Molnar:
       "A handful of objtool fixes related to unreachable code, plus a build
        fix for out of tree modules"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        objtool: Enclose contents of unreachable() macro in a block
        objtool: Prevent GCC from merging annotate_unreachable()
        objtool: Improve detection of BUG() and other dead ends
        objtool: Fix CONFIG_STACK_VALIDATION=y warning for out-of-tree modules
      e72e58fa
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 74e3f63c
      Linus Torvalds authored
      Pull IDE updates from David Miller:
       "Just one actual change here this time around, adding some init data
        annotations. The other change was bogus and got reverted"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: palm_bk3710: add __initdata to palm_bk3710_port_info
        Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)"
        ide: Fix interface autodetection in legacy IDE driver (trial #2)
      74e3f63c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · c2eca00f
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Don't save TIPC header values before the header has been validated,
          from Jon Paul Maloy.
      
       2) Fix memory leak in RDS, from Zhu Yanjun.
      
       3) We miss to initialize the UID in the flow key in some paths, from
          Julian Anastasov.
      
       4) Fix latent TOS masking bug in the routing cache removal from years
          ago, also from Julian.
      
       5) We forget to set the sockaddr port in sctp_copy_local_addr_list(),
          fix from Xin Long.
      
       6) Missing module ref count drop in packet scheduler actions, from
          Roman Mashak.
      
       7) Fix RCU annotations in rht_bucket_nested, from Herbert Xu.
      
       8) Fix use after free which happens because L2TP's ipv4 support returns
          non-zero values from it's backlog_rcv function which ipv4 interprets
          as protocol values. Fix from Paul Hüber.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (35 commits)
        qed: Don't use attention PTT for configuring BW
        qed: Fix race with multiple VFs
        l2tp: avoid use-after-free caused by l2tp_ip_backlog_recv
        xfrm: provide correct dst in xfrm_neigh_lookup
        rhashtable: Fix RCU dereference annotation in rht_bucket_nested
        rhashtable: Fix use before NULL check in bucket_table_free
        net sched actions: do not overwrite status of action creation.
        rxrpc: Kernel calls get stuck in recvmsg
        net sched actions: decrement module reference count after table flush.
        lib: Allow compile-testing of parman
        ipv6: check sk sk_type and protocol early in ip_mroute_set/getsockopt
        sctp: set sin_port for addr param when checking duplicate address
        net/mlx4_en: fix overflow in mlx4_en_init_timestamp()
        netfilter: nft_set_bitmap: incorrect bitmap size
        net: s2io: fix typo argumnet argument
        net: vxge: fix typo argumnet argument
        netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
        ipv4: mask tos for input route
        ipv4: add missing initialization for flowi4_uid
        lib: fix spelling mistake: "actualy" -> "actually"
        ...
      c2eca00f
    • Jaegeuk Kim's avatar
      f2fs: avoid to flush nat journal entries · 900f7362
      Jaegeuk Kim authored
      This patch adds a missing condition which flushes nat journal entries
      unnecessarily introduced by:
      
          f2fs: add bitmaps for empty or full NAT blocks
      Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
      900f7362