The patch titled git-gccbug-fixup has been added to the -mm tree. Its filename is git-gccbug-fixup.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: git-gccbug-fixup From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/usb/net/kaweth.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN drivers/usb/net/kaweth.c~git-gccbug-fixup drivers/usb/net/kaweth.c --- a/drivers/usb/net/kaweth.c~git-gccbug-fixup +++ a/drivers/usb/net/kaweth.c @@ -1291,11 +1291,7 @@ static int kaweth_internal_control_msg(s { struct urb *urb; int retv; -<<<<<<< HEAD/drivers/usb/net/kaweth.c - int length = 0; /* shut up GCC */ -======= int length = 0; ->>>>>>> /drivers/usb/net/kaweth.c urb = usb_alloc_urb(0, GFP_NOIO); if (!urb) _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch acpi-bay-driver-warning-fix.patch git-cifs-fix.patch fix-warning-in-device_add_attrs.patch git-dvb.patch kthread-api-conversion-for-dvb_frontend-and-av7110-fix.patch git-libata-all.patch sis-warning-fixes.patch git-libata-all-lib-iomapc-fix-for-config_pci=n.patch git-md-accel-fixes.patch git-md-accel-warning-fixes.patch git-md-accel-fix.patch revert-drivers-net-tulip-dmfe-support-basic-carrier-detection.patch git-net.patch git-backlight-acpi-fix.patch git-backlight-asus-fix.patch git-backlight-sony-fix.patch git-sh.patch git-scsi-misc.patch git-scsi-misc-fixup.patch revert-md-avoid-possible-bug_on-in-md-bitmap-handling-for-git-block.patch git-block.patch revert-x86_64-mm-msr-on-cpu.patch x86_64-survive-having-no-irq-mapping-for-a-vector-fix.patch git-cryptodev-fixup.patch mm-vm_insert_pfn-tidy.patch swiotlb-uninlinings.patch knfsd-sunrpc-teach-svc_sendto-to-deal-with-ipv6-addresses-tidy.patch knfsd-sunrpc-support-ipv6-addresses-in-rpc-servers-udp-receive-path-tidy.patch revert-x86_64-mm-putreg-check.patch fix-utrace-utrace-ptrace-compat.patch deprecate-sa_interrupt-and-friends.patch git-gccbug-fixup.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