03 Sep, 2010

3 commits


13 Aug, 2010

1 commit


09 Aug, 2010

1 commit


06 Aug, 2010

23 commits

  • On Thu, Aug 05, 2010 at 07:01:21PM -0700, Linus Torvalds wrote:
    > On Thu, Aug 5, 2010 at 6:40 PM, Herbert Xu wrote:
    > >
    > > -config CRYPTO_MANAGER_TESTS
    > > - bool "Run algolithms' self-tests"
    > > - default y
    > > - depends on CRYPTO_MANAGER2
    > > +config CRYPTO_MANAGER_DISABLE_TESTS
    > > + bool "Disable run-time self tests"
    > > + depends on CRYPTO_MANAGER2 && EMBEDDED
    >
    > Why do you still want to force-enable those tests? I was going to
    > complain about the "default y" anyway, now I'm _really_ complaining,
    > because you've now made it impossible to disable those tests. Why?

    As requested, this patch sets the default to y and removes the
    EMBEDDED dependency.

    Signed-off-by: Herbert Xu

    Herbert Xu
     
  • This patch fixes a serious bug in the test disabling patch where
    it can cause an spurious load of the cryptomgr module even when
    it's compiled in.

    It also negates the test disabling option so that its absence
    causes tests to be enabled.

    The Kconfig option is also now behind EMBEDDED.

    Signed-off-by: Herbert Xu

    Herbert Xu
     
  • If a scatterwalk chain contains an entry with an unaligned offset then
    hash_walk_next() will cut off the next step at the next alignment point.

    However, if the entry ends before the next alignment point then we a loop,
    which leads to a kernel oops.

    Fix this by checking whether the next aligment point is before the end of the
    current entry.

    Signed-off-by: Szilveszter Ördög
    Acked-by: David S. Miller
    Signed-off-by: Herbert Xu

    Szilveszter Ördög
     
  • * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (204 commits)
    agp: intel-agp: do not use PCI resources before pci_enable_device()
    agp: efficeon-agp: do not use PCI resources before pci_enable_device()
    drm: kill BKL from common code
    drm/kms: Simplify setup of the initial I2C encoder config.
    drm,io-mapping: Specify slot to use for atomic mappings
    drm/radeon/kms: only expose underscan on avivo chips
    drm/radeon: add new pci ids
    drm: Cleanup after failing to create master->unique and dev->name
    drm/radeon: tone down overchatty acpi debug messages.
    drm/radeon/kms: enable underscan option for digital connectors
    drm/radeon/kms: fix calculation of h/v scaling factors
    drm/radeon/kms/igp: sideport is AMD only
    drm/radeon/kms: handle the case of no active displays properly in the bandwidth code
    drm: move ttm global code to core drm
    drm/i915: Clear the Ironlake dithering flags when the pipe doesn't want it.
    drm/radeon/kms: make sure HPD is set to NONE on analog-only connectors
    drm/radeon/kms: make sure rio_mem is valid before unmapping it
    drm/agp/i915: trim stolen space to 32M
    drm/i915: Unset cursor if out-of-bounds upon mode change (v4)
    drm/i915: Unreference object not handle on creation
    ...

    Linus Torvalds
     
  • * 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
    kgdb,docs: Update the kgdb docs to include kms
    drm_fb_helper: Preserve capability to use atomic kms
    i915: when kgdb is active display compression should be off
    drm/i915: use new fb debug hooks
    drm: add KGDB/KDB support
    fb: add hooks to handle KDB enter/exit
    kgdboc: Add call backs to allow kernel mode switching
    vt,console,kdb: automatically set kdb LINES variable
    vt,console,kdb: implement atomic console enter/leave functions

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
    debug_core,kdb: fix crash when arch does not have single step
    kgdb,x86: use macro HBP_NUM to replace magic number 4
    kgdb,mips: remove unused kgdb_cpu_doing_single_step operations
    mm,kdb,kgdb: Add a debug reference for the kdb kmap usage
    KGDB: Remove set but unused newPC
    ftrace,kdb: Allow dumping a specific cpu's buffer with ftdump
    ftrace,kdb: Extend kdb to be able to dump the ftrace buffer
    kgdb,powerpc: Replace hardcoded offset by BREAK_INSTR_SIZE
    arm,kgdb: Add ability to trap into debugger on notify_die
    gdbstub: do not directly use dbg_reg_def[] in gdb_cmd_reg_set()
    gdbstub: Implement gdbserial 'p' and 'P' packets
    kgdb,arm: Individual register get/set for arm
    kgdb,mips: Individual register get/set for mips
    kgdb,x86: Individual register get/set for x86
    kgdb,kdb: individual register set and and get API
    gdbstub: Optimize kgdb's "thread:" response for the gdb serial protocol
    kgdb: remove custom hex_to_bin()implementation

    Linus Torvalds
     
  • * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (63 commits)
    of/platform: Register of_platform_drivers with an "of:" prefix
    of/address: Clean up function declarations
    of/spi: call of_register_spi_devices() from spi core code
    of: Provide default of_node_to_nid() implementation.
    of/device: Make of_device_make_bus_id() usable by other code.
    of/irq: Fix endian issues in parsing interrupt specifiers
    of: Fix phandle endian issues
    of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string
    of: remove of_default_bus_ids
    of: make of_find_device_by_node generic
    microblaze: remove references to of_device and to_of_device
    sparc: remove references to of_device and to_of_device
    powerpc: remove references to of_device and to_of_device
    of/device: Replace of_device with platform_device in includes and core code
    of/device: Protect against binding of_platform_drivers to non-OF devices
    of: remove asm/of_device.h
    of: remove asm/of_platform.h
    of/platform: remove all of_bus_type and of_platform_bus_type references
    of: Merge of_platform_bus_type with platform_bus_type
    drivercore/of: Add OF style matching to platform bus
    ...

    Fix up trivial conflicts in arch/microblaze/kernel/Makefile due to just
    some obj-y removals by the devicetree branch, while the microblaze
    updates added a new file.

    Linus Torvalds
     
  • …s/security-testing-2.6

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
    apparmor: depends on NET

    Linus Torvalds
     
  • * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
    scripts/dtc: Fix a resource leak
    Documentation: fix ubuntu distro name
    MAINTAINERS: Update kbuild git URLs
    Add support for the C variable in the coccicheck script
    Add scripts/coccinelle/deref_null.cocci
    Add scripts/coccinelle/err_cast.cocci
    Add scripts/coccinelle/resource_size.cocci
    Add scripts/coccinelle/alloc/kzalloc-simple.cocci
    Add scripts/coccinelle/alloc/drop_kmalloc_cast.cocci
    Add Documentation/coccinelle.txt
    Add a target to use the Coccinelle checker
    scripts: decodecode: remove bashisms
    Makefile: clarify a comment
    checkkconfigsymbols.sh: Kconfig symbols sometimes have lowercase letters
    scripts: add nconf into gitignore file

    Linus Torvalds
     
  • * 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
    kbuild: Change section of generated debian packages to kernel
    kbuild: Mark that the packages generated conform to Standards-Version 3.8.4
    kbuild: Add homepage field to debian/control file

    Linus Torvalds
     
  • * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (26 commits)
    kconfig: add savedefconfig
    kconfig: code refactoring in confdata.c
    kconfig: refactor code in symbol.c
    kconfig: add alldefconfig
    kconfig: print more info when we see a recursive dependency
    kconfig: save location of config symbols
    kconfig: change nonint_oldconfig to listnewconfig
    kconfig: rename loose_nonint_oldconfig => oldnoconfig
    kconfig: use long options in conf
    kconfig: fix MODULES-related bug in case of no .config
    kconfig: make randconfig fair for booleans
    kconfig: Don't write invisible choice values
    kbuild: Warn on selecting symbols with unmet direct dependencies
    scripts:conf.c Fix warning: variable 'type' set but not used
    menuconfig: truncate list items
    menuconfig: fix to center checklist correctly in a corner case
    xconfig: add support to show hidden options which have prompts
    xconfig: remove unused function
    xconfig: clean up
    gconfig: fix null pointer warning
    ...

    Linus Torvalds
     
  • * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
    modpost: support objects with more than 64k sections
    trivial: fix a typo in a filename
    frv: clean up arch/frv/Makefile
    kbuild: allow assignment to {A,C}FLAGS_KERNEL on the command line
    kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line
    Kbuild: Add option to set -femit-struct-debug-baseonly
    Makefile: "make kernelrelease" should show the correct full kernel version
    Makefile.build: make KBUILD_SYMTYPES work again

    Linus Torvalds
     
  • * 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
    module: cleanup comments, remove noinline
    module: group post-relocation functions into post_relocation()
    module: move module args strndup_user to just before use
    module: pass load_info into other functions
    module: fix sysfs cleanup for !CONFIG_SYSFS
    module: sysfs cleanup
    module: layout_and_allocate
    module: fix crash in get_ksymbol() when oopsing in module init
    module: kallsyms functions take struct load_info
    module: refactor out section header rewriting: FIX modversions
    module: refactor out section header rewriting
    module: add load_info
    module: reduce stack usage for each_symbol()
    module: refactor load_module part 5
    module: refactor load_module part 4
    module: refactor load_module part 3
    module: refactor load_module part 2
    module: refactor load_module
    module: module_unload_init() cleanup

    Linus Torvalds
     
  • * 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
    virtio_blk: Remove VBID ioctl
    virtio_blk: Add 'serial' attribute to virtio-blk devices (v2)
    virtio_blk: support barriers without FLUSH feature

    Linus Torvalds
     
  • * 'upstream/xen' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: (23 commits)
    xen/panic: use xen_reboot and fix smp_send_stop
    Xen: register panic notifier to take crashes of xen guests on panic
    xen: support large numbers of CPUs with vcpu info placement
    xen: drop xen_sched_clock in favour of using plain wallclock time
    pvops: do not notify callers from register_xenstore_notifier
    Introduce CONFIG_XEN_PVHVM compile option
    blkfront: do not create a PV cdrom device if xen_hvm_guest
    support multiple .discard.* sections to avoid section type conflicts
    xen/pvhvm: fix build problem when !CONFIG_XEN
    xenfs: enable for HVM domains too
    x86: Call HVMOP_pagetable_dying on exit_mmap.
    x86: Unplug emulated disks and nics.
    x86: Use xen_vcpuop_clockevent, xen_clocksource and xen wallclock.
    implement O_NONBLOCK for /proc/xen/xenbus
    xen: Fix find_unbound_irq in presence of ioapic irqs.
    xen: Add suspend/resume support for PV on HVM guests.
    xen: Xen PCI platform device driver.
    x86/xen: event channels delivery on HVM.
    x86: early PV on HVM features initialization.
    xen: Add support for HVM hypercalls.
    ...

    Linus Torvalds
     
  • I'm trying to generate a of s in docbook for wireless to
    link together all the cfg80211 and mac80211 documentation.

    However, docbook will generate "re01.html" anew for each book for the
    first , presumably due to a bug in the stylesheets.

    An effective workaround is to use IDs for the filenames, which makes
    them more descriptive as well, e.g. API-enum-ieee80211-band.html.

    Signed-off-by: Johannes Berg
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Johannes Berg
     
  • Fixed some typos and wording.

    Signed-off-by: Nicolas Kaiser
    Signed-off-by: Linus Torvalds

    Nicolas Kaiser
     
  • Update section 3.7 examples to reflect the current state of the
    Makefiles used. Fix spelling and grammar errors along with flow of text.

    Signed-off-by: matt mooney
    Reviewed-by: WANG Cong
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Matt Mooney
     
  • Update section 3.2 and 3.5 example, along with text in section 3.5
    to reflect change.

    Signed-off-by: matt mooney
    Reviewed-by: WANG Cong
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Matt Mooney
     
  • Update section 3.3 Loadable module goals - obj-m, from $(-objs)
    to $(-y) for easier addition of conditional objects to the
    module. The examples are also updated to reflect the current state of
    each Makefile used.

    Signed-off-by: matt mooney
    Reviewed-by: WANG Cong
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Matt Mooney
     
  • Trivial typo fixes.

    Signed-off-by: Tommi Rantala
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Tommi Rantala
     
  • - sys_io_destroy(): acutually return -EINVAL if the context pointed to
    is invalidIndex: linux-2.6.33-rc4/fs/aio.c
    - sys_io_getevents(): An argument specifying timeout is not `when',
    but `timeout'.
    - sys_io_getevents(): Should describe what is returned if this syscall
    succeeds.

    Signed-off-by: Satoru Takeuchi
    Signed-off-by: Randy Dunlap
    Reviewed-by: Jeff Moyer
    Signed-off-by: Linus Torvalds

    Satoru Takeuchi
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (79 commits)
    powerpc/8xx: Add support for the MPC8xx based boards from TQC
    powerpc/85xx: Introduce support for the Freescale P1022DS reference board
    powerpc/85xx: Adding DTS for the STx GP3-SSA MPC8555 board
    powerpc/85xx: Change deprecated binding for 85xx-based boards
    powerpc/tqm85xx: add a quirk for ti1520 PCMCIA bridge
    powerpc/tqm85xx: update PCI interrupt-map attribute
    powerpc/mpc8308rdb: support for MPC8308RDB board from Freescale
    powerpc/fsl_pci: add quirk for mpc8308 pcie bridge
    powerpc/85xx: Cleanup QE initialization for MPC85xxMDS boards
    powerpc/85xx: Fix booting for P1021MDS boards
    powerpc/85xx: Fix SWIOTLB initalization for MPC85xxMDS boards
    powerpc/85xx: kexec for SMP 85xx BookE systems
    powerpc/5200/i2c: improve i2c bus error recovery
    of/xilinxfb: update tft compatible versions
    powerpc/fsl-diu-fb: Support setting display mode using EDID
    powerpc/5121: doc/dts-bindings: update doc of FSL DIU bindings
    powerpc/5121: shared DIU framebuffer support
    powerpc/5121: move fsl-diu-fb.h to include/linux
    powerpc/5121: fsl-diu-fb: fix issue with re-enabling DIU area descriptor
    powerpc/512x: add clock structure for Video-IN (VIU) unit
    ...

    Linus Torvalds
     

