diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c
index 2cca0983f..36baa15b4 100644
--- a/iscsi-scst/kernel/iscsi.c
+++ b/iscsi-scst/kernel/iscsi.c
@@ -24,12 +24,14 @@
 #include "iscsi.h"
 #include "digest.h"
 
+#ifndef GENERATING_UPSTREAM_PATCH
 #if !defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION)
 #warning "Patch put_page_callback-<kernel-version>.patch not applied on your\
  kernel or CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION\
  config option not set. ISCSI-SCST will be working with not the best\
  performance. Refer README file for details."
 #endif
+#endif
 
 #define ISCSI_INIT_WRITE_WAKE		0x1
 #define ISCSI_INIT_WRITE_REMOVE_HASH	0x2
@@ -3226,10 +3228,12 @@ static int __init iscsi_init(void)
 		goto out_free_dummy;
 	}
 #else
+#ifndef GENERATING_UPSTREAM_PATCH
 	PRINT_WARNING("%s",
 		"CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION "
 		"not enabled in your kernel. ISCSI-SCST will be working with "
 		"not the best performance. Refer README file for details.");
+#endif
 #endif
 
 	ctr_major = register_chrdev(0, ctr_name, &ctr_fops);