The patch titled nbd: kill obsolete changelog, add GPL has been removed from the -mm tree. Its filename is nbd-kill-obsolete-changelog-add-gpl.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: nbd: kill obsolete changelog, add GPL From: Pavel Machek <pavel@xxxxxx> nbd abuses file header as a changelog (and obsolete one, too), and fails to mention GPL. This fixes it. Signed-off-by: Pavel Machek <pavel@xxxxxxx> Cc: <Paul.Clements@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/block/nbd.c | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff -puN drivers/block/nbd.c~nbd-kill-obsolete-changelog-add-gpl drivers/block/nbd.c --- a/drivers/block/nbd.c~nbd-kill-obsolete-changelog-add-gpl +++ a/drivers/block/nbd.c @@ -7,39 +7,9 @@ * Copyright 1997-2000 Pavel Machek <pavel@xxxxxx> * Parts copyright 2001 Steven Whitehouse <steve@xxxxxxxxxxx> * - * (part of code stolen from loop.c) + * This file is released under GPLv2 or later. * - * 97-3-25 compiled 0-th version, not yet tested it - * (it did not work, BTW) (later that day) HEY! it works! - * (bit later) hmm, not that much... 2:00am next day: - * yes, it works, but it gives something like 50kB/sec - * 97-4-01 complete rewrite to make it possible for many requests at - * once to be processed - * 97-4-11 Making protocol independent of endianity etc. - * 97-9-13 Cosmetic changes - * 98-5-13 Attempt to make 64-bit-clean on 64-bit machines - * 99-1-11 Attempt to make 64-bit-clean on 32-bit machines <ankry@xxxxxxxxxxxxx> - * 01-2-27 Fix to store proper blockcount for kernel (calculated using - * BLOCK_SIZE_BITS, not device blocksize) <aga@xxxxxxxxxxxxx> - * 01-3-11 Make nbd work with new Linux block layer code. It now supports - * plugging like all the other block devices. Also added in MSG_MORE to - * reduce number of partial TCP segments sent. <steve@xxxxxxxxxxx> - * 01-12-6 Fix deadlock condition by making queue locks independent of - * the transmit lock. <steve@xxxxxxxxxxx> - * 02-10-11 Allow hung xmit to be aborted via SIGKILL & various fixes. - * <Paul.Clements@xxxxxxxxxxxx> <James.Bottomley@xxxxxxxxxxxx> - * 03-06-22 Make nbd work with new linux 2.5 block layer design. This fixes - * memory corruption from module removal and possible memory corruption - * from sending/receiving disk data. <ldl@xxxxxxxx> - * 03-06-23 Cosmetic changes. <ldl@xxxxxxxx> - * 03-06-23 Enhance diagnostics support. <ldl@xxxxxxxx> - * 03-06-24 Remove unneeded blksize_bits field from nbd_device struct. - * <ldl@xxxxxxxx> - * 03-06-24 Cleanup PARANOIA usage & code. <ldl@xxxxxxxx> - * 04-02-19 Remove PARANOIA, plus various cleanups (Paul Clements) - * possible FIXME: make set_sock / set_blksize / set_size / do_it one syscall - * why not: would need access_ok and friends, would share yet another - * structure with userland + * (part of code stolen from loop.c) */ #include <linux/major.h> _ Patches currently in -mm which might be from pavel@xxxxxx are origin.patch fix-sco-on-some-bluetooth-adapters-2.patch fix-swsuspend-breakage.patch x86_64-fix-swsuspend-breakage.patch fix-broken-dubious-driver-suspend-methods.patch backlight-locomo-backlight-driver-updates.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