linux-next: manual merge of the orangefs tree with Linus' tree

linux-next: manual merge of the orangefs tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 5658 bytes --]

Hi all,

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

  Documentation/filesystems/orangefs.rst

between commit:

  18ccb2233fc5 ("docs: filesystems: convert orangefs.txt to ReST")

from Linus' tree and commit:

  aa317d3351de ("orangefs: clarify build steps for test server in orangefs.txt")

from the orangefs tree.

I fixed it up (see below) 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

diff --cc Documentation/filesystems/orangefs.rst
index 7d6d4cad73c4,5a3865702a71..000000000000
--- a/Documentation/filesystems/orangefs.rst
+++ b/Documentation/filesystems/orangefs.rst
@@@ -41,17 -38,7 +41,7 @@@ Documentatio
  
  http://www.orangefs.org/documentation/
  
- 
- Userspace Filesystem Source
- ===========================
- 
- http://www.orangefs.org/download
- 
- Orangefs versions prior to 2.9.3 would not be compatible with the
- upstream version of the kernel client.
- 
- 
 -RUNNING ORANGEFS ON A SINGLE SERVER
 +Running ORANGEFS On a Single Server
  ===================================
  
  OrangeFS is usually run in large installations with multiple servers and
@@@ -73,29 -60,37 +63,37 @@@ single line.  Uncomment it and change t
  controls clients which use libpvfs2.  This does not control the
  pvfs2-client-core.
  
 -Create the filesystem.
 +Create the filesystem::
  
 -pvfs2-server -f /etc/orangefs/orangefs.conf
 +    pvfs2-server -f /etc/orangefs/orangefs.conf
  
 -Start the server.
 +Start the server::
  
 -systemctl start orangefs-server
 +    systemctl start orangefs-server
  
 -Test the server.
 +Test the server::
  
 -pvfs2-ping -m /pvfsmnt
 +    pvfs2-ping -m /pvfsmnt
  
  Start the client.  The module must be compiled in or loaded before this
 -point.
 +point::
  
 -systemctl start orangefs-client
 +    systemctl start orangefs-client
  
 -Mount the filesystem.
 +Mount the filesystem::
  
 -mount -t pvfs2 tcp://localhost:3334/orangefs /pvfsmnt
 +    mount -t pvfs2 tcp://localhost:3334/orangefs /pvfsmnt
  
 -USERSPACE FILESYSTEM SOURCE
++Userspace Filesystem Source
+ ===========================
+ 
+ http://www.orangefs.org/download
+ 
+ Orangefs versions prior to 2.9.3 would not be compatible with the
+ upstream version of the kernel client.
+ 
  
 -BUILDING ORANGEFS ON A SINGLE SERVER
 +Building ORANGEFS on a Single Server
  ====================================
  
  Where OrangeFS cannot be installed from distribution packages, it may be
@@@ -105,51 -100,55 +103,57 @@@ You can omit --prefix if you don't car
  in /usr/local.  As of version 2.9.6, OrangeFS uses Berkeley DB by
  default, we will probably be changing the default to LMDB soon.
  
 -./configure --prefix=/opt/ofs --with-db-backend=lmdb --disable-usrint
 +::
  
-     ./configure --prefix=/opt/ofs --with-db-backend=lmdb
 -make
++    ./configure --prefix=/opt/ofs --with-db-backend=lmdb --disable-usrint
  
 -make install
 +    make
 +
 +    make install
  
- Create an orangefs config file::
+ Create an orangefs config file by running pvfs2-genconfig and
+ specifying a target config file. Pvfs2-genconfig will prompt you
+ through. Generally it works fine to take the defaults, but you
+ should use your server's hostname, rather than "localhost" when
 -it comes to that question.
++it comes to that question::
  
 -/opt/ofs/bin/pvfs2-genconfig /etc/pvfs2.conf
 +    /opt/ofs/bin/pvfs2-genconfig /etc/pvfs2.conf
  
 -Create an /etc/pvfs2tab file.
 +Create an /etc/pvfs2tab file::
  
 -Localhost is fine for your pvfs2tab file:
++    Localhost is fine for your pvfs2tab file.
+ 
 -echo tcp://localhost:3334/orangefs /pvfsmnt pvfs2 defaults,noauto 0 0 > \
 -    /etc/pvfs2tab
 +    echo tcp://localhost:3334/orangefs /pvfsmnt pvfs2 defaults,noauto 0 0 > \
 +	/etc/pvfs2tab
  
 -Create the mount point you specified in the tab file if needed.
 +Create the mount point you specified in the tab file if needed::
  
 -mkdir /pvfsmnt
 +    mkdir /pvfsmnt
  
 -Bootstrap the server.
 +Bootstrap the server::
  
 -/opt/ofs/sbin/pvfs2-server -f /etc/pvfs2.conf
 +    /opt/ofs/sbin/pvfs2-server -f /etc/pvfs2.conf
  
 -Start the server.
 +Start the server::
  
-     /opt/osf/sbin/pvfs2-server /etc/pvfs2.conf
 -/opt/ofs/sbin/pvfs2-server /etc/pvfs2.conf
