The patch titled Subject: aoe: whitespace cleanup has been added to the -mm tree. Its filename is aoe-whitespace-cleanup.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Ed Cashin <ecashin@xxxxxxxxxx> Subject: aoe: whitespace cleanup Signed-off-by: Ed Cashin <ecashin@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/aoe/aoe.h | 2 +- drivers/block/aoe/aoechr.c | 2 +- drivers/block/aoe/aoecmd.c | 6 +++--- drivers/block/aoe/aoemain.c | 2 +- drivers/block/aoe/aoenet.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff -puN drivers/block/aoe/aoe.h~aoe-whitespace-cleanup drivers/block/aoe/aoe.h --- a/drivers/block/aoe/aoe.h~aoe-whitespace-cleanup +++ a/drivers/block/aoe/aoe.h @@ -151,7 +151,7 @@ struct aoedev { struct work_struct work;/* disk create work struct */ struct gendisk *gd; struct request_queue *blkq; - struct hd_geometry geo; + struct hd_geometry geo; sector_t ssize; struct timer_list timer; spinlock_t lock; diff -puN drivers/block/aoe/aoechr.c~aoe-whitespace-cleanup drivers/block/aoe/aoechr.c --- a/drivers/block/aoe/aoechr.c~aoe-whitespace-cleanup +++ a/drivers/block/aoe/aoechr.c @@ -287,7 +287,7 @@ aoechr_init(void) int n, i; n = register_chrdev(AOE_MAJOR, "aoechr", &aoe_fops); - if (n < 0) { + if (n < 0) { printk(KERN_ERR "aoe: can't register char device\n"); return n; } diff -puN drivers/block/aoe/aoecmd.c~aoe-whitespace-cleanup drivers/block/aoe/aoecmd.c --- a/drivers/block/aoe/aoecmd.c~aoe-whitespace-cleanup +++ a/drivers/block/aoe/aoecmd.c @@ -978,7 +978,7 @@ ktiocomplete(struct frame *f) pr_err("aoe: ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%d\n", ahout->cmdstat, ahin->cmdstat, d->aoemajor, d->aoeminor); -noskb: if (buf) +noskb: if (buf) clear_bit(BIO_UPTODATE, &buf->bio->bi_flags); goto badrsp; } @@ -1191,7 +1191,7 @@ aoecmd_cfg(ushort aoemajor, unsigned cha aoecmd_cfg_pkts(aoemajor, aoeminor, &queue); aoenet_xmit(&queue); } - + struct sk_buff * aoecmd_ata_id(struct aoedev *d) { @@ -1230,7 +1230,7 @@ aoecmd_ata_id(struct aoedev *d) return skb_clone(skb, GFP_ATOMIC); } - + static struct aoetgt * addtgt(struct aoedev *d, char *addr, ulong nframes) { diff -puN drivers/block/aoe/aoemain.c~aoe-whitespace-cleanup drivers/block/aoe/aoemain.c --- a/drivers/block/aoe/aoemain.c~aoe-whitespace-cleanup +++ a/drivers/block/aoe/aoemain.c @@ -105,7 +105,7 @@ aoe_init(void) aoechr_exit(); chr_fail: aoedev_exit(); - + printk(KERN_INFO "aoe: initialisation failure.\n"); return ret; } diff -puN drivers/block/aoe/aoenet.c~aoe-whitespace-cleanup drivers/block/aoe/aoenet.c --- a/drivers/block/aoe/aoenet.c~aoe-whitespace-cleanup +++ a/drivers/block/aoe/aoenet.c @@ -126,8 +126,8 @@ aoenet_xmit(struct sk_buff_head *queue) } } -/* - * (1) len doesn't include the header by default. I want this. +/* + * (1) len doesn't include the header by default. I want this. */ static int aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, struct net_device *orig_dev) _ Patches currently in -mm which might be from ecashin@xxxxxxxxxx are linux-compilerh-add-__must_hold-macro-for-functions-called-with-a-lock-held.patch aoe-describe-the-behavior-of-the-err-character-device.patch aoe-print-warning-regarding-a-common-reason-for-dropped-transmits.patch aoe-update-cap-on-outstanding-commands-based-on-config-query-response.patch aoe-support-the-forgetting-flushing-of-a-user-specified-aoe-target.patch aoe-support-larger-i-o-requests-via-aoe_maxsectors-module-param.patch aoe-payload-sysfs-file-exports-per-aoe-command-data-transfer-size.patch aoe-cleanup-remove-unused-ata_scnt-function.patch aoe-whitespace-cleanup.patch aoe-update-driver-internal-version-number-to-60.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