The patch titled
Typo fixes errror -> error
has been removed from the -mm tree. Its filename was
typo-fixes-errror-error.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Typo fixes errror -> error
From: Gabriel Craciunescu <nix.or.die@xxxxxxxxxxxxxx>
Typo fixes errror -> error
Signed-off-by: Gabriel Craciunescu <nix.or.die@xxxxxxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Cc: Stephen Smalley <sds@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/skfp/pmf.c | 2 +-
drivers/s390/block/dasd_eckd.c | 4 ++--
security/selinux/ss/services.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff -puN drivers/net/skfp/pmf.c~typo-fixes-errror-error drivers/net/skfp/pmf.c
--- a/drivers/net/skfp/pmf.c~typo-fixes-errror-error
+++ a/drivers/net/skfp/pmf.c
@@ -575,7 +575,7 @@ void smt_add_para(struct s_smc *smc, str
int sp_len ;
/*
- * skip if errror
+ * skip if error
*/
if (pcon->pc_err)
return ;
diff -puN drivers/s390/block/dasd_eckd.c~typo-fixes-errror-error drivers/s390/block/dasd_eckd.c
--- a/drivers/s390/block/dasd_eckd.c~typo-fixes-errror-error
+++ a/drivers/s390/block/dasd_eckd.c
@@ -555,7 +555,7 @@ dasd_eckd_read_conf(struct dasd_device *
if (conf_data == NULL) {
MESSAGE(KERN_WARNING, "%s", "No configuration "
"data retrieved");
- continue; /* no errror */
+ continue; /* no error */
}
if (conf_len != sizeof (struct dasd_eckd_confdata)) {
MESSAGE(KERN_WARNING,
@@ -564,7 +564,7 @@ dasd_eckd_read_conf(struct dasd_device *
conf_len,
sizeof (struct dasd_eckd_confdata));
kfree(conf_data);
- continue; /* no errror */
+ continue; /* no error */
}
/* save first valid configuration data */
if (!conf_data_saved){
diff -puN security/selinux/ss/services.c~typo-fixes-errror-error security/selinux/ss/services.c
--- a/security/selinux/ss/services.c~typo-fixes-errror-error
+++ a/security/selinux/ss/services.c
@@ -792,7 +792,7 @@ int security_context_to_sid(char *sconte
* @scontext: security context
* @scontext_len: length in bytes
* @sid: security identifier, SID
- * @def_sid: default SID to assign on errror
+ * @def_sid: default SID to assign on error
*
* Obtains a SID associated with the security context that
* has the string representation specified by @scontext.
_
Patches currently in -mm which might be from nix.or.die@xxxxxxxxxxxxxx are
origin.patch
fix-libata-warnings-with-config_pm=n.patch
drivers-scsi-g_ncr5380c-ncr53c400_pseudo_dma-is-not.patch
fix-drivers-scsi-fdomainc-config_pci=n-warnings.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
