On Tue, 2016-03-01 at 17:11 -0500, David Miller wrote: > > There was a minor merge conflict with net/mac80211/debugfs.c, take > a look and send me any fixups necessary. >
Ah yes, I'd wondered when that change was coming in, but missed that you had it in net-next now. Looks good, thanks! johannes