++    /opt/ofs/sbin/pvfs2-server /etc/pvfs2.conf
  
  Now the server should be running. Pvfs2-ls is a simple
 -test to verify that the server is running.
 +test to verify that the server is running::
  
 -/opt/ofs/bin/pvfs2-ls /pvfsmnt
 +    /opt/ofs/bin/pvfs2-ls /pvfsmnt
  
  If stuff seems to be working, load the kernel module and
 -turn on the client core.
 +turn on the client core::
  
-     /opt/ofs/sbin/pvfs2-client -p /opt/osf/sbin/pvfs2-client-core
 -/opt/ofs/sbin/pvfs2-client -p /opt/ofs/sbin/pvfs2-client-core
++    /opt/ofs/sbin/pvfs2-client -p /opt/ofs/sbin/pvfs2-client-core
  
 -Mount your filesystem.
 +Mount your filesystem::
  
-     mount -t pvfs2 tcp://localhost:3334/orangefs /pvfsmnt
 -mount -t pvfs2 tcp://`hostname`:3334/orangefs /pvfsmnt
++    mount -t pvfs2 tcp://`hostname`:3334/orangefs /pvfsmnt
  
  
 -RUNNING XFSTESTS
 +Running xfstests
  ================
  
  It is useful to use a scratch filesystem with xfstests.  This can be

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the orangefs tree with Linus' tree

[Mike Marshall]

I see all the other rst files, but no orangefs.rst...

I did see evidence on fs-devel a few months(?) ago that someone
was converting txt files to rst and that orangefs.txt
was one of them... perhaps there was something I should
have done but didn't? Anywho... what next?

[hubcap@hubcapsc linux]$ git log | grep ^commit | head -5
commit aa317d3351dee7cb0b27db808af0cd2340dcbaef  |  my commits I'll
commit 0e393a9a8f2a450862964451715d68e9a96a9c34  |  try to get pulled
commit ec95f1dedc9c64ac5a8b0bdb7c276936c70fdedd  |  this time
commit 7111951b8d4973bda27ff663f2cf18b663d15b48  <--- Linux 5.6
commit 570203ec830dd451b8804cdef8036f7fca9f0311
[hubcap@hubcapsc linux]$ find . -name orangefs.rst
[hubcap@hubcapsc linux]$

-Mike "only three more days in the merge window"

