On Tue, Apr 07, 2020 at 05:55:36PM +0100, Giuliano Procida wrote: > commit 287922eb0b186e2a5bf54fdd04b734c25c90035c upstream. > > The upstream commit (block: defer timeouts to a workqueue) included > various locking changes. The original commit message did not say > anything about the extra locking. Perhaps this is only needed for > workqueue callbacks and not timer callbacks. We assume it is needed > here. > > This patch includes the locking changes but leaves timeouts using a > timer. > > Both blk_mq_rq_timer and blk_rq_timed_out_timer will return without > without doing any work if they cannot acquire the queue (without > waiting). > > Signed-off-by: Giuliano Procida <gprocida@xxxxxxxxxx> Don't write your own changelog text for something that is upstream, include the original and then add your own later on below, making it obvious what you are doing differently from the original commit. And be sure to cc: all of the original people on that commit, and keep their s-o-b also. thanks, greg k-h
