1. 10 4月, 2013 2 次提交
  2. 08 4月, 2013 13 次提交
    • R
      Merge branch 'pm-cpuidle-next' into linux-next · f69e44b2
      Rafael J. Wysocki 提交于
      * pm-cpuidle-next:
        cpuidle: imx6: remove timer broadcast initialization
        cpuidle: OMAP4: remove timer broadcast initialization
        cpuidle: ux500: remove timer broadcast initialization
        cpuidle: initialize the broadcast timer framework
        timer: move enum definition out of ifdef section
        cpuidle: kirkwood: fix coccicheck warnings
        cpuidle / kirkwood: remove redundant Kconfig option
        cpuidle / ux500 : use CPUIDLE_FLAG_TIMER_STOP flag
        cpuidle / imx6 : use CPUIDLE_FLAG_TIMER_STOP flag
        cpuidle / omap4 : use CPUIDLE_FLAG_TIMER_STOP flag
        cpuidle : handle clockevent notify from the cpuidle framework
      f69e44b2
    • R
      Merge branch 'acpi-assorted' into linux-next · 0f0c8aa0
      Rafael J. Wysocki 提交于
      * acpi-assorted:
        PCI / ACPI: Don't query OSC support with all possible controls
        ACPI / processor_thermal: avoid null pointer deference error
        ACPI / fan: avoid null pointer deference error
        ACPI / video: Fix applying indexed initial brightness value.
        ACPI / video: Make logic a little easier to understand.
        ACPI / video: Fix brightness control initialization for some laptops.
        ACPI: Use resource_size() in osl.c
        ACPI / acpi_pad: Used PTR_RET
        ACPI: suppress compiler warning in container.c
        ACPI: suppress compiler warning in battery.c
        ACPI: suppress compiler warnings in processor_throttling.c
        ACPI: suppress compiler warnings in button.c
        ACPI: replace kmalloc+memcpy with kmemdup
        ACPI: Remove acpi_pci_bind_root() definition
        ACPI video: ignore BIOS backlight value for HP dm4
      0f0c8aa0
    • R
      Merge branch 'acpi-pm' into linux-next · 077f893b
      Rafael J. Wysocki 提交于
      * acpi-pm:
        ACPI / PM: Fix potential problem in acpi_device_get_power()
      077f893b
    • R
      Merge branch 'acpica' into linux-next · 6912897d
      Rafael J. Wysocki 提交于
      * acpica: (22 commits)
        ACPI: Set length even for TYPE_END_TAG acpi resource
        ACPICA: Update version to 20130214
        ACPICA: Object repair: Allow 0-length packages for variable-length packages
        ACPICA: Disassembler: Add warnings for unresolved control methods
        ACPICA: Return object repair: Add resource template repairs
        ACPICA: Return object repair: Add string-to-unicode conversion
        ACPICA: Split object conversion functions to a new file
        ACPICA: Add mechanism for early object repairs on a per-name basis
        ACPICA: Remove trailing comma in enum declarations
        ACPICA: Add exception descriptions to exception info table
        ACPICA: Add macros to exception code definitions
        ACPICA: Regression fix: reinstate safe exit macros
        ACPICA: Update for ACPI 5 hardware-reduced feature
        ACPICA: Add parens within macros around parameter names
        ACPICA: Add macros to access pointer to next object in the descriptor list
        ACPICA: Update error/debug messages for fixed events
        ACPICA: Fix a long-standing bug in local cache
        ACPICA: iASL/Disassembler: Add support for MTMR table
        ACPICA: iASL/Disassembler: Add support for VRTC table
        ACPICA: Update RASF table definition
        ...
      6912897d
    • R
      Merge branch 'acpi-lpss' into linux-next · 16b53e7e
      Rafael J. Wysocki 提交于
      * acpi-lpss:
        ACPI / LPSS: make code less confusing for reader
        ACPI / LPSS: Add support for exposing LTR registers to user space
        ACPI / scan: Add special handler for Intel Lynxpoint LPSS devices
      16b53e7e
    • R
      Merge branch 'acpi-hotplug' into linux-next · 408fb7f3
      Rafael J. Wysocki 提交于
      * acpi-hotplug:
        ACPI / memhotplug: Remove info->failed bit
        ACPI / memhotplug: set info->enabled for memory present at boot time
        ACPI: Verify device status after eject
        acpi: remove reference to ACPI_HOTPLUG_IO
        ACPI: Update _OST handling for notify
        ACPI: Update PNPID match handling for notify
        ACPI: Update PNPID set/free interfaces
        ACPI: Remove acpi_device dependency in acpi_device_set_id()
        ACPI / hotplug: Make acpi_hotplug_profile_ktype static
        ACPI / scan: Make memory hotplug driver use struct acpi_scan_handler
        ACPI / container: Use hotplug profile user space interface
        ACPI / hotplug: Introduce user space interface for hotplug profiles
        ACPI / scan: Introduce acpi_scan_handler_matching()
        ACPI / container: Use common hotplug code
        ACPI / scan: Introduce common code for ACPI-based device hotplug
        ACPI / scan: Introduce acpi_scan_match_handler()
      408fb7f3
    • L
      Linux 3.9-rc6 · 31880c37
      Linus Torvalds 提交于
      31880c37
    • L
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · 875b7679
      Linus Torvalds 提交于
      Pull KVM fix from Gleb Natapov:
       "Bugfix for the regression introduced by commit c300aa64"
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: Allow cross page reads and writes from cached translations.
      875b7679
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 39ab967e
      Linus Torvalds 提交于
      Pull x86 fixes from Peter Anvin:
       "Two quite small fixes: one a build problem, and the other fixes
        seccomp filters on x32."
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Fix rebuild with EFI_STUB enabled
        x86: remove the x32 syscall bitmask from syscall_get_nr()
      39ab967e
    • W
      alpha: irq: remove deprecated use of IRQF_DISABLED · e74e2592
      Will Deacon 提交于
      Interrupt handlers are always invoked with interrupts disabled, so
      remove all uses of the deprecated IRQF_DISABLED flag.
      
      Cc: Richard Henderson <rth@twiddle.net>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Reviewed-by: NMatt Turner <mattst88@gmail.com>
      Signed-off-by: NWill Deacon <will.deacon@arm.com>
      Signed-off-by: NMichael Cree <mcree@orcon.net.nz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e74e2592
    • W
      alpha: irq: run all handlers with interrupts disabled · e20800fd
      Will Deacon 提交于
      Linux has expected that interrupt handlers are executed with local
      interrupts disabled for a while now, so ensure that this is the case on
      Alpha even for non-device interrupts such as IPIs.
      
      Without this patch, secondary boot results in the following backtrace:
      
        warning: at kernel/softirq.c:139 __local_bh_enable+0xb8/0xd0()
        trace:
          __local_bh_enable+0xb8/0xd0
          irq_enter+0x74/0xa0
          scheduler_ipi+0x50/0x100
          handle_ipi+0x84/0x260
          do_entint+0x1ac/0x2e0
          irq_exit+0x60/0xa0
          handle_irq+0x98/0x100
          do_entint+0x2c8/0x2e0
          ret_from_sys_call+0x0/0x10
          load_balance+0x3e4/0x870
          cpu_idle+0x24/0x80
          rcu_eqs_enter_common.isra.38+0x0/0x120
          cpu_idle+0x40/0x80
          rest_init+0xc0/0xe0
          _stext+0x1c/0x20
      
      A similar dump occurs if you try to reboot using magic-sysrq.
      
      Cc: Richard Henderson <rth@twiddle.net>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Cc: Matt Turner <mattst88@gmail.com>
      Reviewed-by: NMatt Turner <mattst88@gmail.com>
      Signed-off-by: NWill Deacon <will.deacon@arm.com>
      Signed-off-by: NMichael Cree <mcree@orcon.net.nz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e20800fd
    • W
      alpha: makefile: don't enforce small data model for kernel builds · cd8d2331
      Will Deacon 提交于
      Due to all of the goodness being packed into today's kernels, the
      resulting image isn't as slim as it once was.
      
      In light of this, don't pass -msmall-data to gcc, which otherwise results
      in link failures due to impossible relocations when compiling anything but
      the most trivial configurations.
      
      Cc: Richard Henderson <rth@twiddle.net>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Reviewed-by: NMatt Turner <mattst88@gmail.com>
      Tested-by: NThorsten Kranzkowski <dl8bcu@dl8bcu.de>
      Signed-off-by: NWill Deacon <will.deacon@arm.com>
      Signed-off-by: NMichael Cree <mcree@orcon.net.nz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cd8d2331
    • J
      alpha: Add irongate_io to PCI bus resources · aa8b4be3
      Jay Estabrook 提交于
      Fixes a NULL pointer dereference at boot on UP1500.
      
      Cc: stable@vger.kernel.org
      Reviewed-and-Tested-by: NMatt Turner <mattst88@gmail.com>
      Signed-off-by: NJay Estabrook <jay.estabrook@gmail.com>
      Signed-off-by: NMatt Turner <mattst88@gmail.com>
      Signed-off-by: NMichael Cree <mcree@orcon.net.nz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      aa8b4be3
  3. 07 4月, 2013 1 次提交
  4. 06 4月, 2013 13 次提交
    • L
      Merge tag 'dm-3.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm · fe696909
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'pci-v3.9-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · b196553a
      Linus Torvalds 提交于
      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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 53f63189
      Linus Torvalds 提交于
      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
    • J
      x86: Fix rebuild with EFI_STUB enabled · 91870824
      Jan Beulich 提交于
      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: NJan 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: NH. Peter Anvin <hpa@linux.intel.com>
      91870824
    • P
      netfilter: don't reset nf_trace in nf_reset() · 124dff01
      Patrick McHardy 提交于
      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: NPatrick McHardy <kaber@trash.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      124dff01
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 6cfa9238
      Linus Torvalds 提交于
      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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes · 00fa6fe9
      Linus Torvalds 提交于
      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
    • M
      firmware,IB/qib: revert firmware file move · ff802e31
      Mike Marciniszyn 提交于
      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: NDavid Woodhouse <dwmw2@infradead.org>
      Signed-off-by: NMike Marciniszyn <mike.marciniszyn@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ff802e31
    • L
      Merge tag 'spi-fix-v3.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc · e0a77f26
      Linus Torvalds 提交于
      Pull spi fixes from Mark Brown:
       "A bunch of small driver fixes plus a fix for error handling in the
        core - nothing too exciting overall."
      
      * tag 'spi-fix-v3.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc:
        spi/mpc512x-psc: optionally keep PSC SS asserted across xfer segmensts
        spi: Unlock a spinlock before calling into the controller driver.
        spi/s3c64xx: modified error interrupt handling and init
        spi/bcm63xx: don't disable non enabled clocks in probe error path
        spi/bcm63xx: Remove unused variable
        spi: slink-tegra20: move runtime pm calls to transfer_one_message
      e0a77f26
    • B
      GFS2: Issue discards in 512b sectors · b2c87cae
      Bob Peterson 提交于
      This patch changes GFS2's discard issuing code so that it calls
      function sb_issue_discard rather than blkdev_issue_discard. The
      code was calling blkdev_issue_discard and specifying the correct
      sector offset and sector size, but blkdev_issue_discard expects
      these values to be in terms of 512 byte sectors, even if the native
      sector size for the device is different. Calling sb_issue_discard
      with the BLOCK size instead ensures the correct block-to-512b-sector
      translation. I verified that "minlen" is specified in blocks, so
      comparing it to a number of blocks is correct.
      Signed-off-by: NBob Peterson <rpeterso@redhat.com>
      Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>
      b2c87cae
    • J
      Revert "drivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR" · e24b0bfa
      Johan Hovold 提交于
      This reverts commit 0ef1594c.
      
      This patch introduced a few races which cannot be easily fixed with a
      small follow-up patch. Furthermore, the SoC with the broken hardware
      register, which this patch intended to add support for, can only be used
      with device trees, which this driver currently does not support.
      
      [ Here is the discussion that led to this "revert" patch:
        https://lkml.org/lkml/2013/4/3/176 ]
      
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NNicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e24b0bfa
    • L
      Merge tag 'fbdev-fixes-3.9-rc6' of git://gitorious.org/linux-omap-dss2/linux · c4c80f63
      Linus Torvalds 提交于
      Pull fbdev fixes from Tomi Valkeinen:
       "Fix uvesafb crash bug and typoed flag name in fbmon's new videomode
        code"
      
      * tag 'fbdev-fixes-3.9-rc6' of git://gitorious.org/linux-omap-dss2/linux:
        video:uvesafb: Fix dereference NULL pointer code path
        fbmon: use VESA_DMT_VSYNC_HIGH to fix typo
      c4c80f63
    • L
      Merge tag 'sound-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 8f09aacf
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "This contains slightly more volumes than usual at this stage, mostly
        because of my vacation in the last week.  Nothing to scare, all small
        and/or trivial fixes:
      
         - Fix loop path handling in ASoC DAPM
         - Some memory handling fixes in ASoC core
         - Fix spear_pcm to adapt to the updated API
         - HD-audio HDMI ELD handling fixes
         - Fix for CM6331 USB-audio SRC change bugs
         - Revert power_save_controller option change due to user-space usage
         - A few other small ASoC and HD-audio fixes"
      
      * tag 'sound-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda/generic - fix uninitialized variable
        Revert "ALSA: hda - Allow power_save_controller option override DCAPS"
        ALSA: hda - fix typo in proc output
        ALSA: hda - Enabling Realtek ALC 671 codec
        ALSA: usb: Work around CM6631 sample rate change bug
        ALSA: hda - bug fix on HDMI ELD debug message
        ALSA: hda - bug fix on return value when getting HDMI ELD info
        ASoC: dma-sh7760: Fix compile error
        ASoC: core: fix invalid free of devm_ allocated data
        ASoC: spear_pcm: Update to new pcm_new() API
        ASoC:: max98090: Remove executable bit
        ASoC: dapm: Fix pointer dereference in is_connected_output_ep()
        ASoC: pcm030 audio fabric: remove __init from probe
        ASoC: imx-ssi: Fix occasional AC97 reset failure
        ASoC: core: fix possible memory leak in snd_soc_bytes_put()
        ASoC: wm_adsp: fix possible memory leak in wm_adsp_load_coeff()
        ASoC: dapm: Fix handling of loops
        ASoC: si476x: Add missing break for SNDRV_PCM_FORMAT_S8 switch case
      8f09aacf
  5. 05 4月, 2013 11 次提交