1. 20 Apr, 2013 1 commit
  2. 19 Apr, 2013 8 commits
    • Arnd Bergmann's avatar
      Merge branch 'spear/dwdma' into late/cleanup · f54ae513
      Arnd Bergmann authored
      This is a series originally prepared for inclusion in 3.9, which did
      not work out because of dependencies on the dmaengine driver. All the
      changes for the dmaengine code are merged in 3.9 now, so we can finally
      do the switchover and remove the now unnecessary dma definitions for
      spear13xx from the platform code.
      
      The dma platform_data actually made up the majority of the spear13xx
      platform code overall, so moving that into device tree files makes the
      code substantially smaller.
      
      * spear/dwdma:
        ata: arasan: remove the need for platform_data
        ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT
        serial: pl011: use generic DMA slave configuration if possible
        spi: pl022: use generic DMA slave configuration if possible
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      f54ae513
    • Arnd Bergmann's avatar
      Merge branch 'spear/multiplatform' into late/cleanup · 1b361942
      Arnd Bergmann authored
      This is a prerequisite for the spear/dwdma series.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      1b361942
    • Arnd Bergmann's avatar
      ata: arasan: remove the need for platform_data · e34d3865
      Arnd Bergmann authored
      This adds a complete DT binding for the arasan device driver. There is
      currently only one user, which is the spear13xx platform, so we don't
      actually have to parse all the properties until another user comes in,
      but this does use the generic DMA binding to find the DMA channel.
      
      The patch is untested so far and is part of a series to convert
      the spear platform over to use the generic DMA binding, so it
      should stay with the rest of the series.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarViresh Kumar <viresh.linux@linaro.org>
      Cc: Vinod Koul <vinod.koul@intel.com>
      Cc: Jeff Garzik <jgarzik@redhat.com>
      Cc: devicetree-discuss@lists.ozlabs.org
      e34d3865
    • Olof Johansson's avatar
      Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup · 61b464ae
      Olof Johansson authored
      From Nicolas Ferre:
      Little modification in SoC presentation in kernel log.
      Removing of a long-standing warning in sam9263 PM code.
      
      * tag 'at91-soc' of git://github.com/at91linux/linux-at91:
        ARM: at91: suspend both memory controllers on at91sam9263
        ARM: at91: change "Unknown" qualifier SoC subtype handling
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      61b464ae
    • Olof Johansson's avatar
      Merge branch 'at91/soc' into late/cleanup · a71efd61
      Olof Johansson authored
      * at91/soc:
        ARM: at91: add defconfig for SAMA5
        ARM: at91: dt: add device tree files for SAMA5D3 family
        ARM: at91: introduce SAMA5 support
        ARM: at91: introduce the core type choice to split ARMv4/5 and ARMv7 arch
        ARM: at91: add AT91_SAM9_TIME entry to select at91sam926x_time.c compilation
        ARM: at91: change name template in AT91_SOC_START macro
        ARM: at91: renamme rm9200 dt file
        ARM: at91: rename board-dt to more specific name board-dt-sam9
        ARM: at91: move non DT Kconfig to Kconfig.non_dt
      a71efd61
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.10/dss-signed' of... · cd4cb1a7
      Olof Johansson authored
      Merge tag 'omap-for-v3.10/dss-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into late/cleanup
      
      From Tony Lindgren:
      Display related clean-up from Tomi Valkeinen.
      
      These were separated from the DSS driver changes to leave out
      a dependency between the driver and arch/arm related code.
      
      * tag 'omap-for-v3.10/dss-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        arm: dss-common: don't use reset_gpio from omap4_panda_dvi_device
        arm: omap boards: Remove unnecessary platform_enable/disable callbacks for VENC devices
        arm: omap: dss-common: use picodlp panel's gpio handling
        arm: omap: board-omap3pandora: use tpo panel's gpio handling
        arm: omap: board-zoom: use NEC panel's gpio handling
        arm: omap: board-rx-51: use acx565akm panel's gpio handling
        arm: omap: board-sdp3430: use sharp panel's gpio handling
        arm: omap: board-omap3evm: use sharp panel's gpio handling
        arm: omap: board-overo: use lb035q02 dpi panel's gpio handling
        arm: omap: board-ldp: use generic dpi panel's gpio handling
        arm: omap: board-am3517: use generic dpi panel's gpio handling
        arm: omap: board-cm-t35: use generic dpi panel's gpio handling
        arm: omap: board-devkit8000: use generic dpi panel's gpio handling
        arm: omap: board-2430: use generic dpi panel's gpio handling
        ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight
        OMAPDSS: add fields to panels' platform data
        OMAPDSS: panels: keep platform data of all panels in a single header
      
      Conflicts:
      	arch/arm/mach-omap2/board-2430sdp.c
      	arch/arm/mach-omap2/board-zoom-display.c
      cd4cb1a7
    • Olof Johansson's avatar
      Merge branch 'omap/boards' into late/cleanup · ff57270d
      Olof Johansson authored
      * omap/boards:
        ARM: OMAP: board-4430sdp: Provide regulator to pwm-backlight
        ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight
        ARM: OMAP2+: omap2plus_defconfig: Add support for BMP085 pressure sensor
        omap2+: Remove useless Makefile line
        omap2+: Remove useless Makefile line
        ARM: OMAP: RX-51: add missing regulator supply definitions for lis3lv02d
        ARM: OMAP1: fix omap_udc registration
      ff57270d
    • Olof Johansson's avatar
      Merge branch 'omap/fixes-non-critical' into late/cleanup · 17ada81e
      Olof Johansson authored
      * omap/fixes-non-critical:
        ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"
        ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD"
        ARM: OMAP: dpll: enable bypass clock only when attempting dpll bypass
        ARM: OMAP2+: powerdomain: avoid testing whether an unsigned char is less than 0
        ARM: OMAP2+: hwmod: Remove unused _HWMOD_WAKEUP_ENABLED flag
        ARM: OMAP2+: am335x: Change the wdt1 func clk src to per_32k clk
        ARM: OMAP2+: AM33xx: hwmod: Add missing sysc definition to wdt1 entry
        ARM: OMAP: fix typo "CONFIG_SMC91x_MODULE"
        ARM: OMAP5: clock: No Freqsel on OMAP5 devices too
        ARM: OMAP5: Make errata i688 workaround available
        ARM: OMAP5: Update SAR memory layout for WakeupGen
        ARM: OMAP5: Update SAR RAM base address
        ARM: OMAP5: Reuse prm read_inst/write_inst
        ARM: OMAP5: prm: Allow prm init to succeed
        ARM: OMAP5: timer: Update the clocksource name as per clock data
        ARM: OMAP5: Update SOC id detection code for ES2
      17ada81e
  3. 18 Apr, 2013 3 commits
  4. 15 Apr, 2013 4 commits
  5. 09 Apr, 2013 1 commit
  6. 08 Apr, 2013 8 commits
  7. 07 Apr, 2013 7 commits
  8. 06 Apr, 2013 2 commits
    • Linus Torvalds's avatar
      Merge tag 'dm-3.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm · fe696909
      Linus Torvalds authored
      Pull device-mapper fixes from Alasdair Kergon:
       "A pair of patches to fix the writethrough mode of the device-mapper
        cache target when the device being cached is not itself wrapped with
        device-mapper."
      
      * tag 'dm-3.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm:
        dm cache: reduce bio front_pad size in writeback mode
        dm cache: fix writes to cache device in writethrough mode
      fe696909
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.9-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · b196553a
      Linus Torvalds authored
      Pull PCI fixes from Bjorn Helgaas:
       "PCI updates for v3.9:
      
        ASPM
            Revert "PCI/ACPI: Request _OSC control before scanning PCI root bus"
        kexec
            PCI: Don't try to disable Bus Master on disconnected PCI devices
        Platform ROM images
            PCI: Add PCI ROM helper for platform-provided ROM images
            nouveau: Attempt to use platform-provided ROM image
            radeon: Attempt to use platform-provided ROM image
        Hotplug
            PCI/ACPI: Always resume devices on ACPI wakeup notifications
            PCI/PM: Disable runtime PM of PCIe ports
        EISA
            EISA/PCI: Fix bus res reference
            EISA/PCI: Init EISA early, before PNP"
      
      * tag 'pci-v3.9-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI/PM: Disable runtime PM of PCIe ports
        PCI/ACPI: Always resume devices on ACPI wakeup notifications
        PCI: Don't try to disable Bus Master on disconnected PCI devices
        Revert "PCI/ACPI: Request _OSC control before scanning PCI root bus"
        radeon: Attempt to use platform-provided ROM image
        nouveau: Attempt to use platform-provided ROM image
        EISA/PCI: Init EISA early, before PNP
        EISA/PCI: Fix bus res reference
        PCI: Add PCI ROM helper for platform-provided ROM images
      b196553a
  9. 05 Apr, 2013 6 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 53f63189
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix erroneous sock_orphan() leading to crashes and double
          kfree_skb() in NFC protocol.  From Thierry Escande and Samuel Ortiz.
      
       2) Fix use after free in remain-on-channel mac80211 code, from Johannes
          Berg.
      
       3) nf_reset() needs to reset the NF tracing cookie, otherwise we can
          leak it from one namespace into another.  Fix from Gao Feng and
          Patrick McHardy.
      
       4) Fix overflow in channel scanning array of mwifiex driver, from Stone
          Piao.
      
       5) Fix loss of link after suspend/shutdown in r8169, from Hayes Wang.
      
       6) Synchronization of unicast address lists to the undelying device
          doesn't work because whether to sync is maintained as a boolean
          rather than a true count.  Fix from Vlad Yasevich.
      
       7) Fix corruption of TSO packets in atl1e by limiting the segmented
          packet length.  From Hannes Frederic Sowa.
      
       8) Revert bogus AF_UNIX credential passing change and fix the
          coalescing issue properly, from Eric W Biederman.
      
       9) Changes of ipv4 address lifetime settings needs to generate a
          notification, from Jiri Pirko.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (22 commits)
        netfilter: don't reset nf_trace in nf_reset()
        net: ipv4: notify when address lifetime changes
        ixgbe: fix registration order of driver and DCA nofitication
        af_unix: If we don't care about credentials coallesce all messages
        Revert "af_unix: dont send SCM_CREDENTIAL when dest socket is NULL"
        bonding: remove sysfs before removing devices
        atl1e: limit gso segment size to prevent generation of wrong ip length fields
        net: count hw_addr syncs so that unsync works properly.
        r8169: fix auto speed down issue
        netfilter: ip6t_NPT: Fix translation for non-multiple of 32 prefix lengths
        mwifiex: limit channel number not to overflow memory
        NFC: microread: Fix build failure due to a new MEI bus API
        iwlwifi: dvm: fix the passive-no-RX workaround
        netfilter: nf_conntrack: fix error return code
        NFC: llcp: Keep the connected socket parent pointer alive
        mac80211: fix idle handling sequence
        netfilter: nfnetlink_acct: return -EINVAL if object name is empty
        netfilter: nfnetlink_queue: fix error return code in nfnetlink_queue_init()
        netfilter: reset nf_trace in nf_reset
        mac80211: fix remain-on-channel cancel crash
        ...
      53f63189
    • Jan Beulich's avatar
      x86: Fix rebuild with EFI_STUB enabled · 91870824
      Jan Beulich authored
      eboot.o and efi_stub_$(BITS).o didn't get added to "targets", and hence
      their .cmd files don't get included by the build machinery, leading to
      the files always getting rebuilt.
      
      Rather than adding the two files individually, take the opportunity and
      add $(VMLINUX_OBJS) to "targets" instead, thus allowing the assignment
      at the top of the file to be shrunk quite a bit.
      
      At the same time, remove a pointless flags override line - the variable
      assigned to was misspelled anyway, and the options added are
      meaningless for assembly sources.
      
      [ hpa: the patch is not minimal, but I am taking it for -urgent anyway
        since the excess impact of the patch seems to be small enough. ]
      Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
      Link: http://lkml.kernel.org/r/515C5D2502000078000CA6AD@nat28.tlf.novell.com
      Cc: Matthew Garrett <mjg@redhat.com>
      Cc: Matt Fleming <matt.fleming@intel.com>
      Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
      91870824
    • Patrick McHardy's avatar
      netfilter: don't reset nf_trace in nf_reset() · 124dff01
      Patrick McHardy authored
      Commit 130549fe ("netfilter: reset nf_trace in nf_reset") added code
      to reset nf_trace in nf_reset(). This is wrong and unnecessary.
      
      nf_reset() is used in the following cases:
      
      - when passing packets up the the socket layer, at which point we want to
        release all netfilter references that might keep modules pinned while
        the packet is queued. nf_trace doesn't matter anymore at this point.
      
      - when encapsulating or decapsulating IPsec packets. We want to continue
        tracing these packets after IPsec processing.
      
      - when passing packets through virtual network devices. Only devices on
        that encapsulate in IPv4/v6 matter since otherwise nf_trace is not
        used anymore. Its not entirely clear whether those packets should
        be traced after that, however we've always done that.
      
      - when passing packets through virtual network devices that make the
        packet cross network namespace boundaries. This is the only cases
        where we clearly want to reset nf_trace and is also what the
        original patch intended to fix.
      
      Add a new function nf_reset_trace() and use it in dev_forward_skb() to
      fix this properly.
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      124dff01
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 6cfa9238
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "Fixes for a number of small glitches in various corners of the MIPS
        tree.  No particular areas is standing out.
      
        With this applied all MIPS defconfigs are building fine.  No merge
        conflicts are expected."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: Delete definition of SA_RESTORER.
        MIPS: Fix ISA level which causes secondary cache init bypassing and more
        MIPS: Fix build error cavium-octeon without CONFIG_SMP
        MIPS: Kconfig: Rename SNIPROM too
        MIPS: Alchemy: Fix typo "CONFIG_DEBUG_PCI"
        MIPS: Unbreak function tracer for 64-bit kernel.
      6cfa9238
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes · 00fa6fe9
      Linus Torvalds authored
      Pull GFS2 fixes from Steven Whitehouse:
       "There are two patches which fix up a couple of minor issues in the DLM
        interface code, a missing error path in gfs2_rs_alloc(), one patch
        which fixes a problem during "withdraw" and a fix for discards/FITRIM
        when using 4k sector sized devices."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
        GFS2: Issue discards in 512b sectors
        GFS2: Fix unlock of fcntl locks during withdrawn state
        GFS2: return error if malloc failed in gfs2_rs_alloc()
        GFS2: use memchr_inv
        GFS2: use kmalloc for lvb bitmap
      00fa6fe9
    • Mike Marciniszyn's avatar
      firmware,IB/qib: revert firmware file move · ff802e31
      Mike Marciniszyn authored
      Commit e2eed58b ("IB/qib: change QLogic to Intel") moved a firmware
      file potentially breaking the ABI.
      
      This patch reverts that aspect of the fix as well as reverting the
      firmware name as used in qib.
      Reported-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
      Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ff802e31