1. 07 May, 2007 20 commits
  2. 06 May, 2007 10 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild · 15700770
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (38 commits)
        kconfig: fix mconf segmentation fault
        kbuild: enable use of code from a different dir
        kconfig: error out if recursive dependencies are found
        kbuild: scripts/basic/fixdep segfault on pathological string-o-death
        kconfig: correct minor typo in Kconfig warning message.
        kconfig: fix path to modules.txt in Kconfig help
        usr/Kconfig: fix typo
        kernel-doc: alphabetically-sorted entries in index.html of 'htmldocs'
        kbuild: be more explicit on missing .config file
        kbuild: clarify the creation of the LOCALVERSION_AUTO string.
        kbuild: propagate errors from find in scripts/gen_initramfs_list.sh
        kconfig: refer to qt3 if we cannot find qt libraries
        kbuild: handle compressed cpio initramfs-es
        kbuild: ignore section mismatch warning for references from .paravirtprobe to .init.text
        kbuild: remove stale comment in modpost.c
        kbuild/mkuboot.sh: allow spaces in CROSS_COMPILE
        kbuild: fix make mrproper for Documentation/DocBook/man
        kbuild: remove kconfig binaries during make mrproper
        kconfig/menuconfig: do not hardcode '.config'
        kbuild: override build timestamp & version
        ...
      15700770
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm · 6de410c2
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (66 commits)
        KVM: Remove unused 'instruction_length'
        KVM: Don't require explicit indication of completion of mmio or pio
        KVM: Remove extraneous guest entry on mmio read
        KVM: SVM: Only save/restore MSRs when needed
        KVM: fix an if() condition
        KVM: VMX: Add lazy FPU support for VT
        KVM: VMX: Properly shadow the CR0 register in the vcpu struct
        KVM: Don't complain about cpu erratum AA15
        KVM: Lazy FPU support for SVM
        KVM: Allow passing 64-bit values to the emulated read/write API
        KVM: Per-vcpu statistics
        KVM: VMX: Avoid unnecessary vcpu_load()/vcpu_put() cycles
        KVM: MMU: Avoid heavy ASSERT at non debug mode.
        KVM: VMX: Only save/restore MSR_K6_STAR if necessary
        KVM: Fold drivers/kvm/kvm_vmx.h into drivers/kvm/vmx.c
        KVM: VMX: Don't switch 64-bit msrs for 32-bit guests
        KVM: VMX: Reduce unnecessary saving of host msrs
        KVM: Handle guest page faults when emulating mmio
        KVM: SVM: Report hardware exit reason to userspace instead of dmesg
        KVM: Retry sleeping allocation if atomic allocation fails
        ...
      6de410c2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · c6799ade
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (82 commits)
        [ARM] Add comments marking in-use ptrace numbers
        [ARM] Move syscall saving out of the way of utrace
        [ARM] 4360/1: S3C24XX: regs-udc.h remove unused macro
        [ARM] 4358/1: S3C24XX: mach-qt2410.c: remove linux/mmc/protocol.h header
        [ARM] mm 10: allow memory type to be specified with ioremap
        [ARM] mm 9: add additional device memory types
        [ARM] mm 8: define mem_types table L1 bit 4 to be for ARMv6
        [ARM] iop: add missing parens in macro
        [ARM] mm 7: remove duplicated __ioremap() prototypes
        ARM: OMAP: fix OMAP1 mpuio suspend/resume oops
        ARM: OMAP: MPUIO wake updates
        ARM: OMAP: speed up gpio irq handling
        ARM: OMAP: plat-omap changes for 2430 SDP
        ARM: OMAP: gpio object shrinkage, cleanup
        ARM: OMAP: /sys/kernel/debug/omap_gpio
        ARM: OMAP: Implement workaround for GPIO wakeup bug in OMAP2420 silicon
        ARM: OMAP: Enable 24xx GPIO autoidling
        [ARM] 4318/2: DSM-G600 Board Support
        [ARM] 4227/1: minor head.S fixups
        [ARM] 4328/1: Move i.MX UART regs to driver
        ...
      c6799ade
    • Russell King's avatar
      Merge branch 'ixp4xx' into devel · 5cd47155
      Russell King authored
      Conflicts:
      
      	include/asm-arm/arch-ixp4xx/io.h
      5cd47155
    • Russell King's avatar
      Merge branches 'arm-mm', 'at91', 'clkevts', 'imx', 'iop', 'misc', 'netx',... · 6f95416e
      Russell King authored
      Merge branches 'arm-mm', 'at91', 'clkevts', 'imx', 'iop', 'misc', 'netx', 'ns9xxx', 'omap', 'pxa', 'rpc', 's3c' and 'sa1100' into devel
      6f95416e
    • Russell King's avatar
    • Russell King's avatar
      [ARM] Move syscall saving out of the way of utrace · 5ba6d3fe
      Russell King authored
      
      
      utrace removes the ptrace_message field in task_struct.  Move our use
      of this field into a new member in thread_info called "syscall"
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      5ba6d3fe
    • Marcin Garski's avatar
      kconfig: fix mconf segmentation fault · 11de39e2
      Marcin Garski authored
      
      
      I have found small bug in mconf, when you run it without any argument it
      will sigsegv.
      
      Without patch:
      $ scripts/kconfig/mconf
      Segmentation fault
      
      With patch:
      $ scripts/kconfig/mconf
      can't find file (null)
      Signed-off-by: default avatarMarcin Garski <mgarski@post.pl>
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      11de39e2
    • Sam Ravnborg's avatar
      kbuild: enable use of code from a different dir · 767e581d
      Sam Ravnborg authored
      
      
      To introduce support for source in one directory but output files
      in another directory during a non O= build prefix all paths
      with $(src) repsectively $(obj).
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      767e581d
    • Sam Ravnborg's avatar
      kconfig: error out if recursive dependencies are found · 5447d34b
      Sam Ravnborg authored
      
      
      Sample:
      config FOO
      	bool "This is foo"
      	depends on BAR
      
      config BAR
      	bool "This is bar"
      	depends on FOO
      
      This will result in following error message:
      error: found recursive dependency: FOO -> BAR -> FOO
      
      And will then exit with exit code equal 1 so make will stop.
      Inspired by patch from: Adrian Bunk <bunk@stusta.de>
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Cc: Adrian Bunk <bunk@stusta.de>
      Cc: Roman Zippel <zippel@linux-m68k.org>
      5447d34b
  3. 05 May, 2007 10 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · b7405e16
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] Fix typo in cifs readme from previous commit
        [CIFS] Make sec=none force an anonymous mount
        [CIFS] Change semaphore to mutex for cifs lock_sem
        [CIFS] Fix oops in reset_cifs_unix_caps on reconnect
        [CIFS] UID/GID override on CIFS mounts to Samba
        [CIFS] prefixpath mounts to servers supporting posix paths used wrong slash
        [CIFS] Update cifs version to 1.49
        [CIFS] Replace kmalloc/memset combination with kzalloc
        [CIFS]  Add IPv6 support
        [CIFS] New CIFS POSIX mkdir performance improvement (part 2)
        [CIFS] New CIFS POSIX mkdir performance improvement
        [CIFS] Add write perm for usr to file on windows should remove r/o dos attr
        [CIFS] Remove unnecessary parm to cifs_reopen_file
        [CIFS] Switch cifsd to kthread_run from kernel_thread
        [CIFS] Remove unnecessary checks
      b7405e16
    • Steve French's avatar
      0ec54aa8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 · ea62ccd0
      Linus Torvalds authored
      * 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
      
      : (231 commits)
        [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall
        [PATCH] i386: type may be unused
        [PATCH] i386: Some additional chipset register values validation.
        [PATCH] i386: Add missing !X86_PAE dependincy to the 2G/2G split.
        [PATCH] x86-64: Don't exclude asm-offsets.c in Documentation/dontdiff
        [PATCH] i386: avoid redundant preempt_disable in __unlazy_fpu
        [PATCH] i386: white space fixes in i387.h
        [PATCH] i386: Drop noisy e820 debugging printks
        [PATCH] x86-64: Fix allnoconfig error in genapic_flat.c
        [PATCH] x86-64: Shut up warnings for vfat compat ioctls on other file systems
        [PATCH] x86-64: Share identical video.S between i386 and x86-64
        [PATCH] x86-64: Remove CONFIG_REORDER
        [PATCH] x86-64: Print type and size correctly for unknown compat ioctls
        [PATCH] i386: Remove copy_*_user BUG_ONs for (size < 0)
        [PATCH] i386: Little cleanups in smpboot.c
        [PATCH] x86-64: Don't enable NUMA for a single node in K8 NUMA scanning
        [PATCH] x86: Use RDTSCP for synchronous get_cycles if possible
        [PATCH] i386: Add X86_FEATURE_RDTSCP
        [PATCH] i386: Implement X86_FEATURE_SYNC_RDTSC on i386
        [PATCH] i386: Implement alternative_io for i386
        ...
      
      Fix up trivial conflict in include/linux/highmem.h manually.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ea62ccd0
    • Linus Torvalds's avatar
      Fix compile of tmscsim SCSI driver · 886a0768
      Linus Torvalds authored
      
      
      It still used the long-deprecated "pci_module_init()" interface, rather
      than the proper "pci_register_driver()" one.
      
      [ I don't have the hardware, and I doubt many do, but the fix is
        trivial and obvious, and can't be worse than not compiling ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      886a0768
    • Ralf Baechle's avatar
      Fix nfsroot build · 989485c1
      Ralf Baechle authored
      
      
        CC      fs/nfs/nfsroot.o
      fs/nfs/nfsroot.c:131: error: tokens causes a section type conflict
      make[2]: *** [fs/nfs/nfsroot.o] Error 1
      
      This is due to mixing const and non-const content in the same section
      which halfway recent gccs absolutely hate.  Fixed by dropping the const.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      989485c1
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 68762f3d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [TG3]: Add TG3_FLAG_SUPPORT_MSI flag.
        [TG3]: Eliminate the TG3_FLAG_5701_REG_WRITE_BUG flag.
        [TG3]: Eliminate the TG3_FLAG_GOT_SERDES_FLOWCTL flag.
        [TG3]: Remove reset during MAC address changes.
        [TG3]: WoL fixes.
        [TG3]: Clear GPIO mask before storing.
        [TG3]: Improve NVRAM sizing.
        [TG3]: Fix TSO bugs.
        [MAC80211]: Add maintainers entry for mac80211.
        [MAC80211]: Add debugfs attributes.
        [MAC80211]: Add mac80211 wireless stack.
        [MAC80211]: Add generic include/linux/ieee80211.h
        [NETLINK]: Remove references to process ID
        [AF_IUCV]: Compile fix - adopt to skbuff changes.
      68762f3d
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 4f7a307d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (87 commits)
        [SCSI] fusion: fix domain validation loops
        [SCSI] qla2xxx: fix regression on sparc64
        [SCSI] modalias for scsi devices
        [SCSI] sg: cap reserved_size values at max_sectors
        [SCSI] BusLogic: stop using check_region
        [SCSI] tgt: fix rdma transfer bugs
        [SCSI] aacraid: fix aacraid not finding device
        [SCSI] aacraid: Correct SMC products in aacraid.txt
        [SCSI] scsi_error.c: Add EH Start Unit retry
        [SCSI] aacraid: [Fastboot] Panics for AACRAID driver during 'insmod' for kexec test.
        [SCSI] ipr: Driver version to 2.3.2
        [SCSI] ipr: Faster sg list fetch
        [SCSI] ipr: Return better qc_issue errors
        [SCSI] ipr: Disrupt device error
        [SCSI] ipr: Improve async error logging level control
        [SCSI] ipr: PCI unblock config access fix
        [SCSI] ipr: Fix for oops following SATA request sense
        [SCSI] ipr: Log error for SAS dual path switch
        [SCSI] ipr: Enable logging of debug error data for all devices
        [SCSI] ipr: Add new PCI-E IDs to device table
        ...
      4f7a307d
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6 · fabb5c4e
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6:
        [VOYAGER] add smp alternatives
        [VOYAGER] Use modern techniques to setup and teardown low identiy mappings.
        [VOYAGER] Convert the monitor thread to use the kthread API
        [VOYAGER] clockevents driver: bring voyager in to line
        [VOYAGER] clockevents: correct boot cpu is zero assumption
        [VOYAGER] add smp_call_function_single
      fabb5c4e
    • Arnaud Patard's avatar
      [ARM] 4360/1: S3C24XX: regs-udc.h remove unused macro · d0fdb5a5
      Arnaud Patard authored
      
      
      The S3C2410_UDC_SETIX() macro is not used and won't be used by the udc
      driver, so delete it.
      Signed-off-by: default avatarArnaud Patard <arnaud.patard@rtp-net.org>
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      d0fdb5a5
    • Arnaud Patard's avatar
      [ARM] 4358/1: S3C24XX: mach-qt2410.c: remove linux/mmc/protocol.h header · c4b5bd4b
      Arnaud Patard authored
      
      
      linux/mmc/protocol.h header is gone, thus breaking the build of the
      mach-qt2410.c file. As this header is not used, I'm removing it. The
      right headers may still be added later if needed.
      Signed-off-by: default avatarArnaud Patard <arnaud.patard@rtp-net.org>
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      c4b5bd4b