Hi all,
Today's linux-next merge of the xfs tree got a conflict in:
Documentation/admin-guide/index.rst
between commit:
66f2a122c68d ("docs: Move binderfs to admin-guide")
from Linus' tree and commit:
89b408a68b9d ("Documentation: filesystem: Convert xfs.txt to ReST")
from the xfs tree
On Wed, Oct 31, 2018 at 11:22:44AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xfs tree got a conflict in:
>
> Documentation/filesystems/porting
>
> between commit:
>
> 1a16dbaf798c ("Document d_splice_alias() calling conventions for ->lookup()
> users.")
>
Hi all,
Today's linux-next merge of the xfs tree got a conflict in:
Documentation/filesystems/porting
between commit:
1a16dbaf798c ("Document d_splice_alias() calling conventions for ->lookup()
users.")
from Linus' tree and commit:
2e5dfc99f2e6 ("vfs: combine the clone and dedupe into
Hi Dave,
On Tue, 5 Jun 2018 10:59:04 +1000 Dave Chinner wrote:
>
> On Tue, Jun 05, 2018 at 10:34:03AM +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the xfs tree got a conflict in:
> >
> > fs/gfs2/bmap.c
> >
> > between commit:
> >
> > 628e366df11c ("gfs2: Iomap cleanup
2018-06-05 2:59 GMT+02:00 Dave Chinner :
> On Tue, Jun 05, 2018 at 10:34:03AM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the xfs tree got a conflict in:
>>
>> fs/gfs2/bmap.c
>>
>> between commit:
>>
>> 628e366df11c ("gfs2: Iomap cleanups and improvements")
>>
>>
On Tue, Jun 05, 2018 at 10:34:03AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xfs tree got a conflict in:
>
> fs/gfs2/bmap.c
>
> between commit:
>
> 628e366df11c ("gfs2: Iomap cleanups and improvements")
>
> from Linus' tree and commit:
>
> 7ee66c03e40a
Hi all,
On Tue, 5 Jun 2018 10:34:03 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the xfs tree got a conflict in:
>
> fs/gfs2/bmap.c
>
> between commit:
>
> 628e366df11c ("gfs2: Iomap cleanups and improvements")
>
> from Linus' tree and commit:
>
> 7ee66c03e40a ("iomap
Hi all,
Today's linux-next merge of the xfs tree got a conflict in:
fs/gfs2/bmap.c
between commit:
628e366df11c ("gfs2: Iomap cleanups and improvements")
from Linus' tree and commit:
7ee66c03e40a ("iomap: move IOMAP_F_BOUNDARY to gfs2")
from the xfs tree.
I fixed it up (see below) and
On Fri, Dec 22, 2017 at 09:50:41AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xfs tree got a conflict in:
>
> fs/xfs/xfs_super.c
>
> between commit:
>
> 1751e8a6cb93 ("Rename superblock flags (MS_xyz -> SB_xyz)")
>
> from Linus' tree and commit:
>
> 10d
Hi all,
Today's linux-next merge of the xfs tree got a conflict in:
fs/xfs/xfs_super.c
between commit:
1751e8a6cb93 ("Rename superblock flags (MS_xyz -> SB_xyz)")
from Linus' tree and commit:
10ddf64e420f ("xfs: remove leftover CoW reservations when remounting ro")
from the xfs tree.
On Thu, Jul 21, 2016 at 11:07:56AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xfs tree got a conflict in:
>
> fs/xfs/xfs_ioctl.c
>
> between commit:
>
> 3e0a39654645 ("xfs: fix type confusion in xfs_ioc_swapext")
>
> from Linus' tree and commit:
>
> 7f1
Hi all,
Today's linux-next merge of the xfs tree got a conflict in:
fs/xfs/xfs_ioctl.c
between commit:
3e0a39654645 ("xfs: fix type confusion in xfs_ioc_swapext")
from Linus' tree and commit:
7f1b62457b58 ("xfs: fix type confusion in xfs_ioc_swapext")
from the xfs tree.
These are not
Hi all,
Today's linux-next merge of the xfs tree got a conflict in
fs/xfs/xfs_file.c between commits 99733fa372ea
("xfs_file_aio_write_checks: switch to iocb/iov_iter") and 3309dd04cbcd
("switch generic_write_checks() to iocb and iter") from Linus' tree and
commits b9d59846f737 ("xfs: DIO write co
13 matches
Mail list logo
