linux-next: manual merge of the tip tree with the bpf tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  include/linux/bpf.h

between commit:

  18acb7fac22f ("bpf: Revert ("Fix dispatcher patchable function entry to 5 bytes nop")")

from the bpf tree and commits:

  bea75b33895f ("x86/Kconfig: Introduce function padding")
  931ab63664f0 ("x86/ibt: Implement FineIBT")

from the tip tree.

I fixed it up (the former removed the lines modified by the latter) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell