01 Jul, 2012

2 commits

  • It was noticed recently that when we send data on a transport, its possible that
    we might bundle a sack that arrived on a different transport. While this isn't
    a major problem, it does go against the SHOULD requirement in section 6.4 of RFC
    2960:

    An endpoint SHOULD transmit reply chunks (e.g., SACK, HEARTBEAT ACK,
    etc.) to the same destination transport address from which it
    received the DATA or control chunk to which it is replying. This
    rule should also be followed if the endpoint is bundling DATA chunks
    together with the reply chunk.

    This patch seeks to correct that. It restricts the bundling of sack operations
    to only those transports which have moved the ctsn of the association forward
    since the last sack. By doing this we guarantee that we only bundle outbound
    saks on a transport that has received a chunk since the last sack. This brings
    us into stricter compliance with the RFC.

    Vlad had initially suggested that we strictly allow only sack bundling on the
    transport that last moved the ctsn forward. While this makes sense, I was
    concerned that doing so prevented us from bundling in the case where we had
    received chunks that moved the ctsn on multiple transports. In those cases, the
    RFC allows us to select any of the transports having received chunks to bundle
    the sack on. so I've modified the approach to allow for that, by adding a state
    variable to each transport that tracks weather it has moved the ctsn since the
    last sack. This I think keeps our behavior (and performance), close enough to
    our current profile that I think we can do this without a sysctl knob to
    enable/disable it.

    Signed-off-by: Neil Horman
    CC: Vlad Yaseivch
    CC: David S. Miller
    CC: linux-sctp@vger.kernel.org
    Reported-by: Michele Baldessari
    Reported-by: sorin serban
    Acked-by: Vlad Yasevich
    Signed-off-by: David S. Miller

    Neil Horman
     
  • Using ethtool -C ethX rx-usecs 0 crashes with a divide by zero.
    Refactor this function to fix this issue and make it more clear
    what the intent of each conditional is. Add comment regarding
    using a setting of zero.

    CC: stable [3.3+]
    CC: David Ahern
    Signed-off-by: Mitch Williams
    Tested-by: Aaron Brown
    Signed-off-by: Jeff Kirsher
    Signed-off-by: David S. Miller

    Mitch A Williams
     

30 Jun, 2012

1 commit

  • Pablo Neira Ayuso says:

    ====================
    The following are 4 fixes and the update of the MAINTAINERS file
    to point to my Netfilter trees.

    They are:

    * One refcount leak fix in IPVS IPv6 support from Eric Dumazet.

    * One fix for interface comparison in ipset hash-netiface sets
    from Florian Westphal.

    * One fix for a missing rcu_read_unlock in nfnetlink from
    Tomasz Bursztyka.

    * One fix for a kernel crash if IPSET_CMD_NONE is set to ipset via
    nfnetlink, again from Tomasz Bursztyka.
    ====================

    Signed-off-by: David S. Miller

    David S. Miller
     

29 Jun, 2012