05 Aug, 2010

12 commits

  • * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (49 commits)
    microblaze: Add KGDB support
    microblaze: Support brki rX, 0x18 for user application debugging
    microblaze: Remove nop after MSRCLR/SET, MTS, MFS instructions
    microblaze: Simplify syscall rutine
    microblaze: Move PT_MODE saving to delay slot
    microblaze: Fix _interrupt function
    microblaze: Fix _user_exception function
    microblaze: Put together addik instructions
    microblaze: Use delay slot in syscall macros
    microblaze: Save kernel mode in delay slot
    microblaze: Do not mix register saving and mode setting
    microblaze: Move SAVE_STATE upward
    microblaze: entry.S: Macro optimization
    microblaze: Optimize hw exception rutine
    microblaze: Implement clear_ums macro and fix SAVE_STATE macro
    microblaze: Remove additional setup for kernel_mode
    microblaze: Optimize SAVE_STATE macro
    microblaze: Remove additional loading
    microblaze: Completely remove working with R11 register
    microblaze: Do not setup BIP in _debug_exception
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
    arch/sparc/mm: Use GFP_KERNEL
    MAINTAINERS: Add trailing slash to SBUS path.
    sbus: autoconvert trivial BKL users to private mutex

    Linus Torvalds
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
    [IA64] increase ia64 static per cpu area
    [IA64] Put ia64 config files on the Uwe Kleine-König diet
    [IA64] perfmon: convert to unlocked_ioctl
    [IA64] beautify vmlinux.lds.h

    Linus Torvalds
     
  • * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (150 commits)
    MIPS: PowerTV: Separate PowerTV USB support from non-USB code
    MIPS: strip the un-needed sections of vmlinuz
    MIPS: Clean up the calculation of VMLINUZ_LOAD_ADDRESS
    MIPS: Clean up arch/mips/boot/compressed/decompress.c
    MIPS: Clean up arch/mips/boot/compressed/ld.script
    MIPS: Unify the suffix of compressed vmlinux.bin
    MIPS: PowerTV: Add Gaia platform definitions.
    MIPS: BCM47xx: Fix nvram_getenv return value.
    MIPS: Octeon: Allow more than 3.75GB of memory with PCIe
    MIPS: Clean up notify_die() usage.
    MIPS: Remove unused task_struct.trap_no field.
    Documentation: Mention that KProbes is supported on MIPS
    SAMPLES: kprobe_example: Make it print something on MIPS.
    MIPS: kprobe: Add support.
    MIPS: Add instrunction format for BREAK and SYSCALL
    MIPS: kprobes: Define regs_return_value()
    MIPS: Ritually kill stupid printk.
    MIPS: Octeon: Disallow MSI-X interrupt and fall back to MSI interrupts.
    MIPS: Octeon: Support 256 MSI on PCIe
    MIPS: Decode core number for R2 CPUs.
    ...

    Linus Torvalds
     
  • Update the kgdb docs to include information about kernel mode setting support.

    [Randy Dunlap : grammatical corrections]

    CC: Randy Dunlap
    Signed-off-by: Jason Wessel

    Jason Wessel
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
    xtensa: Disable PCI and nfsroot on simulation target
    xtensa: Add missing include in coprocessor.h
    xtensa: Fix the network driver for the simulator target
    xtensa: Shuffle include statements to fix linker script
    xtensa: Add -mforce-no-pic option is supported
    xtensa: Fixes due to bss boundary symbol name changes.
    xtensa: Fix linker script patch-up
    xtensa: Fix FLUSH_DCACHE macro for some variants.

    Linus Torvalds
     
  • Signed-off-by: Nick Piggin
    Signed-off-by: Linus Torvalds

    Nick Piggin
     
  • Commit 5349ef3127c77075ff70b2014f17ae0fbcaaf199 (drm/fb: fix
    FBIOGET/PUT_VSCREENINFO pixel clock handling) changed the logic of
    when a pixclock was valid vs invalid.

    The atomic kernel mode setting used by the kernel debugger relies upon
    the drm_fb_helper_check_var() to always return -EINVAL. Until a
    better solution exists, this behavior will be restored.

    CC: David Airlie
    CC: Jesse Barnes
    CC: Clemens Ladisch
    Signed-off-by: Jason Wessel

    Jason Wessel
     
  • If the HW compression is left on, the call backs from the HW will
    crash the kernel. The only time this code is called is when kernel
    mode setting is in use with kgdb and the kdb shell.

    The atomic display pipe handler callback will reset everything when
    kgdb restores kernel to the run state.

    Signed-off-by: Jason Wessel
    Acked-by: Jesse Barnes
    CC: David Airlie

    Jason Wessel
     
  • Implement atomic kernel mode settings using the fb layer's debug hook
    system for supporting debugger interaction.

    Signed-off-by: Jesse Barnes
    Signed-off-by: Jason Wessel

    Jesse Barnes
     
  • Implement the callbacks for KDB entry/exit via the drm helpers.

    Signed-off-by: Jesse Barnes
    Signed-off-by: Jason Wessel

    Jesse Barnes
     
  • Add fb ops to handle enter/exit of the kernel debugger. If present, the
    fb core will register them with KGDB and they'll be called when the
    debugger is entered and exited. The new functions are responsible for
    switching to an appropriate debug framebuffer and restoring the
    interrupted state at exit time.

    Signed-off-by: Jesse Barnes
    Signed-off-by: Jason Wessel

    Jesse Barnes