Merge branch 'akpm' (patches from Andrew)

Merge yet more updates from Andrew Morton:

 - a few MM remainders

 - misc things

 - autofs updates

 - signals

 - affs updates

 - ipc

 - nilfs2

 - spelling.txt updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (78 commits)
  mm, x86: fix HIGHMEM64 && PARAVIRT build config for native_pud_clear()
  mm: add arch-independent testcases for RODATA
  hfs: atomically read inode size
  mm: clarify mm_struct.mm_{users,count} documentation
  mm: use mmget_not_zero() helper
  mm: add new mmget() helper
  mm: add new mmgrab() helper
  checkpatch: warn when formats use %Z and suggest %z
  lib/vsprintf.c: remove %Z support
  scripts/spelling.txt: add some typo-words
  scripts/spelling.txt: add "followings" pattern and fix typo instances
  scripts/spelling.txt: add "therfore" pattern and fix typo instances
  scripts/spelling.txt: add "overwriten" pattern and fix typo instances
  scripts/spelling.txt: add "overwritting" pattern and fix typo instances
  scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
  scripts/spelling.txt: add "disassocation" pattern and fix typo instances
  scripts/spelling.txt: add "omited" pattern and fix typo instances
  scripts/spelling.txt: add "explictely" pattern and fix typo instances
  scripts/spelling.txt: add "applys" pattern and fix typo instances
  scripts/spelling.txt: add "configuartion" pattern and fix typo instances
  ...

28 files changed, 46 insertions, 48 deletions

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 10d2bdce686e..465cc24b41e5 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1656,7 +1656,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
         ddp->deh_dport = usat->sat_port;
         ddp->deh_sport = at->src_port;
 
-        SOCK_DEBUG(sk, "SK %p: Copy user data (%Zd bytes).\n", sk, len);
+        SOCK_DEBUG(sk, "SK %p: Copy user data (%zd bytes).\n", sk, len);
 
         err = memcpy_from_msg(skb_put(skb, len), msg, len);
         if (err) {
@@ -1720,7 +1720,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
                  */
                 aarp_send_ddp(dev, skb, &usat->sat_addr, NULL);
         }
-        SOCK_DEBUG(sk, "SK %p: Done write (%Zd).\n", sk, len);
+        SOCK_DEBUG(sk, "SK %p: Done write (%zd).\n", sk, len);
 
 out:
         release_sock(sk);
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 3b3b1a292ec8..a190800572bd 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -451,7 +451,7 @@ static void lane2_assoc_ind(struct net_device *dev, const u8 *mac_addr,
                         return;
         }
         if (end_of_tlvs - tlvs != 0)
