On Thu, Aug 16, 2018 at 09:47:23AM +1000, Stephen Rothwell wrote: > On Tue, 7 Aug 2018 12:49:32 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: [...] > This is now a conflict between Linus' tree and the netfilter tree. Will rebase nf.git here, so next pull request already deals with this here to make it easier for upstream maintainers. @Matteo, let me know if this is a problem in your case, you may have references to the original commits in your backport queue probably. Thanks for the heads up and sorry for the inconvenience.
