Permalink
Switch branches/tags
Commits on Mar 26, 2010
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1
      x86/PCI: for host bridge address space collisions, show conflicting resource
      frv/PCI: remove redundant warnings
      x86/PCI: remove redundant warnings
      PCI: don't say we claimed a resource if we failed
      PCI quirk: Disable MSI on VIA K8T890 systems
      PCI quirk: RS780/RS880: work around missing MSI initialization
      PCI quirk: only apply CX700 PCI bus parking quirk if external VT6212L is present
      PCI: complain about devices that seem to be broken
      PCI: print resources consistently with %pR
      PCI: make disabled window printk style match the enabled ones
      PCI: break out primary/secondary/subordinate for readability
      PCI: for address space collisions, show conflicting resource
      resources: add interfaces that return conflict information
      PCI: cleanup error return for pcix get and set mmrbc functions
      PCI: fix access of PCI_X_CMD by pcix get and set mmrbc functions
      PCI: kill off pci_register_set_vga_state() symbol export.
      PCI: fix return value from pcix_get_max_mmrbc()
    torvalds committed Mar 26, 2010
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/ryusuke/nilfs2
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
      nilfs2: fix imperfect completion wait in nilfs_wait_on_logs
      nilfs2: fix hang-up of cleaner after log writer returned with error
      nilfs2: fix duplicate call to nilfs_segctor_cancel_freev
    torvalds committed Mar 26, 2010
  3. Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    …t/brodo/pcmcia-2.6
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
      pcmcia: use dev_pm_ops for class pcmcia_socket_class
      power: support _noirq actions on device types and classes
      pcmcia: allow for four multifunction subdevices (again)
      pcmcia: do not use ioports < 0x100 on x86
      pd6729: Coding Style fixes
    torvalds committed Mar 26, 2010
  4. Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, amd: Restrict usage of c1e_idle()
      x86: Fix placement of FIX_OHCI1394_BASE
      x86: Handle legacy PIC interrupts on all the cpu's
    torvalds committed Mar 26, 2010
  5. Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm…

    …/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      time: Fix accumulation bug triggered by long delay.
      posix-cpu-timers: Reset expire cache when no timer is running
      timer stats: Fix del_timer_sync() and try_to_del_timer_sync()
      clockevents: Sanitize min_delta_ns adjustment and prevent overflows
    torvalds committed Mar 26, 2010
  6. Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/sc…

    …m/linux/kernel/git/tip/linux-2.6-tip
    
    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      ring-buffer: Do 8 byte alignment for 64 bit that can not handle 4 byte align
    torvalds committed Mar 26, 2010
  7. Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: Use proper type in sched_getaffinity()
      kernel/sched.c: Suppress unused var warning
      sched: sched_getaffinity(): Allow less than NR_CPUS length
    torvalds committed Mar 26, 2010
  8. Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      powerpc/perf_events: Fix call-graph recording, add perf_arch_fetch_caller_regs
      perf top: Add missing initialization to zero
      perf probe: Use original address instead of CU-based address
      perf probe: Fix offset to allow signed value
      perf top: Improve the autosizing of column lenghts
      perf probe: Fix need_dwarf flag if lazy matching is used
      perf probe: Fix probe_point buffer overrun
    torvalds committed Mar 26, 2010
  9. Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      genirq: Move two IRQ functions from .init.text to .text
      genirq: Protect access to irq_desc->action in can_request_irq()
      genirq: Prevent oneshot irq thread race
    torvalds committed Mar 26, 2010
  10. Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: Remove excessive early_res debug output
      softlockup: Stop spurious softlockup messages due to overflow
      rcu: Fix local_irq_disable() CONFIG_PROVE_RCU=y false positives
      rcu: Fix tracepoints & lockdep false positive
      rcu: Make rcu_read_lock_bh_held() allow for disabled BH
    torvalds committed Mar 26, 2010
  11. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: core: align driver match with modalias
      firewire: core: fix Model_ID in modalias
      firewire: ohci: add cycle timer quirk for the TI TSB12LV22
      firewire: core: fw_iso_resource_manage: fix error handling
    torvalds committed Mar 26, 2010
  12. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      Restore LOOKUP_DIRECTORY hint handling in final lookup on open()
    torvalds committed Mar 26, 2010
  13. Restore LOOKUP_DIRECTORY hint handling in final lookup on open()

    	Lose want_dir argument, while we are at it - since now
    nd->flags & LOOKUP_DIRECTORY is equivalent to it.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Mar 26, 2010