On Wed, Apr 8, 2020 at 8:53 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the orangefs tree got a conflict in:
>
>   Documentation/filesystems/orangefs.rst
>
> between commit:
>
>   18ccb2233fc5 ("docs: filesystems: convert orangefs.txt to ReST")
>
> from Linus' tree and commit:
>
>   aa317d3351de ("orangefs: clarify build steps for test server in orangefs.txt")
>
> from the orangefs tree.
>
> I fixed it up (see below) 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
>
> diff --cc Documentation/filesystems/orangefs.rst
> index 7d6d4cad73c4,5a3865702a71..000000000000
> --- a/Documentation/filesystems/orangefs.rst
> +++ b/Documentation/filesystems/orangefs.rst
> @@@ -41,17 -38,7 +41,7 @@@ Documentatio
>
>   http://www.orangefs.org/documentation/
>
> -
> - Userspace Filesystem Source
> - ===========================
> -
> - http://www.orangefs.org/download
> -
> - Orangefs versions prior to 2.9.3 would not be compatible with the
> - upstream version of the kernel client.
> -
> -
>  -RUNNING ORANGEFS ON A SINGLE SERVER
>  +Running ORANGEFS On a Single Server
>   ===================================
>
>   OrangeFS is usually run in large installations with multiple servers and
> @@@ -73,29 -60,37 +63,37 @@@ single line.  Uncomment it and change t
>   controls clients which use libpvfs2.  This does not control the
>   pvfs2-client-core.
>
>  -Create the filesystem.
>  +Create the filesystem::
>
>  -pvfs2-server -f /etc/orangefs/orangefs.conf
>  +    pvfs2-server -f /etc/orangefs/orangefs.conf
>
>  -Start the server.
>  +Start the server::
>
>  -systemctl start orangefs-server
>  +    systemctl start orangefs-server
>
>  -Test the server.
>  +Test the server::
>
>  -pvfs2-ping -m /pvfsmnt
>  +    pvfs2-ping -m /pvfsmnt
>
>   Start the client.  The module must be compiled in or loaded before this
>  -point.
>  +point::
>
>  -systemctl start orangefs-client
>  +    systemctl start orangefs-client
>
>  -Mount the filesystem.
>  +Mount the filesystem::
>
>  -mount -t pvfs2 tcp://localhost:3334/orangefs /pvfsmnt
>  +    mount -t pvfs2 tcp://localhost:3334/orangefs /pvfsmnt
>
>  -USERSPACE FILESYSTEM SOURCE
> ++Userspace Filesystem Source
> + ===========================
> +
> + http://www.orangefs.org/download
> +
> + Orangefs versions prior to 2.9.3 would not be compatible with the
> + upstream version of the kernel client.
> +
>
>  -BUILDING ORANGEFS ON A SINGLE SERVER
>  +Building ORANGEFS on a Single Server
>   ====================================
>
>   Where OrangeFS cannot be installed from distribution packages, it may be
> @@@ -105,51 -100,55 +103,57 @@@ You can omit --prefix if you don't car
>   in /usr/local.  As of version 2.9.6, OrangeFS uses Berkeley DB by
>   default, we will probably be changing the default to LMDB soon.
>
>  -./configure --prefix=/opt/ofs --with-db-backend=lmdb --disable-usrint
>  +::
>
> -     ./configure --prefix=/opt/ofs --with-db-backend=lmdb
>  -make
> ++    ./configure --prefix=/opt/ofs --with-db-backend=lmdb --disable-usrint
>
>  -make install
>  +    make
>  +
>  +    make install
>
> - Create an orangefs config file::
> + Create an orangefs config file by running pvfs2-genconfig and
> + specifying a target config file. Pvfs2-genconfig will prompt you
> + through. Generally it works fine to take the defaults, but you
> + should use your server's hostname, rather than "localhost" when
>  -it comes to that question.
> ++it comes to that question::
>
>  -/opt/ofs/bin/pvfs2-genconfig /etc/pvfs2.conf
>  +    /opt/ofs/bin/pvfs2-genconfig /etc/pvfs2.conf
>
>  -Create an /etc/pvfs2tab file.
>  +Create an /etc/pvfs2tab file::
>
>  -Localhost is fine for your pvfs2tab file:
> ++    Localhost is fine for your pvfs2tab file.
> +
>  -echo tcp://localhost:3334/orangefs /pvfsmnt pvfs2 defaults,noauto 0 0 > \
>  -    /etc/pvfs2tab
>  +    echo tcp://localhost:3334/orangefs /pvfsmnt pvfs2 defaults,noauto 0 0 > \
>  +      /etc/pvfs2tab
>
>  -Create the mount point you specified in the tab file if needed.
>  +Create the mount point you specified in the tab file if needed::
>
>  -mkdir /pvfsmnt
>  +    mkdir /pvfsmnt
>
>  -Bootstrap the server.
>  +Bootstrap the server::
>
>  -/opt/ofs/sbin/pvfs2-server -f /etc/pvfs2.conf
>  +    /opt/ofs/sbin/pvfs2-server -f /etc/pvfs2.conf
>
>  -Start the server.
>  +Start the server::
>
> -     /opt/osf/sbin/pvfs2-server /etc/pvfs2.conf
>  -/opt/ofs/sbin/pvfs2-server /etc/pvfs2.conf
> ++    /opt/ofs/sbin/pvfs2-server /etc/pvfs2.conf
>
>   Now the server should be running. Pvfs2-ls is a simple
>  -test to verify that the server is running.
>  +test to verify that the server is running::
>
>  -/opt/ofs/bin/pvfs2-ls /pvfsmnt
>  +    /opt/ofs/bin/pvfs2-ls /pvfsmnt
>
>   If stuff seems to be working, load the kernel module and
>  -turn on the client core.
>  +turn on the client core::
>
> -     /opt/ofs/sbin/pvfs2-client -p /opt/osf/sbin/pvfs2-client-core
>  -/opt/ofs/sbin/pvfs2-client -p /opt/ofs/sbin/pvfs2-client-core
> ++    /opt/ofs/sbin/pvfs2-client -p /opt/ofs/sbin/pvfs2-client-core
>
>  -Mount your filesystem.
>  +Mount your filesystem::
>
> -     mount -t pvfs2 tcp://localhost:3334/orangefs /pvfsmnt
>  -mount -t pvfs2 tcp://`hostname`:3334/orangefs /pvfsmnt
> ++    mount -t pvfs2 tcp://`hostname`:3334/orangefs /pvfsmnt
>
>
>  -RUNNING XFSTESTS
>  +Running xfstests
>   ================
>
>   It is useful to use a scratch filesystem with xfstests.  This can be

Re: linux-next: manual merge of the orangefs tree with Linus' tree

[Jonathan Corbet]

On Thu, 9 Apr 2020 11:05:19 -0400
Mike Marshall <hubcap@omnibond.com> wrote:

> I see all the other rst files, but no orangefs.rst...
> 
> I did see evidence on fs-devel a few months(?) ago that someone
> was converting txt files to rst and that orangefs.txt
> was one of them... perhaps there was something I should
> have done but didn't? Anywho... what next?

Warn Linus about the conflict when you send in your pull request.
Assuming Stephen's resolution works for you, you can mention that but
there's not much else you really need to worry about.

Merge conflicts are ... not uncommon ... in the documentation tree.

jon

linux-next: manual merge of the orangefs tree with Linus' tree

[Stephen Rothwell]

Hi Mike,

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

  Makefile

between commit:

  1ec218373b8e ("Linux 4.4-rc2")

from Linus' tree and commit:

  575e946125f7 ("Orangefs: change pvfs2 filenames to orangefs")

from the orangefs tree.

You should really remove this EXTRAVERSION change from the patch.

I fixed it up (I use Linus' tree verison) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au