Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Nov 11, 2012
  1. Linux 3.7-rc5

    authored
Commits on Nov 10, 2012
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

    authored
    Pull networking fixes from David Miller:
     "Bug fixes galore, mostly in drivers as is often the case:
    
      1) USB gadget and cdc_eem drivers need adjustments to their frame size
         lengths in order to handle VLANs correctly.  From Ian Coolidge.
    
      2) TIPC and several network drivers erroneously call tasklet_disable
         before tasklet_kill, fix from Xiaotian Feng.
    
      3) r8169 driver needs to apply the WOL suspend quirk to more chipsets,
         fix from Cyril Brulebois.
    
      4) Fix multicast filters on RTL_GIGA_MAC_VER_35 r8169 chips, from
         Nathan Walp.
    
      5) FDB netlink dumps should use RTM_NEWNEIGH as the message type, not
         zero.  From John Fastabend.
    
      6) Fix smsc95xx tx checksum offload on big-endian, from Steve
         Glendinning.
    
      7) __inet_diag_dump() needs to repsect and report the error value
         returned from inet_diag_lock_handler() rather than ignore it.
         Otherwise if an inet diag handler is not available for a particular
         protocol, we essentially report success instead of giving an error
         indication.  Fix from Cyrill Gorcunov.
    
      8) When the QFQ packet scheduler sees TSO/GSO packets it does not
         handle things properly, and in fact ends up corrupting it's
         datastructures as well as mis-schedule packets.  Fix from Paolo
         Valente.
    
      9) Fix oopser in skb_loop_sk(), from Eric Leblond.
    
      10) CXGB4 passes partially uninitialized datastructures in to FW
          commands, fix from Vipul Pandya.
    
      11) When we send unsolicited ipv6 neighbour advertisements, we should
          send them to the link-local allnodes multicast address, as per
          RFC4861.  Fix from Hannes Frederic Sowa.
    
      12) There is some kind of bug in the usbnet's kevent deferral
          mechanism, but more immediately when it triggers an uncontrolled
          stream of kernel messages spam the log.  Rate limit the error log
          message triggered when this problem occurs, as sending thousands
          of error messages into the kernel log doesn't help matters at all,
          and in fact makes further diagnosis more difficult.
    
          From Steve Glendinning.
    
      13) Fix gianfar restore from hibernation, from Wang Dongsheng.
    
      14) The netlink message attribute sizes are wrong in the ipv6 GRE
          driver, it was using the size of ipv4 addresses instead of ipv6
          ones :-) Fix from Nicolas Dichtel."
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
      gre6: fix rtnl dump messages
      gianfar: ethernet vanishes after restoring from hibernation
      usbnet: ratelimit kevent may have been dropped warnings
      ipv6: send unsolicited neighbour advertisements to all-nodes
      net: usb: cdc_eem: Fix rx skb allocation for 802.1Q VLANs
      usb: gadget: g_ether: fix frame size check for 802.1Q
      cxgb4: Fix initialization of SGE_CONTROL register
      isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES
      cxgb4: Initialize data structures before using.
      af-packet: fix oops when socket is not present
      pkt_sched: enable QFQ to support TSO/GSO
      net: inet_diag -- Return error code if protocol handler is missed
      net: bnx2x: Fix typo in bnx2x driver
      smsc95xx: fix tx checksum offload for big endian
      rtnetlink: Use nlmsg type RTM_NEWNEIGH from dflt fdb dump
      ptp: update adjfreq callback description
      r8169: allow multicast packets on sub-8168f chipset.
      r8169: Fix WoL on RTL8168d/8111d.
      drivers/net: use tasklet_kill in device remove/close process
      tipc: do not use tasklet_disable before tasklet_kill
  2. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

    authored
    Pull sparc fixes from David Miller:
     "Several build/bug fixes for sparc, including:
    
      1) Configuring a mix of static vs.  modular sparc64 crypto modules
         didn't work, remove an ill-conceived attempt to only have to build
         the device match table for these drivers once to fix the problem.
    
         Reported by Meelis Roos.
    
      2) Make the montgomery multiple/square and mpmul instructions actually
         usable in 32-bit tasks.  Essentially this involves providing 32-bit
         userspace with a way to use a 64-bit stack when it needs to.
    
      3) Our sparc64 atomic backoffs don't yield cpu strands properly on
         Niagara chips.  Use pause instruction when available to achieve
         this, otherwise use a benign instruction we know blocks the strand
         for some time.
    
      4) Wire up kcmp
    
      5) Fix the build of various drivers by removing the unnecessary
         blocking of OF_GPIO when SPARC.
    
      6) Fix unintended regression wherein of_address_to_resource stopped
         being provided.  Fix from Andreas Larsson.
    
      7) Fix NULL dereference in leon_handle_ext_irq(), also from Andreas
         Larsson."
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
      sparc64: Fix build with mix of modular vs. non-modular crypto drivers.
      sparc: Support atomic64_dec_if_positive properly.
      of/address: sparc: Declare of_address_to_resource() as an extern function for sparc again
      sparc32, leon: Check for existent irq_map entry in leon_handle_ext_irq
      sparc: Add sparc support for platform_get_irq()
      sparc: Allow OF_GPIO on sparc.
      qlogicpti: Fix build warning.
      sparc: Wire up sys_kcmp.
      sparc64: Improvde documentation and readability of atomic backoff code.
      sparc64: Use pause instruction when available.
      sparc64: Fix cpu strand yielding.
      sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.
  3. Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

    authored
    Pull cifs fixes from Jeff Layton.
    
    * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
      cifs: Do not lookup hashed negative dentry in cifs_atomic_open
      cifs: fix potential buffer overrun in cifs.idmap handling code
  4. Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    authored
    …git/cmarinas/linux-aarch64
    
    Pull arm64 fixes from Catalin Marinas:
     - correct argument type (pgprot_t) when calling __ioremap()
     - PCI_IOBASE virtual address change
     - use architected event for CPU cycle counter
     - fix ELF core dumping
     - select CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION
     - missing completion for secondary CPU boot
     - booting on systems with all memory beyond 4GB
    
    * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
      arm64: mm: fix booting on systems with no memory below 4GB
      arm64: smp: add missing completion for secondary boot
      arm64: compat: select CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION
      arm64: elf: fix core dumping definitions for GP and FP registers
      arm64: perf: use architected event for CPU cycle counter
      arm64: Move PCI_IOBASE closer to MODULES_VADDR
      arm64: Use pgprot_t as the last argument when invoking __ioremap()
  5. Merge tag 'stable/for-linus-3.7-rc5-tag' of git://git.kernel.org/pub/…

    authored
    …scm/linux/kernel/git/konrad/xen
    
    Pull Xen fixes from Konrad Rzeszutek Wilk:
     "There are three ARM compile fixes (we forgot to export certain
      functions and if the drivers are built as an module - we go belly-up).
    
      There is also an mismatch of irq_enter() / exit_idle() calls sequence
      which were fixed some time ago in other piece of codes, but failed to
      appear in the Xen code.
    
      Lastly a fix for to help in the field with troubleshooting in case we
      cannot get the appropriate parameter and also fallback code when
      working with very old hypervisors."
    
    Bug-fixes:
     - Fix compile issues on ARM.
     - Fix hypercall fallback code for old hypervisors.
     - Print out which HVM parameter failed if it fails.
     - Fix idle notifier call after irq_enter.
    
    * tag 'stable/for-linus-3.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen/arm: Fix compile errors when drivers are compiled as modules (export more).
      xen/arm: Fix compile errors when drivers are compiled as modules.
      xen/generic: Disable fallback build on ARM.
      xen/events: fix RCU warning, or Call idle notifier after irq_enter()
      xen/hvm: If we fail to fetch an HVM parameter print out which flag it is.
      xen/hypercall: fix hypercall fallback code for very old hypervisors
  6. @davem330

    sparc64: Fix build with mix of modular vs. non-modular crypto drivers.

    davem330 authored
    We tried linking in a single built object to hold the device table,
    but only works if all of the sparc64 crypto modules get built the same
    way (modular vs. non-modular).
    
    Just include the device ID stub into each driver source file so that
    the table gets compiled into the correct result in all cases.
    
    Reported-by: Meelis Roos <mroos@linux.ee>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  7. @davem330

    sparc: Support atomic64_dec_if_positive properly.

    davem330 authored
    Sparc32 already supported it, as a consequence of using the
    generic atomic64 implementation.  And the sparc64 implementation
    is rather trivial.
    
    This allows us to set ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE for all
    of sparc, and avoid the annoying warning from lib/atomic64_test.c
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. @andreas-gaisler @davem330

    of/address: sparc: Declare of_address_to_resource() as an extern func…

    andreas-gaisler authored davem330 committed
    …tion for sparc again
    
    This bug-fix makes sure that of_address_to_resource is defined extern for sparc
    so that the sparc-specific implementation of of_address_to_resource() is once
    again used when including include/linux/of_address.h in a sparc context. A
    number of drivers in mainline relies on this function working for sparc.
    
    The bug was introduced in a850a75, "of/address:
    add empty static inlines for !CONFIG_OF". Contrary to that commit title, the
    static inlines are added for !CONFIG_OF_ADDRESS, and CONFIG_OF_ADDRESS is never
    defined for sparc. This is good behavior for the other functions in
    include/linux/of_address.h, as the extern functions defined in
    drivers/of/address.c only gets linked when OF_ADDRESS is configured. However,
    for of_address_to_resource there exists a sparc-specific implementation in
    arch/sparc/arch/sparc/kernel/of_device_common.c
    
    Solution suggested by: Sam Ravnborg <sam@ravnborg.org>
    
    Signed-off-by: Andreas Larsson <andreas@gaisler.com>
    Acked-by: Rob Herring <rob.herring@calxeda.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  9. @andreas-gaisler @davem330

    sparc32, leon: Check for existent irq_map entry in leon_handle_ext_irq

    andreas-gaisler authored davem330 committed
    If an irq is being unlinked concurrently with leon_handle_ext_irq,
    irq_map[eirq] might be null in leon_handle_ext_irq. Make sure that
    this is not dereferenced.
    
    Signed-off-by: Andreas Larsson <andreas@gaisler.com>
    Acked-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  10. @andreas-gaisler @davem330

    sparc: Add sparc support for platform_get_irq()

    andreas-gaisler authored davem330 committed
    This adds sparc support for platform_get_irq that in the normal case use
    platform_get_resource() to get an irq. This standard approach fails for sparc as
    there are no resources of type IORESOURCE_IRQ for irqs for sparc.
    
    Cross platform drivers can then use this standard platform function and work on
    sparc instead of having to have a special case for sparc.
    
    Signed-off-by: Andreas Larsson <andreas@gaisler.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Nov 9, 2012
  1. @NicolasDichtel @davem330

    gre6: fix rtnl dump messages

    NicolasDichtel authored davem330 committed
    Spotted after a code review.
    Introduced by c12b395 (gre: Support GRE over
    IPv6).
    
    Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
    Acked-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. @davem330

    gianfar: ethernet vanishes after restoring from hibernation

    Wang Dongsheng authored davem330 committed
    If a gianfar ethernet device is down prior to hibernating a
    system, it will no longer be present upon system restore.
    
    For example:
    
    	~# ifconfig eth0 down
    	~# echo disk > /sys/power/state
    
    	  <trigger a restore from hibernation>
    
    	~# ifconfig eth0 up
    	SIOCSIFFLAGS: No such device
    
    This happens because the restore function bails out early upon
    finding devices that were not up at hibernation.  In doing so,
    it never gets to the netif_device_attach call at the end of
    the restore function.  Adding the netif_device_attach as done
    here also makes the gfar_restore code consistent with what is
    done in the gfar_resume code.
    
    Cc: Claudiu Manoil <claudiu.manoil@freescale.com>
    Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    Acked-by: Claudiu Manoil <claudiu.manoil@freescale.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. @steveglen @davem330

    usbnet: ratelimit kevent may have been dropped warnings

    steveglen authored davem330 committed
    when something goes wrong, a flood of these messages can be
    generated by usbnet (thousands per second).  This doesn't
    generally *help* the condition so this patch ratelimits the
    rate of their generation.
    
    There's an underlying problem in usbnet's kevent deferral
    mechanism which needs fixing, specifically that events *can*
    get dropped and not handled.  This patch doesn't address this,
    but just mitigates fallout caused by the current implemention.
    
    Signed-off-by: Steve Glendinning <steve.glendinning@shawell.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. @hannes @davem330

    ipv6: send unsolicited neighbour advertisements to all-nodes

    hannes authored davem330 committed
    As documented in RFC4861 (Neighbor Discovery for IP version 6) 7.2.6.,
    unsolicited neighbour advertisements should be sent to the all-nodes
    multicast address.
    
    Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    authored
    Pull drm fixes (again) from Dave Airlie:
     "dropped the ball on a vmware patch, so two more fixes for vmwgfx are
      here, one for hibernate issue, one for a BUG trigger."
    
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/vmwgfx: Fix a case where the code would BUG when trying to pin GMR memory
      drm/vmwgfx: Fix hibernation device reset
  6. Merge tag '3.7-pci-fixes' of git://git.kernel.org/pub/scm/linux/kerne…

    authored
    …l/git/helgaas/pci
    
    Pull PCI fixes from Bjorn Helgaas:
     "Power management:
        - PCI/PM: Fix proc config reg access for D3cold and bridge
          suspending
        - PCI/PM: Resume device before shutdown
        - PCI/PM: Fix deadlock when unbinding device if parent in D3cold
      Hotplug:
        -  PCI/portdrv: Don't create hotplug slots unless port supports
           hotplug"
    
    * tag '3.7-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
      PCI/portdrv: Don't create hotplug slots unless port supports hotplug
      PCI/PM: Fix proc config reg access for D3cold and bridge suspending
      PCI/PM: Resume device before shutdown
      PCI/PM: Fix deadlock when unbinding device if parent in D3cold
  7. Merge tag 'mmc-fixes-for-3.7-rc5' of git://git.kernel.org/pub/scm/lin…

    authored
    …ux/kernel/git/cjb/mmc
    
    Pull MMC fixes from Chris Ball:
     - sdhci: fix a NULL dereference at resume-time, seen on OLPC XO-4
     - sdhci: fix against 3.7-rc1 for UHS modes without a vqmmc regulator
     - sdhci-of-esdhc: disable CMD23 on boards where it's broken
     - sdhci-s3c: fix against 3.7-rc1 for card detection with runtime PM
     - dw_mmc, omap_hsmmc: fix potential NULL derefs, compiler warnings
    
    * tag 'mmc-fixes-for-3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
      mmc: sdhci-s3c: fix the card detection in runtime-pm
      mmc: sdhci-s3c: use clk_prepare_enable and clk_disable_unprepare
      mmc: dw_mmc: constify dw_mci_idmac_ops in exynos back-end
      mmc: dw_mmc: fix modular build for exynos back-end
      mmc: sdhci: fix NULL dereference in sdhci_request() tuning
      mmc: sdhci: fix IS_ERR() checking of regulator_get()
      mmc: fix sdhci-dove probe/removal
      mmc: sh_mmcif: fix use after free
      mmc: sdhci-pci: fix 'Invalid iomem size' error message condition
      mmc: mxcmmc: Fix MODULE_ALIAS
      mmc: omap_hsmmc: fix NULL pointer dereference for dt boot
      mmc: omap_hsmmc: fix host reference after mmc_free_host
      mmc: dw_mmc: fix multiple drv_data NULL dereferences
      mmc: dw_mmc: enable controller interrupt before calling mmc_start_host
      mmc: sdhci-of-esdhc: disable CMD23 for some Freescale SoCs
      mmc: dw_mmc: remove _dev_info compile warning
      mmc: dw_mmc: convert the variable type of irq
  8. Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    authored
    Pull crypto fix from Herbert Xu:
     "This push fixes a potential panic in cryptd which may occur with
      crypto drivers such as aesni-intel."
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption
  9. Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    authored
    …t/tiwai/sound
    
    Pull sound fixes from Takashi Iwai:
     "Most of commits are for stable and regression fixes.  Except for one
      fix for a regression in 3.7-rc4, there are all driver local changes,
      so nothing too much to worry."
    
    * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
      ALSA: Fix card refcount unbalance
      ALSA: hda - Add new codec ALC668 and ALC900 (default name ALC1150)
      ALSA: hda - Improve HP depop when system enter to S3
      ALSA: usb-audio: Fix crash at re-preparing the PCM stream
      ALSA: hdspm - Fix sync check reporting on RME RayDAT
      ALSA: hda - Add pin fixups for ASUS G75
      ALSA: hda - Fix invalid connections in VT1802 codec
      ALSA: hda - Fix empty DAC filling in patch_via.c
      ALSA: hda - Force to reset IEC958 status bits for AD codecs
      ALSA: es1968: Add ESS vendor ID to pm_whitelist
      ALSA: HDA: Mark CS260x immutable structures const
      ALSA: HDA: Fix digital microphone on CS420x
      ALSA: hda: Cirrus: Fix coefficient index for beep configuration
      ALSA: hda - support Teradici 2200 host card audio
      ALSA: Fix typo in drivers sound
  10. @sstabellini

    xen/arm: Fix compile errors when drivers are compiled as modules (exp…

    sstabellini authored Konrad Rzeszutek Wilk committed
    …ort more).
    
    The commit 911dec0
    "xen/arm: Fix compile errors when drivers are compiled as modules." exports
    the neccessary functions. But to guard ourselves against out-of-tree modules
    and future drivers hitting this, lets export all of the relevant
    hypercalls.
    
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  11. drm/vmwgfx: Fix a case where the code would BUG when trying to pin GM…

    Thomas Hellstrom authored Dave Airlie committed
    …R memory
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Reviewed-by: Brian Paul <brianp@vmware.com>
    Reviewed-by: Dmitry Torokhov <dtor@vmware.com>
    Cc: stable@vger.kernel.org
    Cc: linux-graphics-maintainer@vmware.com
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  12. drm/vmwgfx: Fix hibernation device reset

    Thomas Hellstrom authored Dave Airlie committed
    The device would not reset properly when resuming from hibernation.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Reviewed-by: Brian Paul <brianp@vmware.com>
    Reviewed-by: Dmitry Torokhov <dtor@vmware.com>
    Cc: stable@vger.kernel.org
    Cc: linux-graphics-maintainer@vmware.com
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  13. Merge tag 'pinctrl-for-v3.7-rc5' of git://git.kernel.org/pub/scm/linu…

    authored
    …x/kernel/git/linusw/linux-pinctrl
    
    Pull pinctrl fixes from Linus Walleij:
    
     - A set of SPEAr pinctrl fixes that recently arrived
    
     - A fixup for the Samsung/Exynos Kconfig deps
    
    * tag 'pinctrl-for-v3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
      pinctrl: samsung and exynos need to depend on OF && GPIOLIB
      pinctrl: SPEAr1340: Add clcd sleep mode pin configuration
      pinctrl: SPEAr1340: Make DDR reset & clock pads as gpio
      pinctrl: SPEAr1310: add register entries for enabling pad direction
      pinctrl: SPEAr1310: Separate out pci pins from pcie_sata pin group
      pinctrl: SPEAr1310: Fix value of PERIP_CFG reigster and MCIF_SEL_SHIFT
      pinctrl: SPEAr1310: fix clcd high resolution pin group name
      pinctrl: SPEAr320: Correct pad mux entries for rmii/smii
      pinctrl: SPEAr3xx: correct register space to configure pwm
      pinctrl: SPEAr: Don't update all non muxreg bits on pinctrl_disable
  14. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/s390/linux
    
    Pull s390 fixes from Martin Schwidefsky:
     "A couple of bug fixes.  I keep the fingers crossed that we now got
      transparent huge pages ready for prime time."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
      s390/cio: fix length calculation in idset.c
      s390/sclp: fix addressing mode clobber
      s390: Move css limits from drivers/s390/cio/ to include/asm/.
      s390/thp: respect page protection in pmd_none() and pmd_present()
      s390/mm: use pmd_large() instead of pmd_huge()
      s390/cio: suppress 2nd path verification during resume
  15. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/jikos/hid
    
    Pull HID fix from Jiri Kosina:
     "This reverts a patch that causes regression in binding between HID
      devices and drivers during device unplug/replug cycle."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: hidraw: put old deallocation mechanism in place
  16. Merge branch 'akpm' (Fixes from Andrew)

    authored
    Merge misc fixes from Andrew Morton:
     "Five fixes"
    
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (5 patches)
      h8300: add missing L1_CACHE_SHIFT
      mm: bugfix: set current->reclaim_state to NULL while returning from kswapd()
      fanotify: fix missing break
      revert "epoll: support for disabling items, and a self-test app"
      checkpatch: improve network block comment style checking
  17. Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    authored
    Pull drm fixes from Dave Airlie:
     "Just radeon and nouveau, mostly regressions fixers, and a couple of
      radeon register checker fixes."
    
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/nouveau: fix acpi edid retrieval
      drm/nvc0/disp: fix regression in vblank semaphore release
      drm/nv40/mpeg: fix context handling
      drm/nv40/graph: fix typo in type names
      drm/nv41/vm: fix typo in type name
      drm/radeon/si: add some missing regs to the VM reg checker
      drm/radeon/cayman: add some missing regs to the VM reg checker
      drm/radeon/dce3: switch back to old pll allocation order for discrete
  18. Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    authored
    …nel/git/rusty/linux
    
    Pull virtio and module fixes from Rusty Russell:
     "YA module signing build tweak, and two cc'd to stable."
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
      virtio: Don't access index after unregister.
      modules: don't break modules_install on external modules with no key.
      module: fix out-by-one error in kallsyms
  19. Merge tag 'for-linus-v3.7-rc5' of git://oss.sgi.com/xfs/xfs

    authored
    Pull xfs bugfixes from Ben Myers:
    
     - fix for large transactions spanning multiple iclog buffers
    
     - zero the allocation_args structure on the stack before using it to
       determine whether to use a worker for allocation
     - move allocation stack switch to xfs_bmapi_allocate in order to
       prevent deadlock on AGF buffers
    
     - growfs no longer reads in garbage for new secondary superblocks
    
     - silence a build warning
    
     - ensure that invalid buffers never get written to disk while on free
       list
    
     - don't vmap inode cluster buffers during free
    
     - fix buffer shutdown reference count mismatch
    
     - fix reading of wrapped log data
    
    * tag 'for-linus-v3.7-rc5' of git://oss.sgi.com/xfs/xfs:
      xfs: fix reading of wrapped log data
      xfs: fix buffer shudown reference count mismatch
      xfs: don't vmap inode cluster buffers during free
      xfs: invalidate allocbt blocks moved to the free list
      xfs: silence uninitialised f.file warning.
      xfs: growfs: don't read garbage for new secondary superblocks
      xfs: move allocation stack switch up to xfs_bmapi_allocate
      xfs: introduce XFS_BMAPI_STACK_SWITCH
      xfs: zero allocation_args on the kernel stack
      xfs: only update the last_sync_lsn when a transaction completes
  20. h8300: add missing L1_CACHE_SHIFT

    Fengguang Wu authored committed
    Fix the build error
    
      lib/atomic64.c: In function 'lock_addr':
      lib/atomic64.c:40:11: error: 'L1_CACHE_SHIFT' undeclared (first use in this function)
      lib/atomic64.c:40:11: note: each undeclared identifier is reported only once for each function it appears in
    
    Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
    Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. mm: bugfix: set current->reclaim_state to NULL while returning from k…

    Takamori Yamaguchi authored committed
    …swapd()
    
    In kswapd(), set current->reclaim_state to NULL before returning, as
    current->reclaim_state holds reference to variable on kswapd()'s stack.
    
    In rare cases, while returning from kswapd() during memory offlining,
    __free_slab() and freepages() can access the dangling pointer of
    current->reclaim_state.
    
    Signed-off-by: Takamori Yamaguchi <takamori.yamaguchi@jp.sony.com>
    Signed-off-by: Aaditya Kumar <aaditya.kumar@ap.sony.com>
    Acked-by: David Rientjes <rientjes@google.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. @eparis

    fanotify: fix missing break

    eparis authored committed
    Anders Blomdell noted in 2010 that Fanotify lost events and provided a
    test case.  Eric Paris confirmed it was a bug and posted a fix to the
    list
    
      https://groups.google.com/forum/?fromgroups=#!topic/linux.kernel/RrJfTfyW2BE
    
    but never applied it.  Repeated attempts over time to actually get him
    to apply it have never had a reply from anyone who has raised it
    
    So apply it anyway
    
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Reported-by: Anders Blomdell <anders.blomdell@control.lth.se>
    Cc: Eric Paris <eparis@redhat.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  23. revert "epoll: support for disabling items, and a self-test app"

    Andrew Morton authored committed
    Revert commit 03a7beb ("epoll: support for disabling items, and a
    self-test app") pending resolution of the issues identified by Michael
    Kerrisk, copied below.
    
    We'll revisit this for 3.8.
    
    : I've taken a look at this patch as it currently stands in 3.7-rc1, and
    : done a bit of testing. (By the way, the test program
    : tools/testing/selftests/epoll/test_epoll.c does not compile...)
    :
    : There are one or two places where the behavior seems a little strange,
    : so I have a question or two at the end of this mail. But other than
    : that, I want to check my understanding so that the interface can be
    : correctly documented.
    :
    : Just to go though my understanding, the problem is the following
    : scenario in a multithreaded application:
    :
    : 1. Multiple threads are performing epoll_wait() operations,
    :    and maintaining a user-space cache that contains information
    :    corresponding to each file descriptor being monitored by
    :    epoll_wait().
    :
    : 2. At some point, a thread wants to delete (EPOLL_CTL_DEL)
    :    a file descriptor from the epoll interest list, and
    :    delete the corresponding record from the user-space cache.
    :
    : 3. The problem with (2) is that some other thread may have
    :    previously done an epoll_wait() that retrieved information
    :    about the fd in question, and may be in the middle of using
    :    information in the cache that relates to that fd. Thus,
    :    there is a potential race.
    :
    : 4. The race can't solved purely in user space, because doing
    :    so would require applying a mutex across the epoll_wait()
    :    call, which would of course blow thread concurrency.
    :
    : Right?
    :
    : Your solution is the EPOLL_CTL_DISABLE operation. I want to
    : confirm my understanding about how to use this flag, since
    : the description that has accompanied the patches so far
    : has been a bit sparse
    :
    : 0. In the scenario you're concerned about, deleting a file
    :    descriptor means (safely) doing the following:
    :    (a) Deleting the file descriptor from the epoll interest list
    :        using EPOLL_CTL_DEL
    :    (b) Deleting the corresponding record in the user-space cache
    :
    : 1. It's only meaningful to use this EPOLL_CTL_DISABLE in
    :    conjunction with EPOLLONESHOT.
    :
    : 2. Using EPOLL_CTL_DISABLE without using EPOLLONESHOT in
    :    conjunction is a logical error.
    :
    : 3. The correct way to code multithreaded applications using
    :    EPOLL_CTL_DISABLE and EPOLLONESHOT is as follows:
    :
    :    a. All EPOLL_CTL_ADD and EPOLL_CTL_MOD operations should
    :       should EPOLLONESHOT.
    :
    :    b. When a thread wants to delete a file descriptor, it
    :       should do the following:
    :
    :       [1] Call epoll_ctl(EPOLL_CTL_DISABLE)
    :       [2] If the return status from epoll_ctl(EPOLL_CTL_DISABLE)
    :           was zero, then the file descriptor can be safely
    :           deleted by the thread that made this call.
    :       [3] If the epoll_ctl(EPOLL_CTL_DISABLE) fails with EBUSY,
    :           then the descriptor is in use. In this case, the calling
    :           thread should set a flag in the user-space cache to
    :           indicate that the thread that is using the descriptor
    :           should perform the deletion operation.
    :
    : Is all of the above correct?
    :
    : The implementation depends on checking on whether
    : (events & ~EP_PRIVATE_BITS) == 0
    : This replies on the fact that EPOLL_CTL_AD and EPOLL_CTL_MOD always
    : set EPOLLHUP and EPOLLERR in the 'events' mask, and EPOLLONESHOT
    : causes those flags (as well as all others in ~EP_PRIVATE_BITS) to be
    : cleared.
    :
    : A corollary to the previous paragraph is that using EPOLL_CTL_DISABLE
    : is only useful in conjunction with EPOLLONESHOT. However, as things
    : stand, one can use EPOLL_CTL_DISABLE on a file descriptor that does
    : not have EPOLLONESHOT set in 'events' This results in the following
    : (slightly surprising) behavior:
    :
    : (a) The first call to epoll_ctl(EPOLL_CTL_DISABLE) returns 0
    :     (the indicator that the file descriptor can be safely deleted).
    : (b) The next call to epoll_ctl(EPOLL_CTL_DISABLE) fails with EBUSY.
    :
    : This doesn't seem particularly useful, and in fact is probably an
    : indication that the user made a logic error: they should only be using
    : epoll_ctl(EPOLL_CTL_DISABLE) on a file descriptor for which
    : EPOLLONESHOT was set in 'events'. If that is correct, then would it
    : not make sense to return an error to user space for this case?
    
    Cc: Michael Kerrisk <mtk.manpages@gmail.com>
    Cc: "Paton J. Lewis" <palewis@adobe.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  24. checkpatch: improve network block comment style checking

    Joe Perches authored committed
    Some comment styles in net and drivers/net are flagged inappropriately.
    
    Avoid proclaiming inline comments like:
    	int a = b;	/* some comment */
    and block comments like:
    	/*********************
    	 * some comment
    	 ********************/
    are defective.
    
    Tested with
    $ cat drivers/net/t.c
    /* foo */
    
    /*
     * foo
     */
    
    /* foo
     */
    
    /* foo
     * bar */
    
    /****************************
     * some long block comment
     ***************************/
    
    struct foo {
    	int bar;	/* another test */
    };
    $
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
    Cc: David Miller <davem@davemloft.net>
    Cc: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.