On Mon, Jul 6, 2015 at 4:06 PM, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > > I'll go and test the plain revert case. So the "plain" revert ended up being more than a single revert, just because there were multiple changes in that area. But after doing this: git revert b144ce2d3761 git revert 1d3ff76721fb git revert be9b720a0ccb git revert 007d64eb2232 git revert dbac993f6a6d git revert d4b78c7290dd git revert c93b76b34b4d I have a working kernel that loads the pn544 thing automatically, and shows it in /sys/class/nfc/, and suspend works. So I'm back to the pre-merge-window behavior. I'd be happy to do a more minimal revert, but the above was the trivial "revert without any conflicts" set. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html