Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v2.6.27-git7
Commits on Oct 16, 2008
  1. @torvalds

    {pci,pnp} quirks.c: don't use deprecated print_fn_descriptor_symbol()

    torvalds authored
    I dunno how this missed Bjorn and his quest to use %pF in commit
    c80cfb0 ("vsprintf: use new vsprintf
    symbolic function pointer format"), but it did.
    
    So use %pF in the two remaining places that still tried to print out
    function pointers by hand.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds

    Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6

    torvalds authored
    * git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (53 commits)
      NFS: Fix a resolution problem with nfs_inode->cache_change_attribute
      NFS: Fix the resolution problem with nfs_inode_attrs_need_update()
      NFS: Changes to inode->i_nlinks must set the NFS_INO_INVALID_ATTR flag
      RPC/RDMA: ensure connection attempt is complete before signalling.
      RPC/RDMA: correct the reconnect timer backoff
      RPC/RDMA: optionally emit useful transport info upon connect/disconnect.
      RPC/RDMA: reformat a debug printk to keep lines together.
      RPC/RDMA: harden connection logic against missing/late rdma_cm upcalls.
      RPC/RDMA: fix connect/reconnect resource leak.
      RPC/RDMA: return a consistent error, when connect fails.
      RPC/RDMA: adhere to protocol for unpadded client trailing write chunks.
      RPC/RDMA: avoid an oops due to disconnect racing with async upcalls.
      RPC/RDMA: maintain the RPC task bytes-sent statistic.
      RPC/RDMA: suppress retransmit on RPC/RDMA clients.
      RPC/RDMA: fix connection IRD/ORD setting
      RPC/RDMA: support FRMR client memory registration.
      RPC/RDMA: check selected memory registration mode at runtime.
      RPC/RDMA: add data types and new FRMR memory registration enum.
      RPC/RDMA: refactor the inline memory registration code.
      NFS: fix nfs_parse_ip_address() corner case
      ...
  3. @torvalds

    Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    torvalds authored
    …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_clock: prevent scd->clock from moving backwards
  4. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: us122l: fix missing unlock in usb_stream_hwdep_vm_fault()
      ALSA: hda - Fix quirk lists for realtek codecs
      ALSA: hda - Add support of ALC272
      ALSA: hda - Add ALC887 support
      ALSA: hda - Add ALC1200 support
      ALSA: hda - Fix PCI SSID of ASUS M90V
      ALSA: hda - Add auto mic switch in realtek auto-probe mode
      ALSA: Fix pxa2xx-ac97-lib.c compilation
      ALSA: ASoC: Hide TLV320AIC26 configuration option for non-OpenFirwmare users
      ALSA: hda: fix nid variable warning
      ALSA: ASoC: Fix compile-time warning for tlv320aic23.c
  5. @torvalds

    Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/lin…

    torvalds authored
    …ux/kernel/git/avi/kvm
    
    * 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (134 commits)
      KVM: ia64: Add intel iommu support for guests.
      KVM: ia64: add directed mmio range support for kvm guests
      KVM: ia64: Make pmt table be able to hold physical mmio entries.
      KVM: Move irqchip_in_kernel() from ioapic.h to irq.h
      KVM: Separate irq ack notification out of arch/x86/kvm/irq.c
      KVM: Change is_mmio_pfn to kvm_is_mmio_pfn, and make it common for all archs
      KVM: Move device assignment logic to common code
      KVM: Device Assignment: Move vtd.c from arch/x86/kvm/ to virt/kvm/
      KVM: VMX: enable invlpg exiting if EPT is disabled
      KVM: x86: Silence various LAPIC-related host kernel messages
      KVM: Device Assignment: Map mmio pages into VT-d page table
      KVM: PIC: enhance IPI avoidance
      KVM: MMU: add "oos_shadow" parameter to disable oos
      KVM: MMU: speed up mmu_unsync_walk
      KVM: MMU: out of sync shadow core
      KVM: MMU: mmu_convert_notrap helper
      KVM: MMU: awareness of new kvm_mmu_zap_page behaviour
      KVM: MMU: mmu_parent_walk
      KVM: x86: trap invlpg
      KVM: MMU: sync roots on mmu reload
      ...
  6. @torvalds

    Fix kernel/softirq.c printk format warning properly

    torvalds authored
    This fixes the broken 77af7e3
    ("softirq, warning fix: correct a format to avoid a warning") fix
    correctly.
    
    The type of a pointer subtraction is not "int", nor is it "long".  It
    can be either (or something else).  It's "ptrdiff_t", and the printk
    format for it is "%td".
    
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

    Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/lin…

    torvalds authored
    …ux/kernel/git/tip/linux-2.6-tip
    
    * 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      do_generic_file_read: s/EINTR/EIO/ if lock_page_killable() fails
      softirq, warning fix: correct a format to avoid a warning
      softirqs, debug: preemption check
      x86, pci-hotplug, calgary / rio: fix EBDA ioremap()
      IO resources, x86: ioremap sanity check to catch mapping requests exceeding, fix
      IO resources, x86: ioremap sanity check to catch mapping requests exceeding the BAR sizes
      softlockup: Documentation/sysctl/kernel.txt: fix softlockup_thresh description
      dmi scan: warn about too early calls to dmi_check_system()
      generic: redefine resource_size_t as phys_addr_t
      generic: make PFN_PHYS explicitly return phys_addr_t
      generic: add phys_addr_t for holding physical addresses
      softirq: allocate less vectors
      IO resources: fix/remove printk
      printk: robustify printk, update comment
      printk: robustify printk, fix #2
      printk: robustify printk, fix
      printk: robustify printk
    
    Fixed up conflicts in:
    	arch/powerpc/include/asm/types.h
    	arch/powerpc/platforms/Kconfig.cputype
    manually.
  8. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …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: fix compat-vdso
      x86/mm: unify init task OOM handling
      x86/mm: do not trigger a kernel warning if user-space disables interrupts and generates a page fault
  9. @JuliaLawall @torvalds

    FRV: Eliminate NULL test and memset after alloc_bootmem

    JuliaLawall authored torvalds committed
    As noted by Akinobu Mita in patch b1fceac,
    alloc_bootmem and related functions never return NULL and always return a
    zeroed region of memory.  Thus a NULL test or memset after calls to these
    functions is unnecessary.
    
     arch/frv/mm/init.c |    2 --
     1 file changed, 2 deletions(-)
    
    This was fixed using the following semantic patch.
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @@
    expression E;
    statement S;
    @@
    
    E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...)
    ... when != E
    (
    - BUG_ON (E == NULL);
    |
    - if (E == NULL) S
    )
    
    @@
    expression E,E1;
    @@
    
    E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...)
    ... when != E
    - memset(E,0,E1);
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. @hharrison @torvalds

    FRV: Switch unaligned access to the packed-struct implementation

    hharrison authored torvalds committed
    Switch unaligned access to the packed-struct implementation for BE accesses as
    this reduces the size of the kernel a little.  LE still uses the byte shift.
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @torvalds

    FRV: Provide dma_map_page() for NOMMU and fix comments

    David Howells authored torvalds committed
    Provide dma_map_page() for the NOMMU-mode FRV arch.
    
    Also do some fixing on the comments attached to the various DMA functions for
    both MMU and NOMMU mode FRV code.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @torvalds

    frv: use generic pci_enable_resources()

    Bjorn Helgaas authored torvalds committed
    Use the generic pci_enable_resources() instead of the arch-specific code.
    
    Unlike this arch-specific code, the generic version:
        - checks PCI_NUM_RESOURCES (11), not 6, resources
        - skips resources that have neither IORESOURCE_IO nor IORESOURCE_MEM set
        - skips ROM resources unless IORESOURCE_ROM_ENABLE is set
        - checks for resource collisions with "!r->parent"
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: Add more documentation to firewire-cdev.h
      firewire: fix ioctl() return code
      firewire: fix setting tag and sy in iso transmission
      firewire: fw-sbp2: fix another small generation access bug
      firewire: fw-sbp2: enforce s/g segment size limit
      firewire: fw_send_request_sync()
      ieee1394: survive a few seconds connection loss
      ieee1394: nodemgr clean up class iterators
      ieee1394: dv1394, video1394: remove unnecessary expressions
      ieee1394: raw1394: make write() thread-safe
      ieee1394: raw1394: narrow down the state_mutex protected region
      ieee1394: raw1394: replace BKL by local mutex, make ioctl() and mmap() thread-safe
      ieee1394: sbp2: enforce s/g segment size limit
      ieee1394: sbp2: check for DMA mapping failures
      ieee1394: sbp2: stricter dma_sync
      ieee1394: Use DIV_ROUND_UP
  14. @hharrison @torvalds

    lib: remove defining macros for strict_strto??

    hharrison authored torvalds committed
    Open-code them rather than using defining macros.  The function bodies are now
    next to their kerneldoc comments as a bonus.
    
    Add casts to the signed cases as they call into the unsigned versions.
    
    Avoids the sparse warnings:
    lib/vsprintf.c:249:1: warning: incorrect type in argument 3 (different signedness)
    lib/vsprintf.c:249:1:    expected unsigned long *res
    lib/vsprintf.c:249:1:    got long *res
    lib/vsprintf.c:249:1: warning: incorrect type in argument 3 (different signedness)
    lib/vsprintf.c:249:1:    expected unsigned long *res
    lib/vsprintf.c:249:1:    got long *res
    lib/vsprintf.c:251:1: warning: incorrect type in argument 3 (different signedness)
    lib/vsprintf.c:251:1:    expected unsigned long long *res
    lib/vsprintf.c:251:1:    got long long *res
    lib/vsprintf.c:251:1: warning: incorrect type in argument 3 (different signedness)
    lib/vsprintf.c:251:1:    expected unsigned long long *res
    lib/vsprintf.c:251:1:    got long long *res
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. @hharrison @torvalds

    lib: trivial whitespace tidy

    hharrison authored torvalds committed
    Remove extra lines before the EXPORT_SYMBOL()s
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. @hharrison @torvalds

    lib: pull base-guessing logic to helper function

    hharrison authored torvalds committed
    The default base is 10 unless there is a leading zero, in which
    case the base will be guessed as 8.
    
    The base will only be guesed as 16 when the string starts with '0x'
    the third character is a valid hex digit.
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. @torvalds

    init/do_mounts_md.c must #include <linux/delay.h>

    Adrian Bunk authored torvalds committed
    This patch fixes the following compile error caused by commit
    589f800 ("fastboot: make the raid
    autodetect code wait for all devices to init"):
    
        CC      init/do_mounts_md.o
      init/do_mounts_md.c: In function 'autodetect_raid':
      init/do_mounts_md.c:285: error: implicit declaration of function 'msleep'
      make[2]: *** [init/do_mounts_md.o] Error 1
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/cooloney/blackfin-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
      Blackfin arch: make sure cycles is marked as volatile so gcc doesnt reorder on us
      Blackfin arch: disable CONFIG_HW_RANDOM and CONFIG_DAB in defconfig files
      Blackfin arch: update cache flush prototypes with argument names to make them less mysterious
      Blackfin arch: move bfin_addr_dcachable() and friends into the cacheflush header where it belongs
      Blackfin arch: use the new bfin_addr_dcachable() function
      Blackfin arch: fix bug - build kernel failed at head.S when reprogram clock on all platforms
      Blackfin arch: unify/cleanup cache code
      Blackfin arch: update AD7879 platform resources in board file
      Blackfin arch: Zero out bss region in L1/L2 memory.
      Blackfin arch: add read/write IO accessor functions to Blackfin
      Blackfin arch: fix bug - some serial header files set RTS to an input when they should all be outputs
  19. @torvalds

    Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds authored
    …git/airlied/agp-2.6
    
    * 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
      agp/nvidia: Support agp user-memory on nvidia agp.
      agp/amd-k7: Suspend support for AMD K7 GART driver
      agp/intel: Reduce extraneous PCI posting reads during init
      agp: Fix stolen memory counting on G4X.
  20. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-cor…

    torvalds authored
    …e-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (46 commits)
      UIO: Fix mapping of logical and virtual memory
      UIO: add automata sercos3 pci card support
      UIO: Change driver name of uio_pdrv
      UIO: Add alignment warnings for uio-mem
      Driver core: add bus_sort_breadthfirst() function
      NET: convert the phy_device file to use bus_find_device_by_name
      kobject: Cleanup kobject_rename and !CONFIG_SYSFS
      kobject: Fix kobject_rename and !CONFIG_SYSFS
      sysfs: Make dir and name args to sysfs_notify() const
      platform: add new device registration helper
      sysfs: use ilookup5() instead of ilookup5_nowait()
      PNP: create device attributes via default device attributes
      Driver core: make bus_find_device_by_name() more robust
      usb: turn dev_warn+WARN_ON combos into dev_WARN
      debug: use dev_WARN() rather than WARN_ON() in device_pm_add()
      debug: Introduce a dev_WARN() function
      sysfs: fix deadlock
      device model: Do a quickcheck for driver binding before doing an expensive check
      Driver core: Fix cleanup in device_create_vargs().
      Driver core: Clarify device cleanup.
      ...
  21. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-f…

    torvalds authored
    …or-linus
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      module: remove CONFIG_KMOD in comment after #endif
      remove CONFIG_KMOD from fs
      remove CONFIG_KMOD from drivers
    
    Manually fix conflict due to include cleanups in drivers/md/md.c
  22. @torvalds

    Merge branch 'personality' of git://git390.osdl.marist.edu/pub/scm/li…

    torvalds authored
    …nux-2.6
    
    * 'personality' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
      [PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY
  23. @torvalds

    Merge branch 'docs' of git://git.lwn.net/linux-2.6

    torvalds authored
    * 'docs' of git://git.lwn.net/linux-2.6:
      Document panic_on_unrecovered_nmi sysctl
      Add a reference to paper to SubmittingPatches
      Add kerneldoc documentation for new printk format extensions
      Remove videobook.tmpl
      doc: Test-by?
      Add the development process document
      Documentation/block/data-integrity.txt: Fix section numbers
  24. @torvalds

    Merge branch 'for-linus' of git://neil.brown.name/md

    torvalds authored
    * 'for-linus' of git://neil.brown.name/md:
      md: fix input truncation in safe_delay_store()
      md: check for memory allocation failure in faulty personality
      md: build failure due to missing delay.h
      md: Relax minimum size restrictions on chunk_size.
      md: remove space after function name in declaration and call.
      md: Remove unnecessary #includes, #defines, and function declarations.
      md: Convert remaining 1k representations in linear.c to sectors.
      md: linear.c: Make two local variables sector-based.
      md: linear: Represent dev_info->size and dev_info->offset in sectors.
      md: linear.c: Remove broken debug code.
      md: linear.c: Remove pointless initialization of curr_offset.
      md: linear.c: Fix typo in comment.
      md: Don't try to set an array to 'read-auto' if it is already in that state.
      md: Allow metadata_version to be updated for externally managed metadata.
      md: Fix rdev_size_store with size == 0
  25. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (32 commits)
      Input: wm97xx - update email address for Liam Girdwood
      Input: i8042 - add Thinkpad R31 to nomux list
      Input: move map_to_7segment.h to include/linux
      Input: ads7846 - fix cache line sharing issue
      Input: cm109 - add missing newlines to messages
      Input: document i8042.debug in kernel-parameters.txt
      Input: keyboard - fix potential out of bound access to key_map
      Input: psmouse - add OLPC touchpad driver
      Input: psmouse - tweak PSMOUSE_DEFINE_ATTR to support raw set callbacks
      Input: psmouse - add psmouse_queue_work() for ps/2 extension to make use of
      Input: psmouse - export psmouse_set_state for ps/2 extensions to use
      Input: ads7846 - introduce .gpio_pendown to get pendown state
      Input: ALPS - add signature for DualPoint found in Dell Latitude E6500
      Input: serio_raw - allow attaching to translated (SERIO_I8042XL) ports
      Input: cm109 - don't use obsolete logging macros
      Input: atkbd - expand Latitude's force release quirk to other Dells
      Input: bf54x-keys - add power management support
      Input: atmel_tsadcc - improve accuracy
      Input: convert drivers to use strict_strtoul()
      Input: appletouch - handle geyser 3/4 status bits
      ...
  26. @geertu @torvalds

    rtc: rtc-ds1286 and rtc-m48t35 need <linux/io.h>

    geertu authored torvalds committed
    With m68k allmodconfig, I get:
    
    | drivers/rtc/rtc-ds1286.c: In function 'ds1286_rtc_read':
    | drivers/rtc/rtc-ds1286.c:33: error: implicit declaration of function '__raw_readl'
    | drivers/rtc/rtc-ds1286.c: In function 'ds1286_rtc_write':
    | drivers/rtc/rtc-ds1286.c:38: error: implicit declaration of function '__raw_writel'
    | drivers/rtc/rtc-ds1286.c: In function 'ds1286_probe':
    | drivers/rtc/rtc-ds1286.c:345: error: implicit declaration of function 'ioremap'
    | drivers/rtc/rtc-ds1286.c:345: warning: assignment makes pointer from integer without a cast
    | drivers/rtc/rtc-ds1286.c:365: error: implicit declaration of function 'iounmap'
    
    and
    
    | drivers/rtc/rtc-m48t35.c: In function 'm48t35_read_time':
    | drivers/rtc/rtc-m48t35.c:59: error: implicit declaration of function 'readb'
    | drivers/rtc/rtc-m48t35.c:60: error: implicit declaration of function 'writeb'
    | drivers/rtc/rtc-m48t35.c: In function 'm48t35_probe':
    | drivers/rtc/rtc-m48t35.c:168: error: implicit declaration of function 'ioremap'
    | drivers/rtc/rtc-m48t35.c:168: warning: assignment makes pointer from integer without a cast
    | drivers/rtc/rtc-m48t35.c:188: error: implicit declaration of function 'iounmap'
    
    Include <linux/io.h> to get access to the I/O API.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  27. Document panic_on_unrecovered_nmi sysctl

    Bernhard Walle authored Jonathan Corbet committed
    This adds "panic_on_unrecovered_nmi" sysctl to
    Documentation/filesystems/proc.txt. The text is mainly taken from
    http://readlist.com/lists/vger.kernel.org/linux-kernel/43/217998.html.
    
    Signed-off-by: Bernhard Walle <bwalle@suse.de>
    Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  28. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: blacklist additional SoundGraph iMon LCD models
      HID: fix/improve help texts for quirk drivers
      HID: fix default building of HID-quirk drivers
  29. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)
      decnet: Fix compiler warning in dn_dev.c
      IPV6: Fix default gateway criteria wrt. HIGH/LOW preference radv option
      net/802/fc.c: Fix compilation warnings
      netns: correct mib stats in ip6_route_me_harder()
      netns: fix net_generic array leak
      rt2x00: fix regression introduced by "mac80211: free up 2 bytes in skb->cb"
      rtl8187: Add USB ID for Belkin F5D7050 with RTL8187B chip
      p54usb: Device ID updates
      mac80211: fixme for kernel-doc
      ath9k/mac80211: disallow fragmentation in ath9k, report to userspace
      libertas : Remove unused variable warning for "old_channel" from cmd.c
      mac80211: Fix scan RX processing oops
      orinoco: fix unsafe locking in spectrum_cs_suspend
      orinoco: fix unsafe locking in orinoco_cs_resume
      cfg80211: fix debugfs error handling
      mac80211: fix debugfs netdev rename
      iwlwifi: fix ct kill configuration for 5350
      mac80211: fix HT information element parsing
      p54: Fix compilation problem on PPC
      mac80211: fix debugfs lockup
      ...
  30. @torvalds

    Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds authored
    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (51 commits)
      [ARM] 5308/1: Fix Viper ISA IRQ handling
      [ARM] 5307/1: pxa: fix CM-X2XX PCMCIA build error
      [ARM] 5306/1: pxa: fix build error on CM-X270
      [ARM] 5302/1: ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict
      [ARM] 5305/1: ARM: OMAP: Fix compile of McBSP by removing unnecessary check
      [ARM] 5301/1: ARM: OMAP: Add missing irq defines
      ARM: OMAP3: Add default kernel config for OMAP LDP
      ARM: OMAP3: Add basic board support for OMAP LDP
      ARM: OMAP3: Defconfig for the Gumstix Overo board (rev 3)
      ARM: OMAP3: Add support for the Gumstix Overo board (rev 3)
      ARM: OMAP3: Add Beagle defconfig
      ARM: OMAP3: Add minimal Beagle board support
      ARM: OMAP3: Add minimal omap3430 support
      ARM: OMAP2: Fix sparse, checkpatch warnings in OMAP2/3 IRQ code
      ARM: OMAP: Fixes to omap_mcbsp_request function
      ARM: OMAP: Add support for OMAP2430 in McBSP
      ARM: OMAP: Add support for McBSP devices 3 - 5 on 34xx
      ARM: OMAP: Allocate McBSP devices dynamically
      Fix sections for omap-mcbsp platform driver
      [ARM] S3C24XX: Additional include moves
      ...
  31. @JuliaLawall @torvalds

    drivers/net/xen-netfront.c: Use DIV_ROUND_UP

    JuliaLawall authored torvalds committed
    The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /
    (d)) but is perhaps more readable.
    
    An extract of the semantic patch that makes this change is as follows:
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @haskernel@
    @@
    
    #include <linux/kernel.h>
    
    @depends on haskernel@
    expression n,d;
    @@
    
    (
    - (n + d - 1) / d
    + DIV_ROUND_UP(n,d)
    |
    - (n + (d - 1)) / d
    + DIV_ROUND_UP(n,d)
    )
    
    @depends on haskernel@
    expression n,d;
    @@
    
    - DIV_ROUND_UP((n),d)
    + DIV_ROUND_UP(n,d)
    
    @depends on haskernel@
    expression n,d;
    @@
    
    - DIV_ROUND_UP(n,(d))
    + DIV_ROUND_UP(n,d)
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  32. @torvalds

    make kprobes.c:kretprobe_table_lock() static

    Adrian Bunk authored torvalds committed
    Make the needlessly global kretprobe_table_lock() static.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  33. @torvalds

    make hp_wmi_notify() static

    Adrian Bunk authored torvalds committed
    Make the needlessly global hp_wmi_notify() static.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  34. @torvalds

    ipc/sem.c: make free_un() static

    Adrian Bunk authored torvalds committed
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  35. @torvalds

    resource: add resource_type() and IORESOURCE_TYPE_BITS

    Magnus Damm authored torvalds committed
    Add resource_type() and IORESOURCE_TYPE_BITS.  They make it easier to add
    more resource types without having to rewrite tons of code.
    
    Signed-off-by: Magnus Damm <damm@igel.co.jp>
    Cc: Ben Dooks <ben-linux@fluff.org>
    Cc: Jean Delvare <khali@linux-fr.org>
    Cc: Paul Mundt <lethal@linux-sh.org>
    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.