Google Git
Sign in
kernel/pub/scm/linux/kernel/git/viro/vfs/refs/heads/merge-1
commit
1d8241bbd53cc5113d3221ed40a7b5ae14e43b55
[log]
author
Al Viro <viro@zeniv.linux.org.uk>
Thu Mar 02 04:52:30 2017 -0500
committer
Al Viro <viro@zeniv.linux.org.uk>
Thu Mar 02 05:38:36 2017 -0500
tree
6217a3fb564c40494a4673630486b002d555e9b9
parent
4038a2a37e3595c299aecdaa20cb01ceb9c78303 [diff]
parent
4977ab6e92e267afe9d8f78438c3db330ca8434c [diff]
Conflict resolution with mainline

drivers/block/nbd.c - resolved as in -next
tree: 6217a3fb564c40494a4673630486b002d555e9b9
  1. arch/
  2. block/
  3. certs/
  4. crypto/
  5. Documentation/
  6. drivers/
  7. firmware/
  8. fs/
  9. include/
  10. init/
  11. ipc/
  12. kernel/
  13. lib/
  14. mm/
  15. net/
  16. samples/
  17. scripts/
  18. security/
  19. sound/
  20. tools/
  21. usr/
  22. virt/
  23. .cocciconfig
  24. .get_maintainer.ignore
  25. .gitattributes
  26. .gitignore
  27. .mailmap
  28. COPYING
  29. CREDITS
  30. Kbuild
  31. Kconfig
  32. MAINTAINERS
  33. Makefile
  34. README