diff --git a/[refs] b/[refs]
index dbb213381fcb..7f5567c1a139 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1d390d8e6128b050f0f66b1c33d390760deb3f4
+refs/heads/master: fc4b514f2727f74a4587c31db87e0e93465518c3
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index 084aa47bac82..1dae900df798 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -1361,8 +1361,8 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,
 
 	WARN_ON_ONCE(timer->function != delayed_work_timer_fn ||
 		     timer->data != (unsigned long)dwork);
-	BUG_ON(timer_pending(timer));
-	BUG_ON(!list_empty(&work->entry));
+	WARN_ON_ONCE(timer_pending(timer));
+	WARN_ON_ONCE(!list_empty(&work->entry));
 
 	/*
 	 * If @delay is 0, queue @dwork->work immediately.  This is for