-                pr_info("(%s) ignoring %Zd bytes of trailing TLV garbage\n",
+                pr_info("(%s) ignoring %zd bytes of trailing TLV garbage\n",
                         dev->name, end_of_tlvs - tlvs);
 }
 
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 48f9471e7c85..f64d6566021f 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -851,7 +851,7 @@ static int hci_sock_release(struct socket *sock)
 
         if (hdev) {
                 if (hci_pi(sk)->channel == HCI_CHANNEL_USER) {
-                        /* When releasing an user channel exclusive access,
+                        /* When releasing a user channel exclusive access,
                          * call hci_dev_do_close directly instead of calling
                          * hci_dev_close to ensure the exclusive access will
                          * be released and the controller brought back down.
@@ -1172,7 +1172,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,
                                 /* In case the transport is already up and
                                  * running, clear the error here.
                                  *
-                                 * This can happen when opening an user
+                                 * This can happen when opening a user
                                  * channel and HCI_AUTO_OFF grace period
                                  * is still active.
                                  */
@@ -1190,7 +1190,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,
                 if (!hci_sock_gen_cookie(sk)) {
                         /* In the case when a cookie has already been assigned,
                          * this socket will transition from a raw socket into
-                         * an user channel socket. For a clean transition, send
+                         * a user channel socket. For a clean transition, send
                          * the close notification first.
                          */
                         skb = create_monitor_ctrl_close(sk);
diff --git a/net/bridge/netfilter/ebt_among.c b/net/bridge/netfilter/ebt_among.c
index 9024283d2bca..279527f8b1fe 100644
--- a/net/bridge/netfilter/ebt_among.c
+++ b/net/bridge/netfilter/ebt_among.c
@@ -187,7 +187,7 @@ static int ebt_among_mt_check(const struct xt_mtchk_param *par)
         expected_length += ebt_mac_wormhash_size(wh_src);
 
         if (em->match_size != EBT_ALIGN(expected_length)) {
-                pr_info("wrong size: %d against expected %d, rounded to %Zd\n",
+                pr_info("wrong size: %d against expected %d, rounded to %zd\n",
                         em->match_size, expected_length,
                         EBT_ALIGN(expected_length));
                 return -EINVAL;
diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
index e0bd013a1e5e..eedba7670b51 100644
--- a/net/ieee802154/socket.c
+++ b/net/ieee802154/socket.c
@@ -279,7 +279,7 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
         pr_debug("name = %s, mtu = %u\n", dev->name, mtu);
 
         if (size > mtu) {
-                pr_debug("size = %Zu, mtu = %u\n", size, mtu);
+                pr_debug("size = %zu, mtu = %u\n", size, mtu);
                 err = -EMSGSIZE;
                 goto out_dev;
         }
@@ -645,7 +645,7 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
         pr_debug("name = %s, mtu = %u\n", dev->name, mtu);
 
         if (size > mtu) {
-                pr_debug("size = %Zu, mtu = %u\n", size, mtu);
+                pr_debug("size = %zu, mtu = %u\n", size, mtu);
                 err = -EMSGSIZE;
                 goto out_dev;
         }
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index d8cea210af0e..2f0d8233950f 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2388,7 +2388,7 @@ static int fib_triestat_seq_show(struct seq_file *seq, void *v)
 
         seq_printf(seq,
                    "Basic info: size of leaf:"
-                   " %Zd bytes, size of tnode: %Zd bytes.\n",
+                   " %zd bytes, size of tnode: %zd bytes.\n",
                    LEAF_SIZE, TNODE_SIZE(0));
 
         for (h = 0; h < FIB_TABLE_HASHSZ; h++) {
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index beacd028848c..c0317c940bcd 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -2596,7 +2596,7 @@ static int ipmr_vif_seq_show(struct seq_file *seq, void *v)
                 const char *name =  vif->dev ? vif->dev->name : "none";
 
                 seq_printf(seq,
-                           "%2Zd %-10s %8ld %7ld  %8ld %7ld %05X %08X %08X\n",
+                           "%2zd %-10s %8ld %7ld  %8ld %7ld %05X %08X %08X\n",
                            vif - mrt->vif_table,
                            name, vif->bytes_in, vif->pkt_in,
                            vif->bytes_out, vif->pkt_out,
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index fcfd071f4705..bc1486f2c064 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -235,7 +235,7 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len)
         }
 
         if ((unsigned int) *len < sizeof(struct sockaddr_in)) {
-                pr_debug("SO_ORIGINAL_DST: len %d not %Zu\n",
+                pr_debug("SO_ORIGINAL_DST: len %d not %zu\n",
                          *len, sizeof(struct sockaddr_in));
                 return -EINVAL;
         }
diff --git a/net/ipv4/netfilter/nf_log_arp.c b/net/ipv4/netfilter/nf_log_arp.c
index f6f713376e6e..2f3895ddc275 100644
--- a/net/ipv4/netfilter/nf_log_arp.c
+++ b/net/ipv4/netfilter/nf_log_arp.c
@@ -69,7 +69,7 @@ static void dump_arp_packet(struct nf_log_buf *m,
 
         ap = skb_header_pointer(skb, sizeof(_arph), sizeof(_arpp), &_arpp);
         if (ap == NULL) {
-                nf_log_buf_add(m, " INCOMPLETE [%Zu bytes]",
+                nf_log_buf_add(m, " INCOMPLETE [%zu bytes]",
                                skb->len - sizeof(_arph));
                 return;
         }
diff --git a/net/ipv6/netfilter/nf_log_ipv6.c b/net/ipv6/netfilter/nf_log_ipv6.c
index 055c51b80f5d..97c724224da7 100644
--- a/net/ipv6/netfilter/nf_log_ipv6.c
+++ b/net/ipv6/netfilter/nf_log_ipv6.c
@@ -64,7 +64,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m,
         nf_log_buf_add(m, "SRC=%pI6 DST=%pI6 ", &ih->saddr, &ih->daddr);
 
         /* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */
-        nf_log_buf_add(m, "LEN=%Zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
+        nf_log_buf_add(m, "LEN=%zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
                ntohs(ih->payload_len) + sizeof(struct ipv6hdr),
                (ntohl(*(__be32 *)ih) & 0x0ff00000) >> 20,
                ih->hop_limit,
diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c
index 1215693fdd22..35dbf3dc3d28 100644
--- a/net/irda/irnet/irnet_ppp.c
+++ b/net/irda/irnet/irnet_ppp.c
@@ -51,7 +51,7 @@ irnet_ctrl_write(irnet_socket *	ap,
   char *        next;           /* Next command to process */
   int           length;         /* Length of current command */
 
-  DENTER(CTRL_TRACE, "(ap=0x%p, count=%Zd)\n", ap, count);
+  DENTER(CTRL_TRACE, "(ap=0x%p, count=%zd)\n", ap, count);
 
   /* Check for overflow... */
   DABORT(count >= IRNET_MAX_COMMAND, -ENOMEM,
@@ -66,7 +66,7 @@ irnet_ctrl_write(irnet_socket *	ap,
 
   /* Safe terminate the string */
   command[count] = '\0';
-  DEBUG(CTRL_INFO, "Command line received is ``%s'' (%Zd).\n",
+  DEBUG(CTRL_INFO, "Command line received is ``%s'' (%zd).\n",
         command, count);
 
   /* Check every commands in the command line */
@@ -285,7 +285,7 @@ irnet_ctrl_read(irnet_socket *	ap,
   char          event[75];
   ssize_t       ret = 0;
 
-  DENTER(CTRL_TRACE, "(ap=0x%p, count=%Zd)\n", ap, count);
+  DENTER(CTRL_TRACE, "(ap=0x%p, count=%zd)\n", ap, count);
 
 #ifdef INITIAL_DISCOVERY
   /* Check if we have read the log */
@@ -328,7 +328,7 @@ irnet_ctrl_read(irnet_socket *	ap,
   if(ret != 0)
     {
       /* No, return the error code */
-      DEXIT(CTRL_TRACE, " - ret %Zd\n", ret);
+      DEXIT(CTRL_TRACE, " - ret %zd\n", ret);
       return ret;
     }
 
@@ -568,7 +568,7 @@ dev_irnet_write(struct file *	file,
 {
   irnet_socket *        ap = file->private_data;
 
-  DPASS(FS_TRACE, "(file=0x%p, ap=0x%p, count=%Zd)\n",
+  DPASS(FS_TRACE, "(file=0x%p, ap=0x%p, count=%zd)\n",
         file, ap, count);
   DABORT(ap == NULL, -ENXIO, FS_ERROR, "ap is NULL !!!\n");
 
@@ -592,7 +592,7 @@ dev_irnet_read(struct file *	file,
 {
   irnet_socket *        ap = file->private_data;
 
-  DPASS(FS_TRACE, "(file=0x%p, ap=0x%p, count=%Zd)\n",
+  DPASS(FS_TRACE, "(file=0x%p, ap=0x%p, count=%zd)\n",
         file, ap, count);
   DABORT(ap == NULL, -ENXIO, FS_ERROR, "ap is NULL !!!\n");
 
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index b58000efee73..8adab6335ced 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -1058,10 +1058,10 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb,
 
         /* Debug */
         if (session->send_seq)
-                l2tp_dbg(session, L2TP_MSG_DATA, "%s: send %Zd bytes, ns=%u\n",
+                l2tp_dbg(session, L2TP_MSG_DATA, "%s: send %zd bytes, ns=%u\n",
                          session->name, data_len, session->ns - 1);
         else
-                l2tp_dbg(session, L2TP_MSG_DATA, "%s: send %Zd bytes\n",
+                l2tp_dbg(session, L2TP_MSG_DATA, "%s: send %zd bytes\n",
                          session->name, data_len);
 
         if (session->debug & L2TP_MSG_DATA) {
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index c28b0af9c1f2..6e7b6a07b7d5 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -681,7 +681,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh)
                    2 + /* NULL SSID */
                    /* Channel Switch Announcement */
                    2 + sizeof(struct ieee80211_channel_sw_ie) +
-                   /* Mesh Channel Swith Parameters */
+                   /* Mesh Channel Switch Parameters */
                    2 + sizeof(struct ieee80211_mesh_chansw_params_ie) +
                    2 + 8 + /* supported rates */
                    2 + 3; /* DS params */
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 096a45103f14..e6a2753dff9e 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -1429,7 +1429,7 @@ int __init ip_vs_conn_init(void)
                 "(size=%d, memory=%ldKbytes)\n",
                 ip_vs_conn_tab_size,
                 (long)(ip_vs_conn_tab_size*sizeof(struct list_head))/1024);
-        IP_VS_DBG(0, "Each connection entry needs %Zd bytes at least\n",
+        IP_VS_DBG(0, "Each connection entry needs %zd bytes at least\n",
                   sizeof(struct ip_vs_conn));
 
         for (idx = 0; idx < ip_vs_conn_tab_size; idx++)
diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c
index 6be5c538b71e..75f798f8e83b 100644
--- a/net/netfilter/ipvs/ip_vs_dh.c
+++ b/net/netfilter/ipvs/ip_vs_dh.c
@@ -163,7 +163,7 @@ static int ip_vs_dh_init_svc(struct ip_vs_service *svc)
                 return -ENOMEM;
 
         svc->sched_data = s;
-        IP_VS_DBG(6, "DH hash table (memory=%Zdbytes) allocated for "
+        IP_VS_DBG(6, "DH hash table (memory=%zdbytes) allocated for "
                   "current service\n",
                   sizeof(struct ip_vs_dh_bucket)*IP_VS_DH_TAB_SIZE);
 
@@ -183,7 +183,7 @@ static void ip_vs_dh_done_svc(struct ip_vs_service *svc)
 
         /* release the table itself */
         kfree_rcu(s, rcu_head);
-        IP_VS_DBG(6, "DH hash table (memory=%Zdbytes) released\n",
+        IP_VS_DBG(6, "DH hash table (memory=%zdbytes) released\n",
                   sizeof(struct ip_vs_dh_bucket)*IP_VS_DH_TAB_SIZE);
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
index cccf4d637412..5824927cf8e0 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -356,7 +356,7 @@ static int ip_vs_lblc_init_svc(struct ip_vs_service *svc)
                 return -ENOMEM;
 
         svc->sched_data = tbl;
-        IP_VS_DBG(6, "LBLC hash table (memory=%Zdbytes) allocated for "
+        IP_VS_DBG(6, "LBLC hash table (memory=%zdbytes) allocated for "
                   "current service\n", sizeof(*tbl));
 
         /*
@@ -393,7 +393,7 @@ static void ip_vs_lblc_done_svc(struct ip_vs_service *svc)
 
         /* release the table itself */
         kfree_rcu(tbl, rcu_head);
-        IP_VS_DBG(6, "LBLC hash table (memory=%Zdbytes) released\n",
+        IP_VS_DBG(6, "LBLC hash table (memory=%zdbytes) released\n",
                   sizeof(*tbl));
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index 796d70e47ddd..703f11877bee 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -519,7 +519,7 @@ static int ip_vs_lblcr_init_svc(struct ip_vs_service *svc)
                 return -ENOMEM;
 
         svc->sched_data = tbl;
-        IP_VS_DBG(6, "LBLCR hash table (memory=%Zdbytes) allocated for "
+        IP_VS_DBG(6, "LBLCR hash table (memory=%zdbytes) allocated for "
                   "current service\n", sizeof(*tbl));
 
         /*
@@ -556,7 +556,7 @@ static void ip_vs_lblcr_done_svc(struct ip_vs_service *svc)
 
         /* release the table itself */
         kfree_rcu(tbl, rcu_head);
-        IP_VS_DBG(6, "LBLCR hash table (memory=%Zdbytes) released\n",
+        IP_VS_DBG(6, "LBLCR hash table (memory=%zdbytes) released\n",
                   sizeof(*tbl));
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
index 1e373a5e44e3..16aaac6eedc9 100644
--- a/net/netfilter/ipvs/ip_vs_sh.c
+++ b/net/netfilter/ipvs/ip_vs_sh.c
@@ -239,7 +239,7 @@ static int ip_vs_sh_init_svc(struct ip_vs_service *svc)
                 return -ENOMEM;
 
         svc->sched_data = s;
-        IP_VS_DBG(6, "SH hash table (memory=%Zdbytes) allocated for "
+        IP_VS_DBG(6, "SH hash table (memory=%zdbytes) allocated for "
                   "current service\n",
                   sizeof(struct ip_vs_sh_bucket)*IP_VS_SH_TAB_SIZE);
 
@@ -259,7 +259,7 @@ static void ip_vs_sh_done_svc(struct ip_vs_service *svc)
 
         /* release the table itself */
         kfree_rcu(s, rcu_head);
-        IP_VS_DBG(6, "SH hash table (memory=%Zdbytes) released\n",
+        IP_VS_DBG(6, "SH hash table (memory=%zdbytes) released\n",
                   sizeof(struct ip_vs_sh_bucket)*IP_VS_SH_TAB_SIZE);
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 9350530c16c1..b03c28084f81 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1791,7 +1791,7 @@ int start_sync_thread(struct netns_ipvs *ipvs, struct ipvs_sync_daemon_cfg *c,
         u16 mtu, min_mtu;
 
         IP_VS_DBG(7, "%s(): pid %d\n", __func__, task_pid_nr(current));
-        IP_VS_DBG(7, "Each ip_vs_sync_conn entry needs %Zd bytes\n",
+        IP_VS_DBG(7, "Each ip_vs_sync_conn entry needs %zd bytes\n",
                   sizeof(struct ip_vs_sync_conn_v0));
 
         if (!ipvs->sync_state) {
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index e3ed20060878..4aecef4a89fb 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -300,7 +300,7 @@ static int find_pattern(const char *data, size_t dlen,
 {
         size_t i = plen;
 
-        pr_debug("find_pattern `%s': dlen = %Zu\n", pattern, dlen);
+        pr_debug("find_pattern `%s': dlen = %zu\n", pattern, dlen);
 
         if (dlen <= plen) {
                 /* Short packet: try for partial? */
diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c
index 3b79f34b5095..de8782345c86 100644
--- a/net/netfilter/nfnetlink_cthelper.c
+++ b/net/netfilter/nfnetlink_cthelper.c
@@ -48,7 +48,7 @@ nfnl_userspace_cthelper(struct sk_buff *skb, unsigned int protoff,
         if (helper == NULL)
                 return NF_DROP;
 
-        /* This is an user-space helper not yet configured, skip. */
+        /* This is a user-space helper not yet configured, skip. */
         if ((helper->flags &
             (NF_CT_HELPER_F_USERSPACE | NF_CT_HELPER_F_CONFIGURED)) ==
              NF_CT_HELPER_F_USERSPACE)
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 016db6be94b9..14857afc9937 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -667,7 +667,7 @@ int xt_compat_check_entry_offsets(const void *base, const char *elems,
             COMPAT_XT_ALIGN(target_offset + sizeof(struct compat_xt_standard_target)) != next_offset)
                 return -EINVAL;
 
-        /* compat_xt_entry match has less strict aligment requirements,
+        /* compat_xt_entry match has less strict alignment requirements,
          * otherwise they are identical.  In case of padding differences
          * we need to add compat version of xt_check_entry_match.
          */
diff --git a/net/sctp/output.c b/net/sctp/output.c
index 85406d5f8f41..71ce6b945dcb 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -177,7 +177,7 @@ sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *packet,
 {
         sctp_xmit_t retval;
 
-        pr_debug("%s: packet:%p size:%Zu chunk:%p size:%d\n", __func__,
+        pr_debug("%s: packet:%p size:%zu chunk:%p size:%d\n", __func__,
                  packet, packet->size, chunk, chunk->skb ? chunk->skb->len : -1);
 
         switch ((retval = (sctp_packet_append_chunk(packet, chunk)))) {
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 5b63ceb3bf37..3379668af368 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -643,9 +643,7 @@ void sctp_transport_reset(struct sctp_transport *t)
         t->srtt = 0;
         t->rttvar = 0;
 
-        /* Reset these additional varibles so that we have a clean
-         * slate.
-         */
+        /* Reset these additional variables so that we have a clean slate. */
         t->partial_bytes_acked = 0;
         t->flight_size = 0;
         t->error_count = 0;
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index cdeb1d814833..4f16953e4954 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -763,7 +763,7 @@ err_put_ctx:
 err:
         kfree(buf);
 out:
-        dprintk("RPC:       %s returning %Zd\n", __func__, err);
+        dprintk("RPC:       %s returning %zd\n", __func__, err);
         return err;
 }
 
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 75f290bddca1..2e22889a8837 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1260,7 +1260,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
         return 0;
 
 err_short_len:
-        svc_printk(rqstp, "short len %Zd, dropping request\n",
+        svc_printk(rqstp, "short len %zd, dropping request\n",
                         argv->iov_len);
         goto close;
 
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index de066acdb34e..d227d97f7ad4 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -278,7 +278,7 @@ static int svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
                                rqstp->rq_respages[0], tailoff);
 
 out:
-        dprintk("svc: socket %p sendto([%p %Zu... ], %d) = %d (addr %s)\n",
+        dprintk("svc: socket %p sendto([%p %zu... ], %d) = %d (addr %s)\n",
                 svsk, xdr->head[0].iov_base, xdr->head[0].iov_len,
                 xdr->len, len, svc_print_addr(rqstp, buf, sizeof(buf)));
 
@@ -346,7 +346,7 @@ static int svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr,
         if (len == buflen)
                 set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
 
-        dprintk("svc: socket %p recvfrom(%p, %Zu) = %d\n",
+        dprintk("svc: socket %p recvfrom(%p, %zu) = %d\n",
                 svsk, iov[0].iov_base, iov[0].iov_len, len);
         return len;
 }
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index af392d9b9cec..956c7bce80d1 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1188,7 +1188,7 @@ static inline void xs_tcp_read_xid(struct sock_xprt *transport, struct xdr_skb_r
         char *p;
 
         len = sizeof(transport->tcp_xid) - transport->tcp_offset;
-        dprintk("RPC:       reading XID (%Zu bytes)\n", len);
+        dprintk("RPC:       reading XID (%zu bytes)\n", len);
         p = ((char *) &transport->tcp_xid) + transport->tcp_offset;
         used = xdr_skb_read_bits(desc, p, len);
         transport->tcp_offset += used;
@@ -1219,7 +1219,7 @@ static inline void xs_tcp_read_calldir(struct sock_xprt *transport,
          */
         offset = transport->tcp_offset - sizeof(transport->tcp_xid);
         len = sizeof(transport->tcp_calldir) - offset;
-        dprintk("RPC:       reading CALL/REPLY flag (%Zu bytes)\n", len);
+        dprintk("RPC:       reading CALL/REPLY flag (%zu bytes)\n", len);
         p = ((char *) &transport->tcp_calldir) + offset;
         used = xdr_skb_read_bits(desc, p, len);
         transport->tcp_offset += used;
@@ -1310,7 +1310,7 @@ static inline void xs_tcp_read_common(struct rpc_xprt *xprt,
                 return;
         }
 
-        dprintk("RPC:       XID %08x read %Zd bytes\n",
+        dprintk("RPC:       XID %08x read %zd bytes\n",
                         ntohl(transport->tcp_xid), r);
         dprintk("RPC:       xprt = %p, tcp_copied = %lu, tcp_offset = %u, "
                         "tcp_reclen = %u\n", xprt, transport->tcp_copied,
@@ -1456,7 +1456,7 @@ static inline void xs_tcp_read_discard(struct sock_xprt *transport, struct xdr_s
         desc->count -= len;
         desc->offset += len;
         transport->tcp_offset += len;
-        dprintk("RPC:       discarded %Zu bytes\n", len);
+        dprintk("RPC:       discarded %zu bytes\n", len);
         xs_tcp_check_fraghdr(transport);
 }