tree 98816e29a1aa87807af7c2879f4098122f6f923f
parent 9f58c62fcc66f06aee141fdd80d15213b7f4809a
parent 85b0c6e62c48bb9179fd5b3e954f362fb346cbd5
author Linus Torvalds <torvalds@linux-foundation.org> 1414792848 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1414792848 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc update from David Miller:
 "Two changes:

  1) It makes no sense to execute a VTOC partition table request in the
     Sun virtual block device driver and fail to load if it doesn't
     succeed because a) we don't use the result at all and b) it won't
     succeed if there is an EFI partition on the disk, for example.

     We read the partition table via the normal means in the block layer
     anyways, so this is really completely useless, so just remove it.

     From Dwight Engen.

  2) Hook up new bpf system call"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sunvdc: don't call VD_OP_GET_VTOC
  sparc: Hook up bpf system call.