From: Stephen Rothwell <sfr@canb.auug.org.au>
To: akpm@linux-foundation.org
Cc: mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, linux-fsdevel@vger.kernel.org,
linux-next@vger.kernel.org, mhocko@suse.cz, broonie@kernel.org,
"David S. Miller" <davem@davemloft.net>
Subject: Re: mmotm 2017-01-11-17-14 uploaded
Date: Thu, 12 Jan 2017 13:05:54 +1100 [thread overview]
Message-ID: <20170112130554.3ef6fc64@canb.auug.org.au> (raw)
In-Reply-To: <5876d891.KO+lq262YUFdAzyd%akpm@linux-foundation.org>
Hi Andrew,
On Wed, 11 Jan 2017 17:14:57 -0800 akpm@linux-foundation.org wrote:
>
> The mm-of-the-moment snapshot 2017-01-11-17-14 has been uploaded to
>
> http://www.ozlabs.org/~akpm/mmotm/
Imported mostly fine ...
> linux-next-git-rejects.patch
That is not correct :-(
I used (more or less) the resolution in DaveM's tree today:
2d6567d103301509f941d5e565a8cce78ded1456
diff --cc net/core/sock.c
index 4eca27dc5c94,31f72f3a3559..9e07ab81a144
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@@ -222,7 -222,7 +222,7 @@@ static const char *const af_family_key_
"sk_lock-AF_RXRPC" , "sk_lock-AF_ISDN" , "sk_lock-AF_PHONET" ,
"sk_lock-AF_IEEE802154", "sk_lock-AF_CAIF" , "sk_lock-AF_ALG" ,
"sk_lock-AF_NFC" , "sk_lock-AF_VSOCK" , "sk_lock-AF_KCM" ,
- "sk_lock-AF_QIPCRTR", "sk_lock-AF_MAX"
- "sk_lock-AF_SMC" , "sk_lock-AF_MAX"
++ "sk_lock-AF_QIPCRTR", "sk_lock-AF_SMC" , "sk_lock-AF_MAX"
};
static const char *const af_family_slock_key_strings[AF_MAX+1] = {
"slock-AF_UNSPEC", "slock-AF_UNIX" , "slock-AF_INET" ,
@@@ -239,7 -239,7 +239,7 @@@
"slock-AF_RXRPC" , "slock-AF_ISDN" , "slock-AF_PHONET" ,
"slock-AF_IEEE802154", "slock-AF_CAIF" , "slock-AF_ALG" ,
"slock-AF_NFC" , "slock-AF_VSOCK" ,"slock-AF_KCM" ,
- "slock-AF_QIPCRTR", "slock-AF_MAX"
- "slock-AF_SMC" , "slock-AF_MAX"
++ "slock-AF_QIPCRTR", "slock-AF_SMC" , "slock-AF_MAX"
};
static const char *const af_family_clock_key_strings[AF_MAX+1] = {
"clock-AF_UNSPEC", "clock-AF_UNIX" , "clock-AF_INET" ,
@@@ -256,7 -256,7 +256,7 @@@
"clock-AF_RXRPC" , "clock-AF_ISDN" , "clock-AF_PHONET" ,
"clock-AF_IEEE802154", "clock-AF_CAIF" , "clock-AF_ALG" ,
"clock-AF_NFC" , "clock-AF_VSOCK" , "clock-AF_KCM" ,
- "clock-AF_QIPCRTR", "clock-AF_MAX"
- "closck-AF_smc" , "clock-AF_MAX"
++ "clock-AF_QIPCRTR", "closck-AF_smc" , "clock-AF_MAX"
};
/*
And just noticed the typo in the last two lines (which is also in DaveM's
tree) :-(
--
Cheers,
Stephen Rothwell
prev parent reply other threads:[~2017-01-12 2:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-12 1:14 mmotm 2017-01-11-17-14 uploaded akpm
2017-01-12 2:05 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170112130554.3ef6fc64@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=davem@davemloft.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=mm-commits@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).