Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
David S. Miller [Fri, 18 Jul 2008 09:39:39 +0000 (02:39 -0700)]
Conflicts:

Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c

38 files changed:
1  2 
Documentation/feature-removal-schedule.txt
Documentation/powerpc/booting-without-of.txt
MAINTAINERS
drivers/infiniband/ulp/ipoib/ipoib_multicast.c
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/cxgb3/common.h
drivers/net/cxgb3/cxgb3_ctl_defs.h
drivers/net/cxgb3/cxgb3_offload.c
drivers/net/fs_enet/fs_enet-main.c
drivers/net/ibm_newemac/core.c
drivers/net/macb.c
drivers/net/macvlan.c
drivers/net/myri10ge/myri10ge.c
drivers/net/ppp_generic.c
drivers/net/tun.c
drivers/net/ucc_geth.c
drivers/net/wireless/atmel.c
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/libertas/if_usb.c
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00pci.h
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/zd1201.c
drivers/s390/net/qeth_l3_main.c
fs/compat_ioctl.c
include/linux/pci_ids.h
lib/textsearch.c
net/8021q/vlan.c
net/bridge/br_fdb.c
net/bridge/br_stp.c
net/core/dev.c
net/irda/irnet/irnet_ppp.c
net/iucv/af_iucv.c
net/iucv/iucv.c
net/netfilter/nf_conntrack_netlink.c
net/sunrpc/auth_gss/auth_gss.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -43,8 -43,7 +43,8 @@@
  #include <asm/uaccess.h>
  
  #ifdef CONFIG_PPC_CPM_NEW_BINDING
 +#include <linux/of_gpio.h>
- #include <asm/of_platform.h>
+ #include <linux/of_platform.h>
  #endif
  
  #include "fs_enet.h"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -890,9 -879,10 +890,9 @@@ static int rt73usb_load_firmware(struc
        unsigned int i;
        int status;
        u32 reg;
-       char *ptr = data;
+       const char *ptr = data;
        char *cache;
        int buflen;
 -      int timeout;
  
        /*
         * Wait for stable hardware.
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #include <linux/module.h>
  #include <linux/netdevice.h>
  #include <linux/skbuff.h>
 -#include <net/datalink.h>
 -#include <linux/mm.h>
 -#include <linux/in.h>
  #include <linux/init.h>
+ #include <linux/rculist.h>
+ #include <net/p8022.h>
+ #include <net/arp.h>
  #include <linux/rtnetlink.h>
  #include <linux/notifier.h>
 +#include <net/rtnetlink.h>
  #include <net/net_namespace.h>
  #include <net/netns/generic.h>
 +#include <asm/uaccess.h>
  
  #include <linux/if_vlan.h>
  #include "vlan.h"
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
diff --cc net/iucv/iucv.c
@@@ -480,8 -480,8 +480,8 @@@ static void iucv_setmask_mp(void
                if (cpu_isset(cpu, iucv_buffer_cpumask) &&
                    !cpu_isset(cpu, iucv_irq_cpumask))
                        smp_call_function_single(cpu, iucv_allow_cpu,
-                                                NULL, 0, 1);
+                                                NULL, 1);
 -      preempt_enable();
 +      put_online_cpus();
  }
  
  /**
@@@ -521,9 -521,10 +521,14 @@@ static int iucv_enable(void
                goto out;
        /* Declare per cpu buffers. */
        rc = -EIO;
 -      preempt_disable();
 +      get_online_cpus();
        for_each_online_cpu(cpu)
++<<<<<<< HEAD:net/iucv/iucv.c
 +              smp_call_function_single(cpu, iucv_declare_cpu, NULL, 0, 1);
++=======
+               smp_call_function_single(cpu, iucv_declare_cpu, NULL, 1);
+       preempt_enable();
++>>>>>>> 5b664cb235e97afbf34db9c4d77f08ebd725335e:net/iucv/iucv.c
        if (cpus_empty(iucv_buffer_cpumask))
                /* No cpu could declare an iucv buffer. */
                goto out_path;
@@@ -546,9 -545,7 +551,13 @@@ out
   */
  static void iucv_disable(void)
  {
++<<<<<<< HEAD:net/iucv/iucv.c
 +      get_online_cpus();
 +      on_each_cpu(iucv_retrieve_cpu, NULL, 0, 1);
 +      put_online_cpus();
++=======
+       on_each_cpu(iucv_retrieve_cpu, NULL, 1);
++>>>>>>> 5b664cb235e97afbf34db9c4d77f08ebd725335e:net/iucv/iucv.c
        kfree(iucv_path_table);
  }
  
Simple merge
Simple merge