From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Jun 2006 22:10:08 +0000 (-0700)
Subject: Merge git://git.infradead.org/hdrcleanup-2.6
X-Git-Tag: v2.6.18-rc1~1103
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cee4cca740d209bcb4b9857baa2253d5ba4e3fbe;p=linux-2.6

Merge git://git.infradead.org/hdrcleanup-2.6

* 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
---

cee4cca740d209bcb4b9857baa2253d5ba4e3fbe
diff --cc include/asm-mips/sn/kldir.h
index 97ad52e3cb,e3e231f0b7..0573cbffc1
--- a/include/asm-mips/sn/kldir.h
+++ b/include/asm-mips/sn/kldir.h
@@@ -11,8 -11,11 +11,7 @@@
  #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
diff --cc include/asm-mips/sn/sn0/arch.h
index f7c43fa24a,7a221666c5..f734f2007f
--- a/include/asm-mips/sn/sn0/arch.h
+++ b/include/asm-mips/sn/sn0/arch.h
@@@ -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.
diff --cc include/linux/netdevice.h
index e432b743dd,cebe677e15..5e8e2d5042
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -34,10 -34,8 +34,9 @@@
  #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;
diff --cc include/net/compat.h
index e65cbedb6a,da680272cf..9859b60280
--- a/include/net/compat.h
+++ b/include/net/compat.h
@@@ -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>