Skip to content
Commits on Oct 31, 2012
  1. Merge branch 'version-3.6' into pf-3.6

    Oleksandr Natalenko committed Oct 31, 2012
  2. Merge branch 'distro-3.6' into pf-3.6

    Oleksandr Natalenko committed Oct 31, 2012
  3. distro-3.6: bump to v3.6.7-pf

    Oleksandr Natalenko committed Oct 31, 2012
  4. version-3.6: bump to v3.6.7-pf

    Oleksandr Natalenko committed Oct 31, 2012
  5. Merge branch 'emergency-fixes-3.6' into pf-3.6

    Oleksandr Natalenko committed Oct 31, 2012
  6. ext4: fix unjournaled inode bitmap modification

    commit 119c0d4 changed
    ext4_new_inode() such that the inode bitmap was being modified
    outside a transaction, which could lead to corruption, and was
    discovered when journal_checksum found a bad checksum in the
    journal during log replay.
    
    Nix ran into this when using the journal_async_commit mount
    option, which enables journal checksumming.  The ensuing
    journal replay failures due to the bad checksums led to
    filesystem corruption reported as the now infamous
    "Apparent serious progressive ext4 data corruption bug"
    
    [ Changed by tytso to only call ext4_journal_get_write_access() only
      when we're fairly certain that we're going to allocate the inode. ]
    
    I've tested this by mounting with journal_checksum and
    running fsstress then dropping power; I've also tested by
    hacking DM to create snapshots w/o first quiescing, which
    allows me to test journal replay repeatedly w/o actually
    power-cycling the box.  Without the patch I hit a journal
    checksum error every time.  With this fix it survives
    many iterations.
    
    Reported-by: Nix <nix@esperi.org.uk>
    Signed-off-by: Eric Sandeen <sandeen@redhat.com>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Cc: stable@vger.kernel.org
    Eric Sandeen committed with Oleksandr Natalenko Oct 28, 2012
  7. fix merge conflict

    Oleksandr Natalenko committed Oct 31, 2012
  8. Merge branch 'emergency-fixes-3.6' into pf-3.6

    Oleksandr Natalenko committed Oct 31, 2012
  9. Revert "jbd2: fix a potential fs corrupting bug in jbd2_mark_journal_…

    …empty"
    
    This reverts commit 8b543ee.
    Oleksandr Natalenko committed Oct 31, 2012
  10. @gregkh

    Linux 3.6.5

    gregkh committed Oct 31, 2012
  11. @bergwolf @gregkh

    pnfsblock: fix non-aligned DIO write

    commit 96c9eae upstream.
    
    For DIO writes, if it is not blocksize aligned, we need to do
    internal serialization. It may slow down writers anyway. So we
    just bail them out and resend to MDS.
    
    Signed-off-by: Peng Tao <tao.peng@emc.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    bergwolf committed with gregkh Aug 24, 2012
  12. @bergwolf @gregkh

    pnfsblock: fix non-aligned DIO read

    commit f742dc4 upstream.
    
    For DIO read, if it is not sector aligned, we should reject it
    and resend via MDS. Otherwise there might be data corruption.
    Also teach bl_read_pagelist to handle partial page reads for DIO.
    
    Signed-off-by: Peng Tao <tao.peng@emc.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    bergwolf committed with gregkh Aug 24, 2012
  13. @gregkh

    x86, mm: Use memblock memory loop instead of e820_RAM

    commit 1f2ff68 upstream.
    
    We need to handle E820_RAM and E820_RESERVED_KERNEL at the same time.
    
    Also memblock has page aligned range for ram, so we could avoid mapping
    partial pages.
    
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Link: http://lkml.kernel.org/r/CAE9FiQVZirvaBMFYRfXMmWEcHbKSicQEHz4VAwUv0xFCk51ZNw@mail.gmail.com
    Acked-by: Jacob Shin <jacob.shin@amd.com>
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Yinghai Lu committed with gregkh Oct 22, 2012
  14. @olofj @gregkh

    x86: efi: Turn off efi_enabled after setup on mixed fw/kernel

    commit 5189c2a upstream.
    
    When 32-bit EFI is used with 64-bit kernel (or vice versa), turn off
    efi_enabled once setup is done. Beyond setup, it is normally used to
    determine if runtime services are available and we will have none.
    
    This will resolve issues stemming from efivars modprobe panicking on a
    32/64-bit setup, as well as some reboot issues on similar setups.
    
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=45991
    
    Reported-by: Marko Kohtala <marko.kohtala@gmail.com>
    Reported-by: Maxim Kammerer <mk@dee.su>
    Signed-off-by: Olof Johansson <olof@lixom.net>
    Acked-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
    Cc: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    olofj committed with gregkh Oct 24, 2012
  15. @joshtriplett @gregkh

    efi: Defer freeing boot services memory until after ACPI init

    commit 7851079 upstream.
    
    Some new ACPI 5.0 tables reference resources stored in boot services
    memory, so keep that memory around until we have ACPI and can extract
    data from it.
    
    Signed-off-by: Josh Triplett <josh@joshtriplett.org>
    Link: http://lkml.kernel.org/r/baaa6d44bdc4eb0c58e5d1b4ccd2c729f854ac55.1348876882.git.josh@joshtriplett.org
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    Cc: Matt Fleming <matt@console-pimps.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    joshtriplett committed with gregkh Sep 28, 2012
  16. @sgruszka @gregkh

    cfg80211/mac80211: avoid state mishmash on deauth

    commit 6863255 upstream.
    
    Avoid situation when we are on associate state in mac80211 and
    on disassociate state in cfg80211. This can results on crash
    during modules unload (like showed on this thread:
    http://marc.info/?t=134373976300001&r=1&w=2) and possibly other
    problems.
    
    Reported-by: Pedro Francisco <pedrogfrancisco@gmail.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    sgruszka committed with gregkh Oct 15, 2012
  17. @gregkh

    x86, mm: Undo incorrect revert in arch/x86/mm/init.c

    commit f82f64d upstream.
    
    Commit
    
        844ab6f x86, mm: Find_early_table_space based on ranges that are actually being mapped
    
    added back some lines back wrongly that has been removed in commit
    
        7b16bbf Revert "x86/mm: Fix the size calculation of mapping tables"
    
    remove them again.
    
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Link: http://lkml.kernel.org/r/CAE9FiQW_vuaYQbmagVnxT2DGsYc=9tNeAbdBq53sYkitPOwxSQ@mail.gmail.com
    Acked-by: Jacob Shin <jacob.shin@amd.com>
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Yinghai Lu committed with gregkh Oct 25, 2012
  18. @gregkh

    x86, mm: Find_early_table_space based on ranges that are actually bei…

    …ng mapped
    
    commit 844ab6f upstream.
    
    Current logic finds enough space for direct mapping page tables from 0
    to end. Instead, we only need to find enough space to cover mr[0].start
    to mr[nr_range].end -- the range that is actually being mapped by
    init_memory_mapping()
    
    This is needed after 1bbbbe7, to address
    the panic reported here:
    
      https://lkml.org/lkml/2012/10/20/160
      https://lkml.org/lkml/2012/10/21/157
    
    Signed-off-by: Jacob Shin <jacob.shin@amd.com>
    Link: http://lkml.kernel.org/r/20121024195311.GB11779@jshin-Toonie
    Tested-by: Tom Rini <trini@ti.com>
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Jacob Shin committed with gregkh Oct 24, 2012
  19. @gregkh

    Revert "ath9k_hw: Updated AR9003 tx gain table for 5GHz"

    commit 73b26df upstream.
    
    This reverts commit a240dc7.
    
    This commit is reducing tx power by at least 10 db on some devices,
    e.g. the Buffalo WZR-HP-G450H.
    
    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Cc: rmanohar@qca.qualcomm.com
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Felix Fietkau committed with gregkh Oct 17, 2012
  20. @gregkh

    cpufreq / powernow-k8: Remove usage of smp_processor_id() in preempti…

    …ble code
    
    commit e4df1cb upstream.
    
    Commit 6889125
    (cpufreq/powernow-k8: workqueue user shouldn't migrate the kworker to another CPU)
    causes powernow-k8 to trigger a preempt warning, e.g.:
    
      BUG: using smp_processor_id() in preemptible [00000000] code: cpufreq/3776
      caller is powernowk8_target+0x20/0x49
      Pid: 3776, comm: cpufreq Not tainted 3.6.0 #9
      Call Trace:
       [<ffffffff8125b447>] debug_smp_processor_id+0xc7/0xe0
       [<ffffffff814877e7>] powernowk8_target+0x20/0x49
       [<ffffffff81482b02>] __cpufreq_driver_target+0x82/0x8a
       [<ffffffff81484fc6>] cpufreq_governor_performance+0x4e/0x54
       [<ffffffff81482c50>] __cpufreq_governor+0x8c/0xc9
       [<ffffffff81482e6f>] __cpufreq_set_policy+0x1a9/0x21e
       [<ffffffff814839af>] store_scaling_governor+0x16f/0x19b
       [<ffffffff81484f16>] ? cpufreq_update_policy+0x124/0x124
       [<ffffffff8162b4a5>] ? _raw_spin_unlock_irqrestore+0x2c/0x49
       [<ffffffff81483640>] store+0x60/0x88
       [<ffffffff811708c0>] sysfs_write_file+0xf4/0x130
       [<ffffffff8111243b>] vfs_write+0xb5/0x151
       [<ffffffff811126e0>] sys_write+0x4a/0x71
       [<ffffffff816319a9>] system_call_fastpath+0x16/0x1b
    
    Fix this by by always using work_on_cpu().
    
    Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Andreas Herrmann committed with gregkh Oct 23, 2012
  21. @stanislav-yakovlev @gregkh

    net/wireless: ipw2200: Fix panic occurring in ipw_handle_promiscuous_…

    …tx()
    
    commit bf11315 upstream.
    
    The driver does not count space of radiotap fields when allocating skb for
    radiotap packet. This leads to kernel panic with the following call trace:
    
    ...
    [67607.676067] [<c152f90f>] error_code+0x67/0x6c
    [67607.676067] [<c142f831>] ? skb_put+0x91/0xa0
    [67607.676067] [<f8cf5e5b>] ? ipw_handle_promiscuous_tx+0x16b/0x2d0 [ipw2200]
    [67607.676067] [<f8cf5e5b>] ipw_handle_promiscuous_tx+0x16b/0x2d0 [ipw2200]
    [67607.676067] [<f8cf899b>] ipw_net_hard_start_xmit+0x8b/0x90 [ipw2200]
    [67607.676067] [<f8741c5a>] libipw_xmit+0x55a/0x980 [libipw]
    [67607.676067] [<c143d3e8>] dev_hard_start_xmit+0x218/0x4d0
    ...
    
    This bug was found by VittGam.
    https://bugzilla.kernel.org/show_bug.cgi?id=43255
    
    Signed-off-by: Stanislav Yakovlev <stas.yakovlev@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    stanislav-yakovlev committed with gregkh Oct 15, 2012
  22. @gluedig @gregkh

    bcma: fix unregistration of cores

    commit 1fffa90 upstream.
    
    When cores are unregistered, entries
    need to be removed from cores list in a safe manner.
    
    Reported-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Reviewed-by: Arend Van Spriel <arend@broadcom.com>
    Signed-off-by: Piotr Haber <phaber@broadcom.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    gluedig committed with gregkh Oct 11, 2012
  23. @jmberg @gregkh

    iwlwifi: fix 6000 series channel switch command

    commit 8f7b8db upstream.
    
    The channel switch command for 6000 series devices
    is larger than the maximum inline command size of
    320 bytes. The command is therefore refused with a
    warning. Fix this by allocating the command and
    using the NOCOPY mechanism.
    
    Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jmberg committed with gregkh Sep 25, 2012
  24. @gregkh

    dmaengine: imx-dma: fix missing unlock on error in imxdma_xfer_desc()

    commit 720dfd2 upstream.
    
    Add the missing unlock on the error handling path in function
    imxdma_xfer_desc().
    
    Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Wei Yongjun committed with gregkh Oct 21, 2012
  25. @21cnbao @gregkh

    dmaengine: sirf: fix a typo in moving running dma_desc to active queue

    commit 26fd122 upstream.
    
    list_move_tail(&schan->queued, &schan->active) makes the list_empty(schan->queued)
    undefined, we either should change it to:
    list_move_tail(schan->queued.next, &schan->active)
    or
    list_move_tail(&sdesc->node, &schan->active)
    
    Signed-off-by: Barry Song <Baohua.Song@csr.com>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    21cnbao committed with gregkh Sep 27, 2012
  26. @21cnbao @gregkh

    dmaengine: sirf: fix a typo in dma_prep_interleaved

    commit 5997e08 upstream.
    
    either DEV_TO_MEM or MEM_TO_DEV is supported, so change
    OR to AND.
    
    Signed-off-by: Barry Song <Baohua.Song@csr.com>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    21cnbao committed with gregkh Sep 27, 2012
  27. @utrace @gregkh

    freezer: exec should clear PF_NOFREEZE along with PF_KTHREAD

    commit b40a795 upstream.
    
    flush_old_exec() clears PF_KTHREAD but forgets about PF_NOFREEZE.
    
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    utrace committed with gregkh Oct 25, 2012
  28. @dcbw @gregkh

    qmi_wwan/cdc_ether: move Novatel 551 and E362 to qmi_wwan

    commit f8295ec upstream.
    
    These devices provide QMI and ethernet functionality via a standard CDC
    ethernet descriptor.  But when driven by cdc_ether, the QMI
    functionality is unavailable because only cdc_ether can claim the USB
    interface.  Thus blacklist the devices in cdc_ether and add their IDs to
    qmi_wwan, which enables both QMI and ethernet simultaneously.
    
    Signed-off-by: Dan Williams <dcbw@redhat.com>
    Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Acked-by: Bjørn Mork <bjorn@mork.no>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    dcbw committed with gregkh Oct 24, 2012
  29. @jhedberg @gregkh

    Bluetooth: SMP: Fix setting unknown auth_req bits

    commit 065a13e upstream.
    
    When sending a pairing request or response we should not just blindly
    copy the value that the remote device sent. Instead we should at least
    make sure to mask out any unknown bits. This is particularly critical
    from the upcoming LE Secure Connections feature perspective as
    incorrectly indicating support for it (by copying the remote value)
    would cause a failure to pair with devices that support it.
    
    Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
    Acked-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jhedberg committed with gregkh Oct 11, 2012
  30. @cmetcalf-tilera @gregkh

    tilegx: fix some issues in the SW TSO support

    commit 3da3fff upstream.
    
    This change correctly computes the header length and data length in
    the fragments to avoid a bug where we would end up with extremely
    slow performance.  Also adopt use of skb_frag_size() accessor.
    
    Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    cmetcalf-tilera committed with gregkh Oct 25, 2012
  31. @lwfinger @gregkh

    b43: Fix oops on unload when firmware not found

    commit f89ff64 upstream.
    
    When b43 fails to find firmware when loaded, a subsequent unload will
    oops due to calling ieee80211_unregister_hw() when the corresponding
    register call was never made.
    
    Commit 2d838bb fixed the same problem
    for b43legacy.
    
    Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
    Tested-by: Markus Kanet <dvmailing@gmx.eu>
    Cc: Markus Kanet <dvmailing@gmx.eu>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    lwfinger committed with gregkh Oct 24, 2012
  32. @gregkh

    mac80211: use ieee80211_free_txskb in a few more places

    commit d4fa14c upstream.
    
    Free tx status skbs when draining power save buffers, pending frames, or
    when tearing down a vif.
    Fixes remaining conditions that can lead to hostapd/wpa_supplicant hangs when
    running out of socket write memory.
    
    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Felix Fietkau committed with gregkh Oct 10, 2012
  33. @sgruszka @gregkh

    mac80211: check if key has TKIP type before updating IV

    commit 4045f72 upstream.
    
    This patch fix corruption which can manifest itself by following crash
    when switching on rfkill switch with rt2x00 driver:
    https://bugzilla.redhat.com/attachment.cgi?id=615362
    
    Pointer key->u.ccmp.tfm of group key get corrupted in:
    
    ieee80211_rx_h_michael_mic_verify():
    
            /* update IV in key information to be able to detect replays */
            rx->key->u.tkip.rx[rx->security_idx].iv32 = rx->tkip_iv32;
            rx->key->u.tkip.rx[rx->security_idx].iv16 = rx->tkip_iv16;
    
    because rt2x00 always set RX_FLAG_MMIC_STRIPPED, even if key is not TKIP.
    
    We already check type of the key in different path in
    ieee80211_rx_h_michael_mic_verify() function, so adding additional
    check here is reasonable.
    
    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    sgruszka committed with gregkh Oct 2, 2012
  34. @jmberg @gregkh

    mac80211: connect with HT20 if HT40 is not permitted

    commit 3a40414 upstream.
    
    Some changes to fix issues with HT40 APs in Korea
    and follow-up changes to allow using HT40 even if
    the local regulatory database disallows it caused
    issues with iwlwifi (and could cause issues with
    other devices); iwlwifi firmware would assert if
    you tried to connect to an AP that has an invalid
    configuration (e.g. using HT40- on channel 140.)
    
    Fix this, while avoiding the "Korean AP" issue by
    disabling HT40 and advertising HT20 to the AP
    when connecting.
    
    Reported-by: Florian Reitmeir <florian@reitmeir.org>
    Tested-by: Florian Reitmeir <florian@reitmeir.org>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    jmberg committed with gregkh Oct 1, 2012
Something went wrong with that request. Please try again.