From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Apr 2015 20:49:27 +0000 (-0700)
Subject: Merge tag 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
X-Git-Tag: v4.1-rc1~121
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e44740c1a94b5d39b093045920f543a7bc135584;p=linux-2.6-block.git

Merge tag 'for-linus-4.1' of git://git./linux/kernel/git/rw/uml

Pull UML updates from Richard Weinberger:
 - hostfs saw a face lifting
 - old/broken stuff was removed (SMP, HIGHMEM, SKAS3/4)
 - random cleanups and bug fixes

* tag 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (26 commits)
  um: Print minimum physical memory requirement
  um: Move uml_postsetup in the init_thread stack
  um: add a kmsg_dumper
  x86, UML: fix integer overflow in ELF_ET_DYN_BASE
  um: hostfs: Reduce number of syscalls in readdir
  um: Remove broken highmem support
  um: Remove broken SMP support
  um: Remove SKAS3/4 support
  um: Remove ppc cruft
  um: Remove ia64 cruft
  um: Remove dead code from stacktrace
  hostfs: No need to box and later unbox the file mode
  hostfs: Use page_offset()
  hostfs: Set page flags in hostfs_readpage() correctly
  hostfs: Remove superfluous initializations in hostfs_open()
  hostfs: hostfs_open: Reset open flags upon each retry
  hostfs: Remove superfluous test in hostfs_open()
  hostfs: Report append flag in ->show_options()
  hostfs: Use __getname() in follow_link
  hostfs: Remove open coded strcpy()
  ...
---

e44740c1a94b5d39b093045920f543a7bc135584
diff --cc fs/hostfs/hostfs_kern.c
index e021188ca110,d0a2f68a0eea..b83a0343378b
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@@ -381,8 -390,10 +390,8 @@@ static const struct file_operations hos
  	.splice_read	= generic_file_splice_read,
  	.read_iter	= generic_file_read_iter,
  	.write_iter	= generic_file_write_iter,
 -	.write		= new_sync_write,
  	.mmap		= generic_file_mmap,
- 	.open		= hostfs_file_open,
+ 	.open		= hostfs_open,
  	.release	= hostfs_file_release,
  	.fsync		= hostfs_fsync,
  };