| Message ID | CAOg9mSSeHarznzQOBr4GkdxMHqSTEEj786o8yG1nZ35C0FYSng@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL] orangefs: a fix and two cleanups and a merge conflict | expand |
The pull request you sent on Fri, 10 Apr 2020 10:52:50 -0400:
> https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git tags/for-linus-5.7-ofs1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4e4bdcfa21297ab6f4d963edae3abb8ec4eac312
Thank you!
The following changes since commit 7111951b8d4973bda27ff663f2cf18b663d15b48: Linux 5.6 (2020-03-29 15:25:41 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git tags/for-linus-5.7-ofs1 for you to fetch changes up to aa317d3351dee7cb0b27db808af0cd2340dcbaef: orangefs: clarify build steps for test server in orangefs.txt (2020-04-08 13:01:03 -0400) ---------------------------------------------------------------- orangefs: a fix and two cleanups and a merge conflict Fix: Christoph Hellwig noticed that some logic I added to orangefs_file_read_iter introduced a race condition, so he sent a reversion patch. I had to modify his patch since reverting at this point broke Orangefs. Cleanup 1: Christoph Hellwig noticed that we were doing some unnecessary work in orangefs_flush, so he sent in a patch that removed the un-needed code. Cleanup 2: Al Viro told me he had trouble building Orangefs. Orangefs should be easy to build, even for Al :-). I looked back at the test server build notes in orangefs.txt, just in case that's where the trouble really is, and found a couple of typos and made a couple of clarifications. Merge Conflict: Stephen Rothwell reported that my modifications to orangefs.txt caused a merge conflict with orangefs.rst in Linux Next. I wasn't sure what to do, so I asked, and Jonathan Corbet said not to worry about it and just to report it to Linus. ---------------------------------------------------------------- Mike Marshall (3): orangefs: get rid of knob code... orangefs: don't mess with I_DIRTY_TIMES in orangefs_flush orangefs: clarify build steps for test server in orangefs.txt Documentation/filesystems/orangefs.txt | 34 ++++++++++++++++------------- fs/orangefs/file.c | 34 +---------------------------- fs/orangefs/inode.c | 39 ++++++---------------------------- fs/orangefs/orangefs-kernel.h | 4 ---- 4 files changed, 26 insertions(+), 85 deletions(-)