Hi Tejun, On Tue, 10 Dec 2013 09:50:04 -0500 Tejun Heo wrote: > > Greg, given that there will be more patches in driver-core-next, I > think it'll be best to pull driver-core-linus into driver-core-next to > avoid conflicts from the same commit. You can pull my commit or if > you pull it yourself, just take all the chunks from driver-core-next > so that the resulting fs/sysfs/file.c is unchanged compared to > driver-core-next before pull, and then apply this patch. > > ------ 8< ------ > From 5cb9f29a28c87cbf62f74ff6bde3d9da2a565b1d Mon Sep 17 00:00:00 2001 > From: Tejun Heo > Date: Tue, 10 Dec 2013 09:29:17 -0500 > > This is v3.14 fix for the same issue that a8b14744429f ("sysfs: give I have added the patch as a merge fix patch for the merge of the driver-core tree today. I will throw it away if/when Greg applies it. -- Cheers, Stephen Rothwell