21 commits

  • Bug added in commit 6b75e3e8d664a9a (netfilter: nfnetlink: add RCU in
    nfnetlink_rcv_msg())

    Signed-off-by: Tomasz Bursztyka
    Acked-by: Eric Dumazet
    Signed-off-by: Pablo Neira Ayuso

    Tomasz Bursztyka
     
  • This patch fixes a crash if that ipset command is sent over nfnetlink.

    Signed-off-by: Tomasz Bursztyka
    Acked-by: Jozsef Kadlecsik
    Signed-off-by: Pablo Neira Ayuso

    Tomasz Bursztyka
     
  • This fixes a number of warnings such as:

    CC drivers/net/ethernet/ti/davinci_cpdma.o
    drivers/net/ethernet/ti/davinci_cpdma.c:279:1: warning: data definition
    has no type or storage class
    drivers/net/ethernet/ti/davinci_cpdma.c:279:1: warning: type defaults to
    ‘int’ in declaration of ‘EXPORT_SYMBOL_GPL’
    drivers/net/ethernet/ti/davinci_cpdma.c:279:1: warning: parameter names
    (without types) in function declaration

    Signed-off-by: Daniel Mack
    Cc: Vaibhav Hiremath
    Cc: David S. Miller
    Cc: Christian Riesch
    Signed-off-by: David S. Miller

    Daniel Mack
     
  • John Linville says:

    ====================
    Amitkumar Karwar gives us two mwifiex fixes: one fixes some skb
    manipulations when handling some event messages; and another that
    does some similar fixing on an error path.

    Avinash Patil gives us a fix for for a memory leak in mwifiex.

    Dan Rosenberg offers an NFC NCI fix to enforce some message length
    limits to prevent buffer overflows.

    Eliad Peller provides a mac80211 fix to prevent some frames from
    being built with an invalid BSSID.

    Eric Dumazet sends an NFC fix to prevent a BUG caused by a NULL
    pointer dereference.

    Felix Fietkau has an ath9k fix for a regression causing
    LEAP-authenticated connection failures.

    Johannes Berg provides an iwlwifi fix that eliminates some log SPAM
    after an authentication/association timeout. He also provides a
    mac80211 fix to prevent incorrectly addressing certain action frames
    (and in so doing, to comply with the 802.11 specs).

    Larry Finger provides a few USB IDs for the rtl8192cu driver --
    should be harmless.

    Panayiotis Karabassis provices a one-liner to fix kernel bug 42903
    (a system freeze).

    Randy Dunlap provides a one-line Kconfig change to prevent build
    failures with some configurations.

    Stone Piao provides an mwifiex sequence numbering fix and a fix
    to prevent mwifiex from attempting to include eapol frames in an
    aggregation frame.

    Finally, Tom Hughes provides an ath9k fix for a NULL pointer
    dereference.
    ====================

    Signed-off-by: David S. Miller

    David S. Miller
     
  • The correct behavior is to program the interrupt coalescing regs
    (RXICr/TXICr) in accordance with the Rx/Tx Q's "rx/txcoalescing"
    flag. That is, if the coalescing flag is 0 for a given Rx/Tx queue
    then the corresponding coalescing register should be cleared.
    This behavior is correctly implemented for the single-queue mode
    (SQ_SG_MODE), but not for the multi-queue mode (MQ_MG_MODE).
    This fixes the later case.

    Signed-off-by: Claudiu Manoil
    Signed-off-by: David S. Miller

    Claudiu Manoil
     
  • Make logging level consistent with other deprecation messages in net
    subsystem.

    Signed-off-by: Vinson Lee
    Cc: David Mackey
    Signed-off-by: David S. Miller

    Vinson Lee
     
  • usbnet_disconnect() will set intfdata to NULL before calling
    the minidriver unbind function. The cdc_wdm subdriver cannot
    know that it is disconnecting until the qmi_wwan unbind
    function has called its disconnect function. This means that
    we must be able to support the cdc_wdm subdriver operating
    normally while usbnet_disconnect() is running, and in
    particular that intfdata may be NULL.

    The only place this matters is in qmi_wwan_cdc_wdm_manage_power
    which is called from cdc_wdm. Simply testing for NULL
    intfdata there is sufficient to allow it to continue working
    at all times.

    Fixes this Oops where a cdc-wdm device was closed while the
    USB device was disconnecting, causing wdm_release to call
    qmi_wwan_cdc_wdm_manage_power after intfdata was set to
    NULL by usbnet_disconnect:

    [41819.087460] BUG: unable to handle kernel NULL pointer dereference at 00000080
    [41819.087815] IP: [] qmi_wwan_manage_power+0x68/0x90 [qmi_wwan]
    [41819.088028] *pdpt = 000000000314f001 *pde = 0000000000000000
    [41819.088028] Oops: 0002 [#1] SMP
    [41819.088028] Modules linked in: qmi_wwan option usb_wwan usbserial usbnet
    cdc_wdm nls_iso8859_1 nls_cp437 vfat fat usb_storage bnep rfcomm bluetooth
    parport_pc ppdev binfmt_misc iptable_nat nf_nat nf_conntrack_ipv4
    nf_conntrack nf_defrag_ipv4 iptable_mangle iptable_filter ip_tables
    x_tables dm_crypt uvcvideo snd_hda_codec_realtek snd_hda_intel
    videobuf2_core snd_hda_codec joydev videodev videobuf2_vmalloc
    hid_multitouch snd_hwdep arc4 videobuf2_memops snd_pcm snd_seq_midi
    snd_rawmidi snd_seq_midi_event ath9k mac80211 snd_seq ath9k_common ath9k_hw
    ath snd_timer snd_seq_device sparse_keymap dm_multipath scsi_dh coretemp
    mac_hid snd soundcore cfg80211 snd_page_alloc psmouse serio_raw microcode
    lp parport dm_mirror dm_region_hash dm_log usbhid hid i915 drm_kms_helper
    drm r8169 i2c_algo_bit wmi video [last unloaded: qmi_wwan]
    [41819.088028]
    [41819.088028] Pid: 23292, comm: qmicli Not tainted 3.4.0-5-generic #11-Ubuntu GIGABYTE T1005/T1005
    [41819.088028] EIP: 0060:[] EFLAGS: 00010246 CPU: 1
    [41819.088028] EIP is at qmi_wwan_manage_power+0x68/0x90 [qmi_wwan]
    [41819.088028] EAX: 00000000 EBX: 00000000 ECX: 000000c3 EDX: 00000000
    [41819.088028] ESI: c3b27658 EDI: 00000000 EBP: c298bea4 ESP: c298be98
    [41819.088028] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
    [41819.088028] CR0: 8005003b CR2: 00000080 CR3: 3605e000 CR4: 000007f0
    [41819.088028] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
    [41819.088028] DR6: ffff0ff0 DR7: 00000400
    [41819.088028] Process qmicli (pid: 23292, ti=c298a000 task=f343b280 task.ti=c298a000)
    [41819.088028] Stack:
    [41819.088028] 00000000 c3b27658 e2a80d00 c298beb0 f864051a c3b27600 c298bec0 f9027099
    [41819.088028] c2fd6000 00000008 c298bef0 c1147f96 00000001 00000000 00000000 f4e54790
    [41819.088028] ecf43a00 ecf43a00 c2fd6008 c2fd6000 ebbd7600 ffffffb9 c298bf08 c1144474
    [41819.088028] Call Trace:
    [41819.088028] [] qmi_wwan_cdc_wdm_manage_power+0x1a/0x20 [qmi_wwan]
    [41819.088028] [] wdm_release+0x69/0x70 [cdc_wdm]
    [41819.088028] [] fput+0xe6/0x210
    [41819.088028] [] filp_close+0x54/0x80
    [41819.088028] [] put_files_struct+0x75/0xc0
    [41819.088028] [] exit_files+0x46/0x60
    [41819.088028] [] do_exit+0x141/0x780
    [41819.088028] [] ? wake_up_state+0xf/0x20
    [41819.088028] [] ? signal_wake_up+0x28/0x40
    [41819.088028] [] ? zap_other_threads+0x6b/0x80
    [41819.088028] [] do_group_exit+0x34/0xa0
    [41819.088028] [] sys_exit_group+0x18/0x20
    [41819.088028] [] sysenter_do_call+0x12/0x28
    [41819.088028] Code: 04 83 e7 01 c1 e7 03 0f b6 42 18 83 e0 f7 09 f8 88 42
    18 8b 43 04 e8 48 9a dd c8 89 f0 8b 5d f4 8b 75 f8 8b 7d fc 89 ec 5d c3 90
    ff 88 80 00 00 00 0f 94 c0 84 c0 75 b7 31 f6 8b 5d f4 89 f0
    [41819.088028] EIP: [] qmi_wwan_manage_power+0x68/0x90 [qmi_wwan] SS:ESP 0068:c298be98
    [41819.088028] CR2: 0000000000000080
    [41819.149492] ---[ end trace 0944479ff8257f55 ]---

    Reported-by: Marius Bjørnstad Kotsbak
    Cc: # v3.4
    Signed-off-by: Bjørn Mork
    Signed-off-by: David S. Miller

    Bjørn Mork
     
  • Pull hwmon changes from Guenter Roeck:
    "Just e-mail address updates"

    * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
    hwmon: Update my e-mail address
    hwmon: (applesmc) correct email address for Jesper Juhl

    Linus Torvalds
     
  • Pull watchdog fixes from Wim Van Sebroeck:
    "This fixes:
    - the WDIOC_GETSTATUS return value
    - the unregister of all NMI events on exit
    - the loading of the iTCO_wdt driver after the conversion to the
    lpc_ich mfd model."

    * git://www.linux-watchdog.org/linux-watchdog:
    watchdog: core: fix WDIOC_GETSTATUS return value
    watchdog: hpwdt: Unregister NMI events on exit.
    watchdog: iTCO_wdt: add platform driver module alias

    Linus Torvalds
     
  • Pull UDF fixes from Jan Kara:
    "Make UDF more robust in presence of corrupted filesystem"

    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
    udf: Fortify loading of sparing table
    udf: Avoid run away loop when partition table length is corrupted
    udf: Use 'ret' instead of abusing 'i' in udf_load_logicalvol()

    Linus Torvalds
     
  • Pull ubi/ubifs fixes from Artem Bityutskiy:
    "Fix the debugfs regression - we never enable it because incorrect
    'IS_ENABLED()' macro usage: should be 'IS_ENABLED(CONFIG_DEBUG_FS)',
    but we had 'IS_ENABLED(DEBUG_FS)'. Also fix incorrect assertion."

    * tag 'upstream-3.5-rc5' of git://git.infradead.org/linux-ubifs:
    UBI: correct usage of IS_ENABLED()
    UBIFS: correct usage of IS_ENABLED()
    UBIFS: fix assertion

    Linus Torvalds
     
  • In commit 7a87982420e5e126bfefeb42232d1fd92052794e we added
    a wrapper for the WDIOC_GETSTATUS ioctl call. The code results
    however in a different behaviour: it returns an error if the
    driver doesn't support the status operation. This is not
    according to the API that says that when we don't support
    the status operation, that we just should return a 0 value.
    Only when the device isn't there anymore, we should return an
    error.

    Signed-off-by: Wim Van Sebroeck

    Wim Van Sebroeck
     
  • This patch is to unregister for NMI events upon exit. Also we are now
    making the default setting for allow_kdump enabled.

    Signed-off-by: Thomas Mingarelli
    Signed-off-by: Wim Van Sebroeck

    Mingarelli, Thomas
     
  • The recent conversion of iTCO_wdt resulted in the driver no longer
    getting loaded automatically, since it no longer has a
    MODULE_DEVICE_TABLE() included. As the lpc_ich driver now creates a
    platform device, auto-loading can easily be done by having a respective
    module alias in place.

    Signed-off-by: Jan Beulich
    Cc: Aaron Sierra
    Acked-by: Guenter Roeck
    Cc: Samuel Ortiz
    Signed-off-by: Wim Van Sebroeck

    Jan Beulich
     
  • Pull drm fixes from Dave Airlie:
    "Nearly all intel, one missing license header in nouveau, nothing
    majorly earth shattering."

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
    Revert "drm/i915: allow PCH PWM override on IVB"
    drm/nouveau: add license header to prime.
    drm/i915: Fix eDP blank screen after S3 resume on HP desktops
    drm/i915: rip out the PM_IIR WARN

    Linus Torvalds
     
  • Pull SuperH fixes from Paul Mundt.

    * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
    sh: Convert sh_clk_mstp32_register to sh_clk_mstp_register
    sh: kfr2r09: fix compile breakage

    Linus Torvalds
     
  • Pull networking update from David Miller:

    1) Pairing and deadlock fixes in bluetooth from Johan Hedberg.

    2) Add device IDs for AR3011 and AR3012 bluetooth chips. From
    Giancarlo Formicuccia and Marek Vasut.

    3) Fix wireless regulatory deadlock, from Eliad Peller.

    4) Fix full TX ring panic in bnx2x driver, from Eric Dumazet.

    5) Revert the two commits that added skb_orphan_try(), it causes
    erratic bonding behavior with UDP clients and the gains it used to
    give are mostly no longer happening due to how BQL works. From Eric
    Dumazet.

    6) It took two tries, but Thomas Graf fixed a problem wherein we
    registered ipv6 routing procfs files before their backend data were
    initialized properly.

    7) Fix max GSO size setting in be2net, from Sarveshwar Bandi.

    8) PHY device id mask is wrong for KSZ9021 and KS8001 chips, fix from
    Jason Wang.

    9) Fix use of stale SKB data pointer after skb_linearize() call in
    batman-adv, from Antonio Quartulli.

    10) Fix memory leak in IXGBE due to missing __GFP_COMP, from Alexander
    Duyck.

    11) Fix probing of Gobi devices in qmi_wwan usbnet driver, from Bjørn
    Mork.

    12) Fix suspend/resume and open failure handling in usbnet from Ming
    Lei.

    13) Attempt to fix device r8169 hangs for certain chips, from Francois
    Romieu.

    14) Fix advancement of RX dirty pointer in some situations in sh_eth
    driver, from Yoshihiro Shimoda.

    15) Attempt to fix restart of IPV6 routing table dumps when there is an
    intervening table update. From Eric Dumazet.

    16) Respect security_inet_conn_request() return value in ipv6 TCP. From
    Neal Cardwell.

    17) Add another iPAD device ID to ipheth driver, from Davide Gerhard.

    18) Fix access to freed SKB in l2tp_eth_dev_xmit(), and fix l2tp lockdep
    splats, from Eric Dumazet.

    19) Make sure all bridge devices, regardless of whether they were
    created via netlink or ioctls, have their rtnetlink ops hooked up.
    From Thomas Graf and Stephen Hemminger.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (81 commits)
    9p: fix min_t() casting in p9pdu_vwritef()
    can: flexcan: use be32_to_cpup to handle the value of dt entry
    xen/netfront: teardown the device before unregistering it.
    bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2)
    vhost: use USER_DS in vhost_worker thread
    ixgbe: Do not pad FCoE frames as this can cause issues with FCoE DDP
    net: l2tp_eth: use LLTX to avoid LOCKDEP splats
    mac802154: add missed braces
    net: l2tp_eth: fix l2tp_eth_dev_xmit race
    net/mlx4_en: Release QP range in free_resources
    net/mlx4: Use single completion vector after NOP failure
    net/mlx4_en: Set correct port parameters during device initialization
    ipheth: add support for iPad
    caif-hsi: Add missing return in error path
    caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost
    caif: Clear shutdown mask to zero at reconnect.
    tcp: heed result of security_inet_conn_request() in tcp_v6_conn_request()
    ipv6: fib: fix fib dump restart
    batman-adv: fix race condition in TT full-table replacement
    batman-adv: only drop packets of known wifi clients
    ...

    Linus Torvalds
     
  • …wireless into for-davem

    John W. Linville
     
  • Add sanity checks when loading sparing table from disk to avoid accessing
    unallocated memory or writing to it.

    Signed-off-by: Jan Kara

    Jan Kara
     
  • Check provided length of partition table so that (possibly maliciously)
    corrupted partition table cannot cause accessing data beyond current buffer.

    Signed-off-by: Jan Kara

    Jan Kara
     
  • Signed-off-by: Jan Kara

    Jan Kara
     

