This patch series fixes some discrepancies noted in a previous patch series. Removes the rest of the debug/tracing code Removes a nasty macro Add curly braces back in for a multi-line indent block Fixes some pr_warns with newline chars in the strings Yes, these pr_warns will eventually change to dev_warn. -- 1.8.1.4