Commits on Mar 25, 2010
  1. NOMMU: Fix __get_user_pages() to pin last page on offset buffers

    Fix __get_user_pages() to make it pin the last page on a buffer that doesn't
    begin at the start of a page, but is a multiple of PAGE_SIZE in size.
    
    The problem is that __get_user_pages() advances the pointer too much when it
    iterates to the next page if the page it's currently looking at isn't used from
    the first byte.  This can cause the end of a short VMA to be reached
    prematurely, resulting in the last page being lost.
    
    Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    dhowells committed with torvalds Mar 25, 2010
  2. NOMMU: Revert 'nommu: get_user_pages(): pin last page on non-page-ali…

    …gned start'
    
    Revert the following patch:
    
    	commit c08c6e1
    	Author: Steven J. Magnani <steve@digidescorp.com>
    	Date:   Fri Mar 5 13:42:24 2010 -0800
    
    	nommu: get_user_pages(): pin last page on non-page-aligned start
    
    As it assumes that the mappings begin at the start of pages - something that
    isn't necessarily true on NOMMU systems.  On NOMMU systems, it is possible for
    a mapping to only occupy part of the page, and not necessarily touch either end
    of it; in fact it's also possible for multiple non-overlapping mappings to
    coexist on one page (consider direct mappings of ROMFS files, for example).
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Steven J. Magnani <steve@digidescorp.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    dhowells committed with torvalds Mar 25, 2010
  3. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: Fixed inode allocator to correctly track a flex_bg's used_dirs
      ext4: Don't use delayed allocation by default when used instead of ext3
      ext4: Fix spelling of CONTIG_FS_EXT3 to CONFIG_FS_EXT3
      ext4: Fix estimate of # of blocks needed to write indirect-mapped files
    torvalds committed Mar 25, 2010
  4. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
      TIPC: Removed inactive maintainer
      isdn: Cleanup Sections in PCMCIA driver elsa
      isdn: Cleanup Sections in PCMCIA driver avma1
      isdn: Cleanup Sections in PCMCIA driver teles
      isdn: Cleanup Sections in PCMCIA driver sedlbauer
      via-velocity: Fix FLOW_CNTL_TX_RX handling in set_mii_flow_control()
      netfilter: xt_hashlimit: IPV6 bugfix
      netfilter: ip6table_raw: fix table priority
      netfilter: xt_hashlimit: dl_seq_stop() fix
      af_key: return error if pfkey_xfrm_policy2msg_prep() fails
      skbuff: remove unused dma_head & dma_maps fields
      vlan: updates vlan real_num_tx_queues
      vlan: adds vlan_dev_select_queue
      igb: only use vlan_gro_receive if vlans are registered
      igb: do not modify tx_queue_len on link speed change
      igb: count Rx FIFO errors correctly
      bnx2: Use proper handler during netpoll.
      bnx2: Fix netpoll crash.
      ksz884x: fix return value of netdev_set_eeprom
      cgroups: net_cls as module
      ...
    torvalds committed Mar 25, 2010
  5. TIPC: Removed inactive maintainer

    Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Jon Maloy committed with davem330 Mar 25, 2010
  6. isdn: Cleanup Sections in PCMCIA driver elsa

    Compiling this driver gave a section mismatch,
    so I reviewed the init/exit paths of the driver
    and made the correct changes.
    
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x55e37): Section mismatch
    in reference from the function elsa_cs_config() to the function
    .devinit.text:hisax_init_pcmcia()
    The function elsa_cs_config() references
    the function __devinit hisax_init_pcmcia().
    This is often because elsa_cs_config lacks a __devinit
    annotation or the annotation of hisax_init_pcmcia is wrong.
    
    Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
    Acked-by: Karsten Keil <keil@b1-systems.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Henne committed with davem330 Mar 25, 2010
  7. isdn: Cleanup Sections in PCMCIA driver avma1

    Compiling this driver gave a section mismatch,
    so I reviewed the init/exit paths of the driver
    and made the correct changes.
    
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x56512): Section mismatch
    in reference from the function avma1cs_config() to the function
    .devinit.text:hisax_init_pcmcia()
    The function avma1cs_config() references
    the function __devinit hisax_init_pcmcia().
    This is often because avma1cs_config lacks a __devinit
    annotation or the annotation of hisax_init_pcmcia is wrong.
    
    Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
    Acked-by: Karsten Keil <keil@b1-systems.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Henne committed with davem330 Mar 25, 2010
  8. isdn: Cleanup Sections in PCMCIA driver teles

    Compiling this driver gave a section mismatch,
    so I reviewed the init/exit paths of the driver
    and made the correct changes.
    
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x56bfb): Section mismatch
    in reference from the function teles_cs_config() to the function
    .devinit.text:hisax_init_pcmcia()
    The function teles_cs_config() references
    the function __devinit hisax_init_pcmcia().
    This is often because teles_cs_config lacks a __devinit
    annotation or the annotation of hisax_init_pcmcia is wrong.
    
    Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
    Acked-by: Karsten Keil <keil@b1-systems.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Henne committed with davem330 Mar 25, 2010
  9. isdn: Cleanup Sections in PCMCIA driver sedlbauer

    Compiling this driver gave a section mismatch,
    so I reviewed the init/exit paths of the driver
    and made the correct changes.
    
    WARNING: drivers/isdn/hisax/built-in.o(.text+0x558d6): Section mismatch
    in reference from the function sedlbauer_config() to the function
    .devinit.text:hisax_init_pcmcia()
    The function sedlbauer_config() references
    the function __devinit hisax_init_pcmcia().
    This is often because sedlbauer_config lacks a __devinit
    annotation or the annotation of hisax_init_pcmcia is wrong.
    
    Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
    Acked-by: Karsten Keil <keil@b1-systems.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Henne committed with davem330 Mar 25, 2010
  10. via-velocity: Fix FLOW_CNTL_TX_RX handling in set_mii_flow_control()

    Clear, don't set, ANAR_ASMDIR in this case.
    
    Noticed by Roel Kluin.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Mar 23, 2010
  11. x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1

    Yanko's GA-MA78GM-S2H (BIOS F11) reports the following resource in a PCI
    host bridge _CRS:
    
        [07] 32-Bit DWORD Address Space Resource
             Min Relocatability : MinFixed
             Max Relocatability : MaxFixed
                Address Minimum : CFF00000  (_MIN)
                Address Maximum : FEBFFFFF  (_MAX)
                 Address Length : 3EE10000  (_LEN)
    
    This is invalid per spec (ACPI 4.0, 6.4.3.5) because it's a fixed size,
    fixed location descriptor, but _LEN != _MAX - _MIN + 1.
    
    Based on https://bugzilla.kernel.org/show_bug.cgi?id=15480#c15, I think
    Windows handles this by truncating the window so it fits between _MIN and
    _MAX.  I also verified this by modifying the SeaBIOS DSDT and booting
    Windows 2008 R2 with qemu.
    
    This patch makes Linux truncate the window, too, which fixes:
        http://bugzilla.kernel.org/show_bug.cgi?id=15480
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Tested-by: Yanko Kaneti <yaneti@declera.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Bjorn Helgaas committed with jbarnes993 Mar 25, 2010
  12. x86/PCI: for host bridge address space collisions, show conflicting r…

    …esource
    
    With insert_resource_conflict(), we can learn what the actual conflict is,
    so print that info for debugging purposes.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Bjorn Helgaas committed with jbarnes993 Mar 25, 2010
  13. netfilter: xt_hashlimit: IPV6 bugfix

    A missing break statement in hashlimit_ipv6_mask(), and masks
    between /64 and /95 are not working at all...
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Eric Dumazet committed with kaber Mar 25, 2010
  14. frv/PCI: remove redundant warnings

    pci_claim_resource() already prints more detailed error messages, so these
    are really redundant.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Bjorn Helgaas committed with jbarnes993 Mar 22, 2010
  15. x86/PCI: remove redundant warnings

    pci_claim_resource() already prints more detailed error messages, so these
    are really redundant.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Bjorn Helgaas committed with jbarnes993 Mar 22, 2010
  16. PCI: don't say we claimed a resource if we failed

    pci_claim_resource() can fail, so pay attention and only claim success
    when it actually succeeded.  If pci_claim_resource() fails, it prints a
    useful diagnostic.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Bjorn Helgaas committed with jbarnes993 Mar 22, 2010
  17. PCI quirk: Disable MSI on VIA K8T890 systems

    Bugzilla 15287 indicates that there's a problem with Message Signalled
    Interrupts on VIA K8T890 systems.  Add a quirk to disable MSI on these
    systems.
    
    Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
    Tested-by: Jan Kreuzer <kontrollator@gmx.de>
    Tested-by: lh <jarryson@gmail.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Matthew Wilcox committed with jbarnes993 Mar 24, 2010
  18. netfilter: ip6table_raw: fix table priority

    The order of the IPv6 raw table is currently reversed, that makes impossible
    to use the NOTRACK target in IPv6: for example if someone enters
    
    ip6tables -t raw -A PREROUTING -p tcp --dport 80 -j NOTRACK
    
    and if we receive fragmented packets then the first fragment will be
    untracked and thus skip nf_ct_frag6_gather (and conntrack), while all
    subsequent fragments enter nf_ct_frag6_gather and reassembly will never
    successfully be finished.
    
    Singed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Jozsef Kadlecsik committed with kaber Mar 25, 2010
  19. netfilter: xt_hashlimit: dl_seq_stop() fix

    If dl_seq_start() memory allocation fails, we crash later in
    dl_seq_stop(), trying to kfree(ERR_PTR(-ENOMEM))
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Eric Dumazet committed with kaber Mar 25, 2010
Commits on Mar 24, 2010
  1. Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

    * 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
      OMAP: DSS2: panel-generic: re-implement mode changing
      OMAP: DSS2: initialize dss clk sources properly
      OMAP: DSS2: VRAM: Fix early_param for vram
    torvalds committed Mar 24, 2010
  2. Merge master.kernel.org:/home/rmk/linux-2.6-arm

    * master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] Orion5x: replace KEY_WLAN with KEY_WPS_BUTTON
      [ARM] Kirkwood: WPS button keycode mapping
      pxa168fb: fix incorrect resource calculation
      [ARM] pxa/raumfeld: fix button name
      [ARM] pxa/raumfeld: remove duplicated #include
      [ARM] locomo: fix unpaired spin_lock_irqsave
      [ARM] locomo: fix SPI register offset
      [ARM] pxa/sharpsl: add dependency of max1111 driver to sharpsl_pm
      [ARM] pxa: remove unnecessary 'select FB_W100' from some platforms
      [ARM] pxa: remove spi cs gpio direction to avoid clash with driver
      [ARM] mmp: fix for variables in uncompress.h being discarded
      [ARM] pxa: fix for variables in uncompress.h being discarded
      ARM: Update mach-types
      ARM: Fix IXP23xx build error in mach/memory.h
    torvalds committed Mar 24, 2010