]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge git://git.infradead.org/hdrcleanup-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Jun 2006 22:10:08 +0000 (15:10 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Jun 2006 22:10:08 +0000 (15:10 -0700)
* git://git.infradead.org/hdrcleanup-2.6: (63 commits)
  [S390] __FD_foo definitions.
  Switch to __s32 types in joystick.h instead of C99 types for consistency.
  Add <sys/types.h> to headers included for userspace in <linux/input.h>
  Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
  Remove struct fddi_statistics from user view in <linux/if_fddi.h>
  Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
  Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
  Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
  Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
  Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
  Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
  Use __uXX types in <linux/divert.h> for struct divert_blk et al.
  Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
  Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
  Use __uXX types in user-visible structures in <linux/nbd.h>
  Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
  Use __uXX types for S390 DASD volume label definitions which are user-visible
  S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
  Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
  Fix private integer types used in V4L2 ioctls.
  ...

Manually resolve conflict in include/linux/mtd/physmap.h

51 files changed:
1  2 
include/asm-alpha/smp.h
include/asm-arm/arch-lh7a40x/constants.h
include/asm-arm/arch-lh7a40x/irqs.h
include/asm-arm/arch-lh7a40x/registers.h
include/asm-arm/arch-s3c2410/uncompress.h
include/asm-arm/system.h
include/asm-mips/addrspace.h
include/asm-mips/ddb5xxx/ddb5xxx.h
include/asm-mips/delay.h
include/asm-mips/fpu.h
include/asm-mips/futex.h
include/asm-mips/mach-ip32/cpu-feature-overrides.h
include/asm-mips/mach-mips/cpu-feature-overrides.h
include/asm-mips/mach-sim/cpu-feature-overrides.h
include/asm-mips/mipsregs.h
include/asm-mips/mmzone.h
include/asm-mips/page.h
include/asm-mips/pgtable-32.h
include/asm-mips/pgtable-64.h
include/asm-mips/pgtable.h
include/asm-mips/processor.h
include/asm-mips/smp.h
include/asm-mips/sn/addrs.h
include/asm-mips/sn/klconfig.h
include/asm-mips/sn/kldir.h
include/asm-mips/sn/sn0/addrs.h
include/asm-mips/sn/sn0/arch.h
include/asm-mips/sn/sn0/hubmd.h
include/asm-mips/war.h
include/asm-s390/lowcore.h
include/asm-sparc64/pgtable.h
include/linux/input.h
include/linux/mempolicy.h
include/linux/mmzone.h
include/linux/module.h
include/linux/mtd/mtd.h
include/linux/mtd/nand.h
include/linux/netdevice.h
include/linux/netfilter_ipv4/ip_conntrack.h
include/linux/pci.h
include/linux/skbuff.h
include/linux/tcp.h
include/linux/vt_kern.h
include/mtd/mtd-abi.h
include/net/compat.h
include/net/ip.h
include/net/netfilter/nf_conntrack.h
include/net/raw.h
include/net/sctp/sctp.h
include/net/sock.h
include/net/tcp.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 97ad52e3cbc7ded4f57f853b3bf27577d979aeef,e3e231f0b79d54c649a61a386492cc3bd9bcba20..0573cbffc104e07f8c192e6ebfc056794100e7be
  #ifndef _ASM_SN_KLDIR_H
  #define _ASM_SN_KLDIR_H
  
- #include <linux/config.h>
  
 -#if defined(CONFIG_SGI_IO)
 -#include <asm/hack.h>
 -#endif
 -
  /*
   * The kldir memory area resides at a fixed place in each node's memory and
   * provides pointers to most other IP27 memory areas.  This allows us to
Simple merge
index f7c43fa24aa8374cf8ab2d8bd5b94c1540e4dea7,7a221666c58ed4e0febd78e2ab32a07920e3eda1..f734f2007f2400be504183c3386321f3e462be70
@@@ -11,8 -11,9 +11,7 @@@
  #ifndef _ASM_SN_SN0_ARCH_H
  #define _ASM_SN_SN0_ARCH_H
  
- #include <linux/config.h>
  
 -#ifndef SABLE
 -
  #ifndef SN0XXL  /* 128 cpu SMP max */
  /*
   * This is the maximum number of nodes that can be part of a kernel.
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index e432b743dda24e8a0cacc263f4790d2fdb73cc6e,cebe677e153b899b956c9d59961c34ad86f63011..5e8e2d50429a14c0fed74692e5a1616a842b9295
  #include <asm/cache.h>
  #include <asm/byteorder.h>
  
- #include <linux/config.h>
  #include <linux/device.h>
  #include <linux/percpu.h>
 +#include <linux/dmaengine.h>
  
  struct divert_blk;
  struct vlan_group;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index e65cbedb6abcec07e08caedce8ed7785fabcce57,da680272cf6e99f6160b3f8f3332fd0d194f0f2f..9859b60280d5631571cdbebdf611c28c8e283b48
@@@ -1,10 -1,7 +1,9 @@@
  #ifndef NET_COMPAT_H
  #define NET_COMPAT_H
  
- #include <linux/config.h>
  
 +struct sock;
 +
  #if defined(CONFIG_COMPAT)
  
  #include <linux/compat.h>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge