Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
  [SKY2]: status polling loop (post merge)
  [NET]: Fix NAPI completion handling in some drivers.
  [TCP]: Limit processing lost_retrans loop to work-to-do cases
  [TCP]: Fix lost_retrans loop vs fastpath problems
  [TCP]: No need to re-count fackets_out/sacked_out at RTO
  [TCP]: Extract tcp_match_queue_to_sack from sacktag code
  [TCP]: Kill almost unused variable pcount from sacktag
  [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
  [TCP]: Add bytes_acked (ABC) clearing to FRTO too
  [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
  [NETFILTER]: x_tables: add missing ip6t_modulename aliases
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening
  [QETH]: fix qeth_main.c
  [NETLINK]: fib_frontend build fixes
  [IPv6]: Export userland ND options through netlink (RDNSS support)
  [9P]: build fix with !CONFIG_SYSCTL
  [NET]: Fix dev_put() and dev_hold() comments
  [NET]: make netlink user -> kernel interface synchronious
  [NET]: unify netlink kernel socket recognition
  [NET]: cleanup 3rd argument in netlink_sendskb
  ...

Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.

(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 18 insertions, 0 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 1e5d4d693195..36e3754db53a 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -496,7 +496,21 @@ static int do_sdio_entry(const char *filename,
         ADD(alias, "c", id->class != (__u8)SDIO_ANY_ID, id->class);
         ADD(alias, "v", id->vendor != (__u16)SDIO_ANY_ID, id->vendor);
         ADD(alias, "d", id->device != (__u16)SDIO_ANY_ID, id->device);
+        return 1;
+}
+
+/* Looks like: ssb:vNidNrevN. */
+static int do_ssb_entry(const char *filename,
+                        struct ssb_device_id *id, char *alias)
+{
+        id->vendor = TO_NATIVE(id->vendor);
+        id->coreid = TO_NATIVE(id->coreid);
+        id->revision = TO_NATIVE(id->revision);
 
+        strcpy(alias, "ssb:");
+        ADD(alias, "v", id->vendor != SSB_ANY_VENDOR, id->vendor);
+        ADD(alias, "id", id->coreid != SSB_ANY_ID, id->coreid);
+        ADD(alias, "rev", id->revision != SSB_ANY_REV, id->revision);
         return 1;
 }
 
@@ -619,6 +633,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct sdio_device_id), "sdio",
                          do_sdio_entry, mod);
+        else if (sym_is(symname, "__mod_ssb_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct ssb_device_id), "ssb",
+                         do_ssb_entry, mod);
 }
 
 /* Now add out buffered information to the generated C source */