22 Nov, 2011

1 commit


07 Nov, 2011

1 commit

  • * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
    Revert "tracing: Include module.h in define_trace.h"
    irq: don't put module.h into irq.h for tracking irqgen modules.
    bluetooth: macroize two small inlines to avoid module.h
    ip_vs.h: fix implicit use of module_get/module_put from module.h
    nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
    include: replace linux/module.h with "struct module" wherever possible
    include: convert various register fcns to macros to avoid include chaining
    crypto.h: remove unused crypto_tfm_alg_modname() inline
    uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
    pm_runtime.h: explicitly requires notifier.h
    linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
    miscdevice.h: fix up implicit use of lists and types
    stop_machine.h: fix implicit use of smp.h for smp_processor_id
    of: fix implicit use of errno.h in include/linux/of.h
    of_platform.h: delete needless include
    acpi: remove module.h include from platform/aclinux.h
    miscdevice.h: delete unnecessary inclusion of module.h
    device_cgroup.h: delete needless include
    net: sch_generic remove redundant use of
    net: inet_timewait_sock doesnt need
    ...

    Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
    - drivers/media/dvb/frontends/dibx000_common.c
    - drivers/media/video/{mt9m111.c,ov6650.c}
    - drivers/mfd/ab3550-core.c
    - include/linux/dmaengine.h

    Linus Torvalds
     

01 Nov, 2011

2 commits

  • For access to the EXPORT_SYMBOL variants and THIS_MODULE macros.

    Signed-off-by: Paul Gortmaker

    Paul Gortmaker
     
  • * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
    microblaze: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW usage
    microblaze: Use delay slot in __strnlen_user, __strncpy_user
    microblaze: Remove NET_IP_ALIGN from system.h
    microblaze: Add __ucmpdi2() helper function
    microblaze: Raise SIGFPE/FPE_INTDIV for div by zero
    microblaze: Switch ELF_ARCH code to 189
    microblaze: Added DMA sync operations
    microblaze: Moved __dma_sync() to dma-mapping.h
    microblaze: Add PVR for Microblaze v8.20.a
    microblaze: Fix access_ok macro
    microblaze: Add loop unrolling for PAGE in copy_tofrom_user
    microblaze: Simplify logic for unaligned byte copying
    microblaze: Change label names - copy_tofrom_user
    microblaze: Separate fixup section definition
    microblaze: Change label name in copy_tofrom_user
    microblaze: Clear top bit from cnt32_to_63

    Linus Torvalds
     

14 Oct, 2011

16 commits


13 Oct, 2011

1 commit


28 Sep, 2011

1 commit

  • There are numerous broken references to Documentation files (in other
    Documentation files, in comments, etc.). These broken references are
    caused by typo's in the references, and by renames or removals of the
    Documentation files. Some broken references are simply odd.

    Fix these broken references, sometimes by dropping the irrelevant text
    they were part of.

    Signed-off-by: Paul Bolle
    Signed-off-by: Jiri Kosina

    Paul Bolle
     

27 Aug, 2011

1 commit


28 Jul, 2011

1 commit

  • * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
    microblaze: Do not show error message for 32 interrupt lines
    Revert "microblaze: PCI fix typo fault in of_node pointer moving into pci_bus"
    microblaze: PCI fix typo fault in of_node pointer moving into pci_bus
    microblaze: Add support for early console on mdm
    microblaze: Simplify early console binding from DT
    microblaze: Get early printk console earlier
    microblaze: Standardise cpuinfo output for cache policy
    microblaze: Unprivileged stream instruction awareness
    microblaze: trivial: Fix typo fault
    microblaze: exec: Remove redundant set_fs(USER_DS)
    microblaze: Remove duplicated prototype of start_thread()
    microblaze: Fix unaligned value saving to the stack for system with MMU
    microblaze/irqs: Do not trace arch_local_{*,irq_*} functions

    Linus Torvalds
     

27 Jul, 2011

4 commits

  • When interrupt controller uses 32 interrupts lines the kernel
    show error message about mismatch in kind-of-intr parameter
    because it exceeds u32. Recast fixs this issue.

    Signed-off-by: Michal Simek

    Michal Simek
     
  • …git/arm/linux-arm-soc

    * 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
    ARM: Consolidate the clkdev header files
    ARM: set vga memory base at run-time
    ARM: convert PCI defines to variables
    ARM: pci: make pcibios_assign_all_busses use pci_has_flag
    ARM: remove unnecessary mach/hardware.h includes
    pci: move microblaze and powerpc pci flag functions into asm-generic
    powerpc: rename ppc_pci_*_flags to pci_*_flags

    Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h

    Linus Torvalds
     
  • This allows us to move duplicated code in
    (atomic_inc_not_zero() for now) to

    Signed-off-by: Arun Sharma
    Reviewed-by: Eric Dumazet
    Cc: Ingo Molnar
    Cc: David Miller
    Cc: Eric Dumazet
    Acked-by: Mike Frysinger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Arun Sharma
     
  • [ poleg@redhat.com: no need to declare show_regs() in ptrace.h, sched.h does this ]
    Signed-off-by: Mike Frysinger
    Cc: Tejun Heo
    Signed-off-by: Oleg Nesterov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Frysinger
     

26 Jul, 2011

2 commits

  • This reverts commit c9d761b7c4b658a937a941aea2781f511a0ff3ec.

    Ben' commit "microblaze/pci: Move the remains of pci_32.c to pci-common.c"
    (sha1: bf13a6fa09b8db7f1fd59b5e2ed3674a89a6a25c)
    completely removed pci_32.c that's why my fixing commit caused
    the problem with merging and need to be revert.

    Signed-off-by: Michal Simek

    Michal Simek
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
    fs: Merge split strings
    treewide: fix potentially dangerous trailing ';' in #defined values/expressions
    uwb: Fix misspelling of neighbourhood in comment
    net, netfilter: Remove redundant goto in ebt_ulog_packet
    trivial: don't touch files that are removed in the staging tree
    lib/vsprintf: replace link to Draft by final RFC number
    doc: Kconfig: `to be' -> `be'
    doc: Kconfig: Typo: square -> squared
    doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
    drivers/net: static should be at beginning of declaration
    drivers/media: static should be at beginning of declaration
    drivers/i2c: static should be at beginning of declaration
    XTENSA: static should be at beginning of declaration
    SH: static should be at beginning of declaration
    MIPS: static should be at beginning of declaration
    ARM: static should be at beginning of declaration
    rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
    Update my e-mail address
    PCIe ASPM: forcedly -> forcibly
    gma500: push through device driver tree
    ...

    Fix up trivial conflicts:
    - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
    - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
    - drivers/net/r8169.c (just context changes)

    Linus Torvalds
     

25 Jul, 2011

10 commits