Hello, Greg. On Mon, Feb 10, 2014 at 04:01:41PM -0800, Greg Kroah-Hartman wrote: > Also, can you look into the merge of 3.14-rc2 into the driver-core-next > branch? There are some conflicts in the kernfs code due to the lockdep > changes that I couldn't easily verify I got right, so I didn't do the > merge. Could you give me a diff of the merge for me to work off of?
Sure thing. It can be resolved by simply ignoring the driver-core-linus side. kernfs_drain() updates in driver-core-next already has all the necessary lockdep flag checks through kernfs_lockdep(). The following git branch contains a test merge between driver-core-next and rc2. git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git driver-core-next-test-merge-rc2 Thanks! -- tejun -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
