1. 03 7月, 2017 3 次提交
  2. 06 6月, 2017 14 次提交
  3. 05 6月, 2017 10 次提交
    • A
      watchdog: sama5d4: Add comment explaining what happens on resume · 5dca80f6
      Alexandre Belloni 提交于
      Because suspending to RAM may lose the register values, they are restored
      on resume. This is currently done unconditionally because there is
      currently no way to know (from the driver) whether they have really been
      lost or are still valid. Writing MR also pings the watchdog and this may
      not be what is expected so add a comment explaining why it happens.
      Signed-off-by: NAlexandre Belloni <alexandre.belloni@free-electrons.com>
      Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      5dca80f6
    • A
      watchodg: sama5d4: simplify probe · 39bd56df
      Alexandre Belloni 提交于
      Because the only way to use the driver is to have a device tree enabling
      it, pdev->dev.of_node will never be NULL. Remove the unnecessary check.
      Signed-off-by: NAlexandre Belloni <alexandre.belloni@free-electrons.com>
      Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      39bd56df
    • L
      Linux 4.12-rc4 · 3c2993b8
      Linus Torvalds 提交于
      3c2993b8
    • R
      fs/ufs: Set UFS default maximum bytes per file · 239e250e
      Richard Narron 提交于
      This fixes a problem with reading files larger than 2GB from a UFS-2
      file system:
      
          https://bugzilla.kernel.org/show_bug.cgi?id=195721
      
      The incorrect UFS s_maxsize limit became a problem as of commit
      c2a9737f ("vfs,mm: fix a dead loop in truncate_inode_pages_range()")
      which started using s_maxbytes to avoid a page index overflow in
      do_generic_file_read().
      
      That caused files to be truncated on UFS-2 file systems because the
      default maximum file size is 2GB (MAX_NON_LFS) and UFS didn't update it.
      
      Here I simply increase the default to a common value used by other file
      systems.
      Signed-off-by: NRichard Narron <comet.berkeley@gmail.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Will B <will.brokenbourgh2877@gmail.com>
      Cc: Theodore Ts'o <tytso@mit.edu>
      Cc: <stable@vger.kernel.org> # v4.9 and backports of c2a9737fSigned-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      239e250e
    • L
      Merge tag 'nfs-for-4.12-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 125f42b0
      Linus Torvalds 提交于
      Pull NFS client bugfixes from Trond Myklebust:
       "Bugfixes include:
      
         - Fix a typo in commit e0926934 ("NFS append COMMIT after
           synchronous COPY") that breaks copy offload
      
         - Fix the connect error propagation in xs_tcp_setup_socket()
      
         - Fix a lock leak in nfs40_walk_client_list
      
         - Verify that pNFS requests lie within the offset range of the layout
           segment"
      
      * tag 'nfs-for-4.12-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        nfs: Mark unnecessarily extern functions as static
        SUNRPC: ensure correct error is reported by xs_tcp_setup_socket()
        NFSv4.0: Fix a lock leak in nfs40_walk_client_list
        pnfs: Fix the check for requests in range of layout segment
        xprtrdma: Delete an error message for a failed memory allocation in xprt_rdma_bc_setup()
        pNFS/flexfiles: missing error code in ff_layout_alloc_lseg()
        NFS fix COMMIT after COPY
      125f42b0
    • L
      Merge tag 'tty-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 3c06e6cb
      Linus Torvalds 提交于
      Pull tty fix from Greg KH:
       "Here is a single tty core fix for 4.12-rc4. It reverts a patch that a
        lot of people reported as causing lockdep and other warnings.
      
        Right after I reverted this in my tree, it seems like another
        "correct" fix might have shown up, but it's too late in the release
        cycle to be messing with tty core locking, so let's just revert this
        for now to go back how things always have been and try it again for
        4.13.
      
        This has not been in linux-next as I only reverted it a few hours ago"
      
      * tag 'tty-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        Revert "tty: fix port buffer locking"
      3c06e6cb
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · e00811b4
      Linus Torvalds 提交于
      Pull input subsystem fixes from Dmitry Torokhov:
      
       - a couple of regression fixes in synaptics and axp20x-pek drivers
      
       - try to ease transition from PS/2 to RMI for Synaptics touchpad users
         by ensuring we do not try to activate RMI mode when RMI SMBus support
         is not enabled, and nag users a bit to enable it
      
       - plus a couple of other changes that seemed worthwhile for this
         release
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: axp20x-pek - switch to acpi_dev_present and check for ACPI0011 too
        Input: axp20x-pek - only check for "INTCFD9" ACPI device on Cherry Trail
        Input: tm2-touchkey - use LEN_ON as boolean value instead of LED_FULL
        Input: synaptics - tell users to report when they should be using rmi-smbus
        Input: synaptics - warn the users when there is a better mode
        Input: synaptics - keep PS/2 around when RMI4_SMB is not enabled
        Input: synaptics - clear device info before filling in
        Input: silead - disable interrupt during suspend
      e00811b4
    • L
      Merge tag 'rtc-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 9f03b2c7
      Linus Torvalds 提交于
      Pull RTC fixlet from Alexandre Belloni:
       "A single patch, not really a fix but I don't think there is any reason
        to delay it.
      
        Change the mailing list address"
      
      * tag 'rtc-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
        MAINTAINERS: update RTC mailing list
      9f03b2c7
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 1f915b7f
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "This is nine fixes, seven of which are for the qedi driver (new as of
        4.10) the other two are a use after free in the cxgbi drivers and a
        potential NULL dereference in the rdac device handler"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: libcxgbi: fix skb use after free
        scsi: qedi: Fix endpoint NULL panic during recovery.
        scsi: qedi: set max_fin_rt default value
        scsi: qedi: Set firmware tcp msl timer value.
        scsi: qedi: Fix endpoint NULL panic in qedi_set_path.
        scsi: qedi: Set dma_boundary to 0xfff.
        scsi: qedi: Correctly set firmware max supported BDs.
        scsi: qedi: Fix bad pte call trace when iscsiuio is stopped.
        scsi: scsi_dh_rdac: Use ctlr directly in rdac_failover_get()
      1f915b7f
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 55cbdaf6
      Linus Torvalds 提交于
      Pull rdma fixes from Doug Ledford:
       "For the most part this is just a minor -rc cycle for the rdma
        subsystem. Even given that this is all of the -rc patches since the
        merge window closed, it's still only about 25 patches:
      
         - Multiple i40iw, nes, iw_cxgb4, hfi1, qib, mlx4, mlx5 fixes
      
         - A few upper layer protocol fixes (IPoIB, iSER, SRP)
      
         - A modest number of core fixes"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (26 commits)
        RDMA/SA: Fix kernel panic in CMA request handler flow
        RDMA/umem: Fix missing mmap_sem in get umem ODP call
        RDMA/core: not to set page dirty bit if it's already set.
        RDMA/uverbs: Declare local function static and add brackets to sizeof
        RDMA/netlink: Reduce exposure of RDMA netlink functions
        RDMA/srp: Fix NULL deref at srp_destroy_qp()
        RDMA/IPoIB: Limit the ipoib_dev_uninit_default scope
        RDMA/IPoIB: Replace netdev_priv with ipoib_priv for ipoib_get_link_ksettings
        RDMA/qedr: add null check before pointer dereference
        RDMA/mlx5: set UMR wqe fence according to HCA cap
        net/mlx5: Define interface bits for fencing UMR wqe
        RDMA/mlx4: Fix MAD tunneling when SRIOV is enabled
        RDMA/qib,hfi1: Fix MR reference count leak on write with immediate
        RDMA/hfi1: Defer setting VL15 credits to link-up interrupt
        RDMA/hfi1: change PCI bar addr assignments to Linux API functions
        RDMA/hfi1: fix array termination by appending NULL to attr array
        RDMA/iw_cxgb4: fix the calculation of ipv6 header size
        RDMA/iw_cxgb4: calculate t4_eq_status_entries properly
        RDMA/iw_cxgb4: Avoid touch after free error in ARP failure handlers
        RDMA/nes: ACK MPA Reply frame
        ...
      55cbdaf6
  4. 04 6月, 2017 2 次提交
  5. 03 6月, 2017 11 次提交
    • L
      Merge tag 'hwmon-for-linus-v4.12-rc4' of... · ea094f3c
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fixes from Guenter Roeck:
       "A couple of patches for the aspeed pwm fan driver"
      
      * tag 'hwmon-for-linus-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (aspeed-pwm-tacho) make fan/pwm names start with index 1
        hwmon: (aspeed-pwm-tacho) Call of_node_put() on a node not claimed
        hwmon: (aspeed-pwm-tacho) On read failure return -ETIMEDOUT
        hwmon: (aspeed-pwm-tacho) Select REGMAP
      ea094f3c
    • L
      Merge tag 'for-linus-20170602' of git://git.infradead.org/linux-mtd · cc548740
      Linus Torvalds 提交于
      Pull MTD fixes from Brian Norris:
       "NAND updates from Boris:
      
        tango fixes:
         - Add missing MODULE_DEVICE_TABLE() in tango_nand.c
         - Update the number of corrected bitflips
      
        core fixes:
         - Fix a long standing memory leak in nand_scan_tail()
         - Fix several bugs introduced by the per-vendor init/detection
           infrastructure (introduced in 4.12)
         - Add a static specifier to nand_ooblayout_lp_hamming_ops definition"
      
      * tag 'for-linus-20170602' of git://git.infradead.org/linux-mtd:
        mtd: nand: make nand_ooblayout_lp_hamming_ops static
        mtd: nand: tango: Update ecc_stats.corrected
        mtd: nand: tango: Export OF device ID table as module aliases
        mtd: nand: samsung: warn about un-parseable ECC info
        mtd: nand: free vendor-specific resources in init failure paths
        mtd: nand: drop unneeded module.h include
        mtd: nand: don't leak buffers when ->scan_bbt() fails
      cc548740
    • S
      hwmon: (aspeed-pwm-tacho) make fan/pwm names start with index 1 · 5f348fa3
      Stefan Schaeckeler 提交于
      Make fan and pwm names in sysfs start with index 1 in accordance to
      Documentation/hwmon/sysfs-interface conventions.
      
      Current implementation starts with index 0, making tools such as
      sensors(1) skip the first fan.
      Signed-off-by: NStefan Schaeckeler <sschaeck@cisco.com>
      Fixes: 2d7a548a ("drivers: hwmon: Support for ASPEED PWM/Fan tach")
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      5f348fa3
    • S
      hwmon: (aspeed-pwm-tacho) Call of_node_put() on a node not claimed · 4d58e732
      Stefan Schaeckeler 提交于
      Call of_node_put() on a node claimed with of_node_get() or by any other
      means such as for_each_child_of_node().
      Signed-off-by: NStefan Schaeckeler <sschaeck@cisco.com>
      Fixes: 2d7a548a ("drivers: hwmon: Support for ASPEED PWM/Fan tach")
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      4d58e732
    • H
      Input: axp20x-pek - switch to acpi_dev_present and check for ACPI0011 too · 0fd5f221
      Hans de Goede 提交于
      acpi_dev_found checks that there is a matching ACPI node, but it
      may be disabled (_STA method returns 0) in which case the
      soc_button_array driver will not bind to it and axp20x-pek should
      handle the power-button.
      
      This commit switches from acpi_dev_found to acpi_dev_present to
      avoid not registering an input-dev for the powerbutton when there
      is a disabled PNP0C40 device.
      
      The ACPI-6.0 standard defines a standard gpio button device using
      the ACPI0011 HID replacing the custom PNP0C40 gpio device, many
      newer devices define both PNP0C40 and ACPI0011 devices enabling one
      or the other depending on whether the BIOS thinks it is going to boot
      Android or Windows.
      
      This commit adds a check for the ACPI0011 device, so that if
      either device is present *and* enabled we don't register an input-dev
      for the powerbutton.
      Signed-off-by: NHans de Goede <hdegoede@redhat.com>
      Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
      0fd5f221
    • H
      Input: axp20x-pek - only check for "INTCFD9" ACPI device on Cherry Trail · 8d4b3137
      Hans de Goede 提交于
      Commit 9b13a4ca ("Input: axp20x-pek - do not register input device
      on some systems") added a check for the INTCFD9 ACPI device which also
      handles the powerbutton as on some systems the powerbutton is connected
      to both the PMIC, handled by axp20x-pek, and to a gpio on the SoC, handled
      by soc_button_array which attaches itself to the INTCFD9 ACPI device.
      
      Testing + comparing DSDTs has shown that this only happens on Cherry
      Trail devices with an AXP288 PMIC, the AXP288 PMIC is also used on
      Bay Trail devices but there the power button is only connected to
      the PMIC and not handled by soc_button_array.
      
      This means that the INTCFD9 check has caused a regression on Bay Trail
      devices, causing power-button presses to no longer be seen.
      
      This commit fixes this by limiting the check to devices where the ACPI
      node for the AXP288 contains a _HRV (hardware revision) attribute with
      a value of 3 which indicates we are dealing with a Cherry Trail platform.
      
      Fixes: 9b13a4ca ("Input: axp20x-pek - do not register input ...")
      Reported-by: NСергей Трусов <t.rus76@ya.ru>
      Signed-off-by: NHans de Goede <hdegoede@redhat.com>
      Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
      8d4b3137
    • D
      Merge tag 'v4.12-rc3' into for-linus · eadcbfa5
      Dmitry Torokhov 提交于
      Merge with mainline to get acpi_dev_present() needed by patches to
      axp20x-pek driver.
      eadcbfa5
    • L
      Merge tag 'acpi-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 104c08ba
      Linus Torvalds 提交于
      Pull ACPI fixes from Rafael Wysocki:
       "These revert one more problematic commit related to the ACPI-based
        handling of laptop lids and make some unuseful error messages coming
        from ACPICA go away.
      
        Specifics:
      
         - Revert one more commit related to the ACPI-based handling of laptop
           lids that changed the default behavior on laptops that booted with
           closed lids and introduced a regression there (Benjamin Tissoires).
      
         - Add a missing acpi_put_table() to the code implementing the
           /sys/firmware/acpi/tables interface to prevent a counter in the
           ACPICA core from overflowing (Dan Williams).
      
         - Drop error messages printed by ACPICA on acpi_get_table() reference
           counting mismatches as they need not indicate real errors at this
           point (Lv Zheng)"
      
      * tag 'acpi-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPICA: Tables: Fix regression introduced by a too early mechanism enabling
        Revert "ACPI / button: Change default behavior to lid_init_state=open"
        ACPI / sysfs: fix acpi_get_table() leak / acpi-sysfs denial of service
      104c08ba
    • L
      Merge tag 'pm-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 89af529a
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
       "These fix two bugs in error code paths in the cpufreq core and in the
        kirkwood-cpufreq driver.
      
        Specifics:
      
         - Make cpufreq_register_driver() return an error if the ->init()
           calls fail for all CPUs to prevent non-functional drivers from
           hanging around for no reason (David Arcari).
      
         - Make kirkwood-cpufreq check the return value of
           clk_prepare_enable() (which may fail) as appropriate (Arvind
           Yadav)"
      
      * tag 'pm-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: kirkwood-cpufreq:- Handle return value of clk_prepare_enable()
        cpufreq: cpufreq_register_driver() should return -ENODEV if init fails
      89af529a
    • L
      Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 5a4829b5
      Linus Torvalds 提交于
      Pull /dev/random bug fix from Ted Ts'o:
       "Fix a race on architectures with prioritized interrupts (such as m68k)
        which can causes crashes in drivers/char/random.c:get_reg()"
      
      * tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        fix race in drivers/char/random.c:get_reg()
      5a4829b5
    • L
      Merge branch 'akpm' (patches from Andrew) · f2197649
      Linus Torvalds 提交于
      Merge misc fixes from Andrew Morton:
       "15 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        scripts/gdb: make lx-dmesg command work (reliably)
        mm: consider memblock reservations for deferred memory initialization sizing
        mm/hugetlb: report -EHWPOISON not -EFAULT when FOLL_HWPOISON is specified
        mlock: fix mlock count can not decrease in race condition
        mm/migrate: fix refcount handling when !hugepage_migration_supported()
        dax: fix race between colliding PMD & PTE entries
        mm: avoid spurious 'bad pmd' warning messages
        mm/page_alloc.c: make sure OOM victim can try allocations with no watermarks once
        pcmcia: remove left-over %Z format
        slub/memcg: cure the brainless abuse of sysfs attributes
        initramfs: fix disabling of initramfs (and its compression)
        mm: clarify why we want kmalloc before falling backto vmallock
        frv: declare jiffies to be located in the .data section
        include/linux/gfp.h: fix ___GFP_NOLOCKDEP value
        ksm: prevent crash after write_protect_page fails
      f2197649