28 Jun, 2012

16 commits

  • Paul Mundt
     
  • sh_clk_mstp32_register is deprecated. This convert to sh_clk_mstp_register.

    Signed-off-by: Nobuhiro Iwamatsu
    Signed-off-by: Paul Mundt

    Nobuhiro Iwamatsu
     
  • Fix compile breakage caused by

    commit aa82f9fcd0062782dcbe29a2c820ba7c04dbe572
    Author: Paul Mundt

    sh: kfr2r09 evt2irq migration.

    Signed-off-by: Guennadi Liakhovetski
    Signed-off-by: Paul Mundt

    Guennadi Liakhovetski
     
  • Marc Kleine-Budde says:

    ====================
    here's a patch intended for v3.5, targeting net/master. Hui Wang has
    found and fixed an endianness problem in the device tree handling in
    the flexcan driver.
    ====================

    Signed-off-by: David S. Miller

    David S. Miller
     
  • I don't think we're actually likely to hit this limit but if we do
    then the comparison should be done as size_t. The original code
    is equivalent to:
    len = strlen(sptr) % USHRT_MAX;

    Signed-off-by: Dan Carpenter
    Signed-off-by: David S. Miller

    Dan Carpenter
     
  • Free ap_custom_ie before return from function.

    Signed-off-by: Avinash Patil
    Signed-off-by: Bing Zhao
    Signed-off-by: John W. Linville

    Avinash Patil
     
  • Pull USB fixes from Greg Kroah-Hartman:
    "Here are some small USB gadget bugfixes, and a few new USB device ids
    added to some drivers for the 3.5-rc5 release.

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'usb-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
    USB: CP210x Add 10 Device IDs
    USB: option: Add USB ID for Novatel Ovation MC551
    usb: phy: Fix Kconfig dependency for Phy drivers
    usb-storage: revert commit afff07e61a52 (Add 090c:1000 to unusal-devs)
    SCSI & usb-storage: add try_rc_10_first flag
    usb: musb: host: release dma channels if no active io
    usb: gadget: lpc32xx_udc: fix build error with debugfs enabled
    usb: otg: twl6030-usb: Fix twl writes
    USB: option: add id for Cellient MEN-200
    usb: dwc3: fix giveback of queued request in ep_dequeue
    usb: gadget: Complete fsl qe/udc driver conversion

    Linus Torvalds
     
  • Pull sound fixes from Takashi Iwai:
    "Here you find quite a few changes for HD-audio and a copule of quirk
    additions for USB-audio. All reasonably small and/or trivial."

    * tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: hda - Fix power-map regression for HP dv6 & co
    ALSA: hda - Initialize caches at codec reconfiguration
    ALSA: hda - Fix memory leaks at module unload
    ALSA: hda - Fix memory leaks in Realtek & Conexant codec parsers
    ALSA: hda - Add Realtek ALC280 codec support
    ALSA: hda - Remove obsoleted CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS
    ASoC: wm8994: remove duplicate code
    ALSA: usb-audio: add BOSS GT-100 support
    ALSA: HDA: Add inverted internal mic quirk for Lenovo S205
    ALSA: hda - Fix ALC272X codec detection
    ALSA: snd_usb_audio: ignore ctrl errors on QuickCam Pro for Notebooks
    ALSA: snd_usb_audio: ignore ctrl errors on QuickCam E3500

    Linus Torvalds
     
  • Pull a m68knommu fix from Greg Ungerer:
    "It contains a single fix for breakage using the Freescale FEC eth
    driver on ColdFire CPUs."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
    m68knommu: define a local devm_clk_get() function

    Linus Torvalds
     
  • Pull MMC fixes from Chris Ball:

    - omap_hsmmc: Using AUTO_CMD12 (enabled by default in 3.5-rc1) has
    been found to cause data corruption on the BeagleBoard, but no
    other OMAP boards so far. Revert the patch until there's a root
    cause explanation that makes sense, at which point we might
    decide to use a blacklist or whitelist.

    - mmc_block: Fix incorrect data timeouts for the case of multiblock
    (ACMD22) writes for block-addressed cards.

    * tag 'mmc-fixes-for-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
    Revert "mmc: omap_hsmmc: Enable Auto CMD12"
    mmc: block: fix the data timeout issue with ACMD22

    Linus Torvalds
     
  • Pull clk common framework fixes from Mike Turquette:
    "This contains three NULL pointer fixes and two device regression
    fixups.

    Two NULL pointer dereferences were in the common clk core due to lack
    of sanity checking and the third NPD was in the mxs-specific clock
    code due to incorrect use of __initdata.

    The device regressions were the result of improper data: a wrong
    string name for matching DT data broke the SPEAr ethernet controller
    and another string matching problem in the mxs clock data resulted in
    a broken MMC controller."

    * tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
    clk: mxs: fix clock lookup after freeing init memory
    clk: mxs: fix ref_io clock definition
    clk: Check parent for NULL in clk_change_rate
    clk: Allow late cache allocation for clk->parents
    clk: SPEAr600: Fix ethernet clock name for DT based probing

    Linus Torvalds
     
  • This script lacks an executable bit.

    Signed-off-by: Dave Jones
    Signed-off-by: Linus Torvalds

    Dave Jones
     
  • Daniel writes:
    "Two tiny patches and one revert:
    - Kill a bogus error message introduced in 3.4, further Bspec reading
    indicates that this is how the hw is supposed to work.
    - Reorder one backlight register restore, fixing broken backlight on some
    machines after resume.
    - Revert a hack from Jesse for ivb backlight control - it breaks the
    backlight controls on my shiny new ivb laptop."

    * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
    Revert "drm/i915: allow PCH PWM override on IVB"
    drm/i915: Fix eDP blank screen after S3 resume on HP desktops
    drm/i915: rip out the PM_IIR WARN

    Dave Airlie
     
  • Commit 3a2923e83c introduced a bug when a corrupt descriptor
    is encountered - although the following descriptor is discarded
    and returned to the queue for reuse the associated frame is
    also returned for processing. This leads to a panic:

    BUG: unable to handle kernel NULL pointer dereference at 000000000000003a
    IP: [] ath_rx_tasklet+0x165/0x1b00 [ath9k]
    Call Trace:

    [] ? map_single+0x60/0x60
    [] ? ath9k_ioread32+0x34/0x90 [ath9k]
    [] athk9k_tasklet+0xdc/0x160 [ath9k]
    [] tasklet_action+0x63/0xd0
    [] __do_softirq+0xc0/0x1e0
    [] ? native_sched_clock+0x13/0x80
    [] call_softirq+0x1c/0x30
    [] do_softirq+0x75/0xb0
    [] irq_exit+0xb5/0xc0
    [] do_IRQ+0x63/0xe0
    [] common_interrupt+0x6a/0x6a

    [] ? intel_idle+0xea/0x150
    [] ? intel_idle+0xcb/0x150
    [] cpuidle_enter+0x19/0x20
    [] cpuidle_idle_call+0xa9/0x240
    [] cpu_idle+0xaf/0x120
    [] rest_init+0x72/0x74
    [] start_kernel+0x3b7/0x3c4
    [] ? repair_env_string+0x5e/0x5e
    [] x86_64_start_reservations+0x131/0x135
    [] x86_64_start_kernel+0x100/0x10f

    Making sure bf is cleared to NULL in this case restores the
    old behaviour.

    Signed-off-by: Tom Hughes
    Signed-off-by: John W. Linville

    Tom Hughes
     
  • When receiving an "individually addressed" action frame, the
    receiver is required to return it to the sender. mac80211
    gets this wrong as it also returns group addressed (mcast)
    frames to the sender. Fix this and update the reference to
    the new 802.11 standards version since things were shuffled
    around significantly.

    Cc: stable@kernel.org
    Signed-off-by: Johannes Berg
    Signed-off-by: John W. Linville

    Johannes Berg
     
  • https://bugzilla.kernel.org/show_bug.cgi?id=42903

    Based on the work of

    Signed-off-by: Panayiotis Karabassis
    Cc: stable@vger.kernel.org
    Signed-off-by: John W. Linville

    Panayiotis Karabassis