From: Simon Wunderlich <s...@simonwunderlich.de> Date: Wed, 19 Sep 2018 14:22:02 +0200
> here are some bugfixes which we would like to see integrated into net. > > We forgot to bump the version number in the last round for net-next, so > the belated patch to do that is included - we hope you can adopt it. > This will most likely create a merge conflict later when merging into > net-next with this rounds net-next patchset, but net-next should keep > the 2018.4 version[1]. > > Please pull or let me know of any problem! Pulled, thanks Simon. In the future, you can put that merge resolution guidance into the merge commit message. When people give annotations like this, I refer to them when I do merges and it helps me a lot. If it's in the actual GIT history, that is tons easier than if it just appeared in your pull request email. I manually included it in the merge commit message this time. Thanks!
