08 Nov, 2014

7 commits

  • As in 4f452e8aa492c0b8028ca9b4bdb4d018ba28c6c7, use resource_size_t
    to accomodate sizes greater than the size of an unsigned long int on
    platforms that have more than 32 bit physical addresses.

    Signed-off-by: Cristian Stoica
    Signed-off-by: Greg Kroah-Hartman

    Cristian Stoica
     
  • We have MEI_HBM_STARTED in two contexts one
    after start message was received and second
    after enumeration was completed.
    Because after start message reception we move
    immediately to the enumeration state, we need
    only the later meaning.

    Signed-off-by: Tomas Winkler
    Signed-off-by: Greg Kroah-Hartman

    Tomas Winkler
     
  • NFC internal structure cleaning was dropped by commit

    commit 487056932d372cc4f6c636f21a928d6667b151d7
    Author: Tomas Winkler
    Date: Mon Feb 17 15:13:19 2014 +0200

    mei: Remove all bus devices from the mei_dev list when stopping the MEI

    When stopping the MEI, we should remove and potentially unregister
    all bus devices queued on the mei_dev linked list.

    We allocate nfc_dev and free it across the reset
    so we do not keep it in dirty state

    Signed-off-by: Tomas Winkler
    Signed-off-by: Alexander Usyskin
    Signed-off-by: Greg Kroah-Hartman

    Tomas Winkler
     
  • This patch adds MODULE_DEVICE_TABLE macro so i8k.ko module can be automatically
    loaded based on dmi system alias.

    Signed-off-by: Pali Rohár
    Acked-by: Guenter Roeck
    Signed-off-by: Greg Kroah-Hartman

    Pali Rohár
     
  • Dell Latitude E6440 needs same settings as E6540.

    Signed-off-by: Pali Rohár
    Acked-by: Guenter Roeck
    Cc: stable
    Signed-off-by: Greg Kroah-Hartman

    Pali Rohár
     
  • The scripts/checkkconfigsymbols.sh script searches Kconfig features
    in the source code that are not defined in Kconfig. Such identifiers
    always evaluate to false and are the source of various kinds of bugs.
    However, the shell script is slow and it does not detect such broken
    references in Kbuild and Kconfig files (e.g., ``depends on UNDEFINED´´).
    Furthermore, it generates false positives. The script is also hard to
    read and understand, and is thereby difficult to maintain.

    This patch replaces the shell script with an implementation in Python,
    which:
    (a) detects the same bugs, but does not report previous false positives
    (b) additionally detects broken references in Kconfig and all
    non-Kconfig files, such as Kbuild, .[cSh], .txt, .sh, defconfig, etc.
    (c) is up to 75 times faster than the shell script
    (d) only checks files under version control

    The new script reduces the runtime on my machine (i7-2620M, 8GB RAM, SSD)
    from 3m47s to 0m3s, and reports 938 broken references in Linux v3.17-rc1;
    419 additional reports of which 16 are located in Kconfig files,
    287 in defconfigs, 63 in ./Documentation, 1 in Kbuild.

    Moreover, we intentionally include references in comments, which have been
    ignored until now. Such comments may be leftovers of features that have
    been removed or renamed in Kconfig (e.g., ``#endif /* CONFIG_MPC52xx */´´).
    These references can be misleading and should be removed or replaced.

    Note that the output format changed from (file list feature) to
    (feature file list) as it simplifies the detection of the Kconfig
    feature for long file lists.

    Signed-off-by: Valentin Rothberg
    Signed-off-by: Stefan Hengelein
    Signed-off-by: Greg Kroah-Hartman

    Valentin Rothberg
     
  • Prepare SSC clock only when request SSC channel, the clock will be
    enabled when initialize the SSC.

    Signed-off-by: Bo Shen
    Acked-by: Nicolas Ferre
    Signed-off-by: Greg Kroah-Hartman

    Bo Shen
     

04 Nov, 2014

4 commits


03 Nov, 2014

16 commits

  • Linus Torvalds
     
  • Pull MTD fixes from Brian Norris:
    "Three main MTD fixes for 3.18:

    - A regression from 3.16 which was noticed in 3.17. With the
    restructuring of the m25p80.c driver and the SPI NOR library
    framework, we omitted proper listing of the SPI device IDs. This
    means m25p80.c wouldn't auto-load (modprobe) properly when built as
    a module. For now, we duplicate the device IDs into both modules.

    - The OMAP / ELM modules were depending on an implicit link ordering.
    Use deferred probing so that the new link order (in 3.18-rc) can
    still allow for successful probing.

    - Fix suspend/resume support for LH28F640BF NOR flash"

    * tag 'for-linus-20141102' of git://git.infradead.org/linux-mtd:
    mtd: cfi_cmdset_0001.c: fix resume for LH28F640BF chips
    mtd: omap: fix mtd devices not showing up
    mtd: m25p80,spi-nor: Fix module aliases for m25p80
    mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id
    mtd: m25p80: get rid of spi_get_device_id

    Linus Torvalds
     
  • Pull SCSI fixes from James Bottomley:
    "This is a set of six patches consisting of:
    - two MAINTAINER updates
    - two scsi-mq fixs for the old parallel interface (not every request
    is tagged and we need to set the right flags to populate the SPI
    tag message)
    - a fix for a memory leak in scatterlist traversal caused by a
    preallocation update in 3.17
    - an ipv6 fix for cxgbi"

    [ The scatterlist fix also came in separately through the block layer tree ]

    * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
    MAINTAINERS: ufs - remove self
    MAINTAINERS: change hpsa and cciss maintainer
    libcxgbi : support ipv6 address host_param
    scsi: set REQ_QUEUE for the blk-mq case
    Revert "block: all blk-mq requests are tagged"
    lib/scatterlist: fix memory leak with scsi-mq

    Linus Torvalds
     
  • Pull drm fixes from Dave Airlie:
    "Nothing too astounding or major: radeon, i915, vmwgfx, armada and
    exynos.

    Biggest ones:
    - vmwgfx has one big locking regression fix
    - i915 has come displayport fixes
    - radeon has some stability and a memory alloc failure
    - armada and exynos have some vblank fixes"

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (24 commits)
    drm/exynos: correct connector->dpms field before resuming
    drm/exynos: enable vblank after DPMS on
    drm/exynos: init kms poll at the end of initialization
    drm/exynos: propagate plane initialization errors
    drm/exynos: vidi: fix build warning
    drm/exynos: remove explicit encoder/connector de-initialization
    drm/exynos: init vblank with real number of crtcs
    drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size.
    drm/vmwgfx: Fix hash key computation
    drm/vmwgfx: fix lock breakage
    drm/i915/dp: only use training pattern 3 on platforms that support it
    drm/radeon: remove some buggy dead code
    drm/i915: Ignore VBT backlight check on Macbook 2, 1
    drm/radeon: remove invalid pci id
    drm/radeon: dpm fixes for asrock systems
    radeon: clean up coding style differences in radeon_get_bios()
    drm/radeon: Use drm_malloc_ab instead of kmalloc_array
    drm/radeon/dpm: disable ulv support on SI
    drm/i915: Fix GMBUSFREQ on vlv/chv
    drm/i915: Ignore long hpds on eDP ports
    ...

    Linus Torvalds
     
  • Pull ARM fixes from Russell King:
    - add the new bpf syscall to ARM.
    - drop a redundant return statement in __iommu_alloc_remap()
    - fix a performance issue noticed by Thomas Petazzoni with
    kmap_atomic().
    - fix an issue with the L2 cache OF parsing code which caused it to
    incorrectly print warnings on each boot, and make the warning text
    more consistent with the rest of the code

    * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
    ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn()
    ARM: 8183/1: l2c: Improve l2c310_of_parse() error message
    ARM: 8181/1: Drop extra return statement
    ARM: 8182/1: l2c: Make l2x0_cache_size_of_parse() return 'int'
    ARM: enable bpf syscall

    Linus Torvalds
     
  • Pull kvm fixes from Paolo Bonzini:
    "A small set of x86 fixes. The most serious is an SRCU lockdep fix.

    A bit late - needed some time to test the SRCU fix, which only came in
    on Friday"

    * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM: vmx: defer load of APIC access page address during reset
    KVM: nVMX: Disable preemption while reading from shadow VMCS
    KVM: x86: Fix far-jump to non-canonical check
    KVM: emulator: fix execution close to the segment limit
    KVM: emulator: fix error code for __linearize

    Linus Torvalds
     
  • …/daeinki/drm-exynos into drm-fixes

    This pull-request includes some bug fixes and code cleanups.
    Especially, this fixes the bind failure issue occurred when it tries
    to re-bind Exynos drm driver after unbound, and the modetest failure
    issue incurred by not having a pair to vblank on and off requests.

    * 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
    drm/exynos: correct connector->dpms field before resuming
    drm/exynos: enable vblank after DPMS on
    drm/exynos: init kms poll at the end of initialization
    drm/exynos: propagate plane initialization errors
    drm/exynos: vidi: fix build warning
    drm/exynos: remove explicit encoder/connector de-initialization
    drm/exynos: init vblank with real number of crtcs

    Dave Airlie
     
  • Pull VFS fixes from Al Viro:
    "A bunch of assorted fixes, most of them followups to overlayfs merge"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    ovl: initialize ->is_cursor
    Return short read or 0 at end of a raw device, not EIO
    isofs: don't bother with ->d_op for normal case
    isofs_cmp(): we'll never see a dentry for . or ..
    overlayfs: fix lockdep misannotation
    ovl: fix check for cursor
    overlayfs: barriers for opening upper-layer directory
    rcu: Provide counterpart to rcu_dereference() for non-RCU situations
    staging: android: logger: Fix log corruption regression

    Linus Torvalds
     
  • The sk_prot is irda's own set of protocol handlers, so irda should
    statically know what that function is anyway, without using an indirect
    pointer. And as it happens, we know *exactly* what that pointer is
    statically: it's NULL, because irda doesn't define a disconnect
    operation.

    So calling that function is doubly wrong, and will just cause an oops.

    Reported-by: Martin Lang
    Cc: Samuel Ortiz
    Cc: David Miller
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • During system suspend after connector switch off its dpms field
    is set to connector previous dpms state. To properly resume dpms field
    should be set to its actual state (off) before resuming to previous dpms state.

    Signed-off-by: Andrzej Hajda
    Signed-off-by: Inki Dae

    Andrzej Hajda
     
  • Before DPMS off driver disables vblank.
    It should be balanced by vblank enable after DPMS on.
    The patch fixes issue with page_flip ioctl not being able
    to acquire vblank counter introduced by patch:
    drm: Always reject drm_vblank_get() after drm_vblank_off()

    Signed-off-by: Andrzej Hajda
    Signed-off-by: Inki Dae

    Andrzej Hajda
     
  • HPD events can be generated by components even if drm_dev is not fully
    initialized, to skip such events kms poll initialization should
    be performed at the end of load callback followed directly by forced
    connection detection.

    Signed-off-by: Andrzej Hajda
    Signed-off-by: Inki Dae

    Andrzej Hajda
     
  • In case of error during plane initialization load callback
    incorrectly return success, this patch fixes it.

    Signed-off-by: Andrzej Hajda
    Signed-off-by: Inki Dae

    Andrzej Hajda
     
  • encoder object isn't used anymore so remove it.

    Signed-off-by: Inki Dae

    Inki Dae
     
  • All KMS objects are destroyed by drm_mode_config_cleanup in proper order
    so component drivers should not care about it.

    Signed-off-by: Andrzej Hajda
    Signed-off-by: Inki Dae

    Andrzej Hajda
     
  • Initialization of vblank with MAX_CRTC caused attempts
    to disabling vblanks for non-existing crtcs in case
    drm used fewer crtcs. The patch fixes it.

    Signed-off-by: Andrzej Hajda
    Signed-off-by: Inki Dae

    Andrzej Hajda
     

02 Nov, 2014

7 commits

  • Most call paths to vmx_vcpu_reset do not hold the SRCU lock. Defer loading
    the APIC access page to the next vmentry.

    This avoids the following lockdep splat:

    [ INFO: suspicious RCU usage. ]
    3.18.0-rc2-test2+ #70 Not tainted
    -------------------------------
    include/linux/kvm_host.h:474 suspicious rcu_dereference_check() usage!

    other info that might help us debug this:

    rcu_scheduler_active = 1, debug_locks = 0
    1 lock held by qemu-system-x86/2371:
    #0: (&vcpu->mutex){+.+...}, at: [] vcpu_load+0x20/0xd0 [kvm]

    stack backtrace:
    CPU: 4 PID: 2371 Comm: qemu-system-x86 Not tainted 3.18.0-rc2-test2+ #70
    Hardware name: Dell Inc. OptiPlex 9010/0M9KCM, BIOS A12 01/10/2013
    0000000000000001 ffff880209983ca8 ffffffff816f514f 0000000000000000
    ffff8802099b8990 ffff880209983cd8 ffffffff810bd687 00000000000fee00
    ffff880208a2c000 ffff880208a10000 ffff88020ef50040 ffff880209983d08
    Call Trace:
    [] dump_stack+0x4e/0x71
    [] lockdep_rcu_suspicious+0xe7/0x120
    [] gfn_to_memslot+0xd5/0xe0 [kvm]
    [] __gfn_to_pfn+0x33/0x60 [kvm]
    [] gfn_to_page+0x25/0x90 [kvm]
    [] kvm_vcpu_reload_apic_access_page+0x3c/0x80 [kvm]
    [] vmx_vcpu_reset+0x20c/0x460 [kvm_intel]
    [] kvm_vcpu_reset+0x15e/0x1b0 [kvm]
    [] kvm_arch_vcpu_setup+0x2c/0x50 [kvm]
    [] kvm_vm_ioctl+0x1d0/0x780 [kvm]
    [] ? __lock_is_held+0x54/0x80
    [] do_vfs_ioctl+0x300/0x520
    [] ? __fget+0x5/0x250
    [] ? __fget_light+0x2a/0xe0
    [] SyS_ioctl+0x81/0xa0
    [] system_call_fastpath+0x16/0x1b

    Reported-by: Takashi Iwai
    Reported-by: Alexei Starovoitov
    Reviewed-by: Wanpeng Li
    Tested-by: Wanpeng Li
    Fixes: 38b9917350cb2946e368ba684cfc33d1672f104e
    Signed-off-by: Paolo Bonzini

    Paolo Bonzini
     
  • In order to access the shadow VMCS, we need to load it. At this point,
    vmx->loaded_vmcs->vmcs and the actually loaded one start to differ. If
    we now get preempted by Linux, vmx_vcpu_put and, on return, the
    vmx_vcpu_load will work against the wrong vmcs. That can cause
    copy_shadow_to_vmcs12 to corrupt the vmcs12 state.

    Fix the issue by disabling preemption during the copy operation.
    copy_vmcs12_to_shadow is safe from this issue as it is executed by
    vmx_vcpu_run when preemption is already disabled before vmentry.

    This bug is exposed by running Jailhouse within KVM on CPUs with
    shadow VMCS support. Jailhouse never expects an interrupt pending
    vmexit, but the bug can cause it if, after copy_shadow_to_vmcs12
    is preempted, the active VMCS happens to have the virtual interrupt
    pending flag set in the CPU-based execution controls.

    Signed-off-by: Jan Kiszka
    Signed-off-by: Paolo Bonzini

    Jan Kiszka
     
  • Commit d1442d85cc30 ("KVM: x86: Handle errors when RIP is set during far
    jumps") introduced a bug that caused the fix to be incomplete. Due to
    incorrect evaluation, far jump to segment with L bit cleared (i.e., 32-bit
    segment) and RIP with any of the high bits set (i.e, RIP[63:32] != 0) set may
    not trigger #GP. As we know, this imposes a security problem.

    In addition, the condition for two warnings was incorrect.

    Fixes: d1442d85cc30ea75f7d399474ca738e0bc96f715
    Reported-by: Dan Carpenter
    Signed-off-by: Nadav Amit
    [Add #ifdef CONFIG_X86_64 to avoid complaints of undefined behavior. - Paolo]
    Signed-off-by: Paolo Bonzini

    Nadav Amit
     
  • A critical 3.18 regression fix from Rob, (thanks!)
    A fix to avoid advertizing modes we can't support from Sinclair
    (welcome Sinclair!)
    and a fix for an incorrect hash key computation from me that is
    completely harmless, but can wait 'til the next merge window if necessary.
    (I can't really bother stable with this one).

    * 'vmwgfx-fixes-3.18' of git://people.freedesktop.org/~thomash/linux:
    drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size.
    drm/vmwgfx: Fix hash key computation
    drm/vmwgfx: fix lock breakage

    Dave Airlie
     
  • Pull staging fixes from Greg KH:
    "Here are some staging driver fixes for 3.18-rc3. Mostly iio and
    comedi driver fixes for issues reported by people.

    All of these have been in linux-next for a while with no reported
    issues"

    * tag 'staging-3.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
    staging: comedi: fix memory leak / bad pointer freeing for chanlist
    staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants
    staging: comedi: widen subdevice number argument in ioctl handlers
    staging: rtl8723au: Fix alignment of mac_addr for ether_addr_copy() usage
    drivers/staging/comedi/Kconfig: Let COMEDI_II_PCI20KC depend on HAS_IOMEM
    staging: comedi: (regression) channel list must be set for COMEDI_CMD ioctl
    iio: adc: mxs-lradc: Disable the clock on probe failure
    iio: st_sensors: Fix buffer copy
    staging:iio:ad5933: Drop "raw" from channel names
    staging:iio:ad5933: Fix NULL pointer deref when enabling buffer

    Linus Torvalds
     
  • Pull USB fixes from Greg KH:
    "Here are a bunch of USB fixes for 3.18-rc3.

    Mostly usb-serial device ids and gadget fixes for issues that have
    been reported. Full details are in the shortlog.

    All of these have been in linux-next for a while"

    * tag 'usb-3.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (42 commits)
    usb: chipidea: Fix oops when removing the ci_hdrc module
    usb: gadget: function: Fixed the return value on error path
    usb: dwc2: gadget: disable phy before turning off power regulators
    usb: gadget: function: Remove redundant usb_free_all_descriptors
    usb: dwc3: gadget: Properly initialize LINK TRB
    usb: dwc2: gadget: fix gadget unregistration in udc_stop() function
    usb: dwc2: Bits in bitfield should add up to 32
    usb: dwc2: gadget: sparse warning of context imbalance
    usb: gadget: udc: core: fix kernel oops with soft-connect
    usb: musb: musb_dsps: fix NULL pointer in suspend
    usb: musb: dsps: start OTG timer on resume again
    usb: gadget: loopback: don't queue requests to bogus endpoints
    usb: ffs: fix regression when quirk_ep_out_aligned_size flag is set
    usb: gadget: f_fs: remove redundant ffs_data_get()
    usb: gadget: udc: USB_GADGET_XILINX should depend on HAS_DMA
    Revert "usb: dwc3: dwc3-omap: Disable/Enable only wrapper interrupts in prepare/complete"
    usb: gadget: composite: enable BESL support
    usb: musb: cppi41: restart hrtimer only if not yet done
    usb: dwc3: ep0: fix Data Phase for transfer sizes aligned to wMaxPacketSize
    usb: serial: ftdi_sio: add "bricked" FTDI device PID
    ...

    Linus Torvalds
     
  • Pull btrfs fixes from Chris Mason:
    "Filipe is nailing down some problems with our skinny extent variation,
    and Dave's patch fixes endian problems in the new super block checks"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
    Btrfs: fix race that makes btrfs_lookup_extent_info miss skinny extent items
    Btrfs: properly clean up btrfs_end_io_wq_cache
    Btrfs: fix invalid leaf slot access in btrfs_lookup_extent()
    btrfs: use macro accessors in superblock validation checks

    Linus Torvalds
     

01 Nov, 2014

6 commits

  • Pull input updates from Dmitry Torokhov:
    "A bunch of fixes for minor defects reported by Coverity, a few driver
    fixups and revert of i8042.nomux change so that we are once again
    enable active MUX mode if box claims to support it"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Revert "Input: i8042 - disable active multiplexing by default"
    Input: altera_ps2 - use correct type for irq return value
    Input: altera_ps2 - write to correct register when disabling interrupts
    Input: max77693-haptic - fix potential overflow
    Input: psmouse - remove unneeded check in psmouse_reconnect()
    Input: vsxxxaa - fix code dropping bytes from queue
    Input: ims-pcu - fix dead code in ims_pcu_ofn_reg_addr_store()
    Input: opencores-kbd - fix error handling
    Input: wm97xx - adapt parameters to tosa touchscreen.
    Input: i8042 - quirks for Fujitsu Lifebook A544 and Lifebook AH544
    Input: stmpe-keypad - fix valid key line bitmask
    Input: soc_button_array - update calls to gpiod_get*()

    Linus Torvalds
     
  • Pull ACPI and power management fixes from Rafael Wysocki:
    "These are fixes received after my previous pull request plus one that
    has been in the works for quite a while, but its previous version
    caused problems to happen, so it's been deferred till now.

    Fixed are two recent regressions (MFD enumeration and cpufreq-dt),
    ACPI EC regression introduced in 3.17, system suspend error code path
    regression introduced in 3.15, an older bug related to recovery from
    failing resume from hibernation and a cpufreq-dt driver issue related
    to operation performance points.

    Specifics:

    - Fix a crash on r8a7791/koelsch during resume from system suspend
    caused by a recent cpufreq-dt commit (Geert Uytterhoeven).

    - Fix an MFD enumeration problem introduced by a recent commit adding
    ACPI support to the MFD subsystem that exposed a weakness in the
    ACPI core causing ACPI enumeration to be applied to all devices
    associated with one ACPI companion object, although it should be
    used for one of them only (Mika Westerberg).

    - Fix an ACPI EC regression introduced during the 3.17 cycle causing
    some Samsung laptops to misbehave as a result of a workaround
    targeted at some Acer machines. That includes a revert of a commit
    that went too far and a quirk for the Acer machines in question.
    From Lv Zheng.

    - Fix a regression in the system suspend error code path introduced
    during the 3.15 cycle that causes it to fail to take errors from
    asychronous execution of "late" suspend callbacks into account
    (Imre Deak).

    - Fix a long-standing bug in the hibernation resume error code path
    that fails to roll back everything correcty on "freeze" callback
    errors and leaves some devices in a "suspended" state causing more
    breakage to happen subsequently (Imre Deak).

    - Make the cpufreq-dt driver disable operation performance points
    that are not supported by the VR connected to the CPU voltage plane
    with acceptable tolerance instead of constantly failing voltage
    scaling later on (Lucas Stach)"

    * tag 'pm+acpi-3.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    ACPI / EC: Fix regression due to conflicting firmware behavior between Samsung and Acer.
    Revert "ACPI / EC: Add support to disallow QR_EC to be issued before completing previous QR_EC"
    cpufreq: cpufreq-dt: Restore default cpumask_setall(policy->cpus)
    PM / Sleep: fix recovery during resuming from hibernation
    PM / Sleep: fix async suspend_late/freeze_late error handling
    ACPI: Use ACPI companion to match only the first physical device
    cpufreq: cpufreq-dt: disable unsupported OPPs

    Linus Torvalds
     
  • Pull PCI fixes from Bjorn Helgaas:
    "These changes, intended for v3.18, fix:

    Sysfs
    - Fix "enable" filename change (Greg Kroah-Hartman)

    An unintentional sysfs filename change in commit 5136b2da770d
    ("PCI: convert bus code to use dev_groups"), which appeared in
    v3.13, changed "enable" to "enabled", and this changes it back.

    Old users of "enable" are currently broken and will be helped by
    this change. Anything that started to use "enabled" after v3.13
    will be broken by this change. If necessary, we can add a symlink
    to make both work, but this patch doesn't do that.

    PCI device hotplug
    - Revert duplicate merge (Kamal Mostafa)

    A mistaken duplicate merge that added a check twice. Nothing's
    broken; this just removes the unnecessary code.

    Freescale i.MX6
    - Wait for clocks to stabilize after ref_en (Richard Zhu)

    An i.MX6 clock problem that prevents mx6 nitrogen boards from booting"

    * tag 'pci-v3.18-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
    PCI: Rename sysfs 'enabled' file back to 'enable'
    PCI: imx6: Wait for clocks to stabilize after ref_en
    Revert duplicate "PCI: pciehp: Prevent NULL dereference during probe"

    Linus Torvalds
     
  • Rusty noticed a Really Bad Bug (tm) in my NT fix. The entry code
    reads out of bounds, causing the NT fix to be unreliable. But, and
    this is much, much worse, if your stack is somehow just below the
    top of the direct map (or a hole), you read out of bounds and crash.

    Excerpt from the crash:

    [ 1.129513] RSP: 0018:ffff88001da4bf88 EFLAGS: 00010296

    2b:* f7 84 24 90 00 00 00 testl $0x4000,0x90(%rsp)

    That read is deterministically above the top of the stack. I
    thought I even single-stepped through this code when I wrote it to
    check the offset, but I clearly screwed it up.

    Fixes: 8c7aa698baca ("x86_64, entry: Filter RFLAGS.NT on entry from userspace")
    Reported-by: Rusty Russell
    Cc: stable@vger.kernel.org
    Signed-off-by: Andy Lutomirski
    Signed-off-by: Linus Torvalds

    Andy Lutomirski
     
  • Pull ext4 bugfixes from Ted Ts'o:
    "A set of miscellaneous ext4 bug fixes for 3.18"

    * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
    ext4: make ext4_ext_convert_to_initialized() return proper number of blocks
    ext4: bail early when clearing inode journal flag fails
    ext4: bail out from make_indexed_dir() on first error
    jbd2: use a better hash function for the revoke table
    ext4: prevent bugon on race between write/fcntl
    ext4: remove extent status procfs files if journal load fails
    ext4: disallow changing journal_csum option during remount
    ext4: enable journal checksum when metadata checksum feature enabled
    ext4: fix oops when loading block bitmap failed
    ext4: fix overflow when updating superblock backups after resize

    Linus Torvalds
     
  • Pull quota and ext3 fixes from Jan Kara.

    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
    fs, jbd: use a more generic hash function
    quota: Properly return errors from dquot_writeback_dquots()
    ext3: Don't check quota format when there are no quota files

    Linus Torvalds