* linux-next: manual merge of the vfs tree
@ 2008-07-18 5:36 Stephen Rothwell
2008-07-18 8:33 ` Ralf Baechle
0 siblings, 1 reply; 18+ messages in thread
From: Stephen Rothwell @ 2008-07-18 5:36 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 486 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got conflicts in
arch/mips/kernel/irixelf.c and include/asm-mips/namei.h between commit
2957c9e61ee9c37e7ebf2c8acab03e073fe942fd ("[MIPS] IRIX: Goodbye and
thanks for all the fish") from the mips tree and commit
2d810d154f1ffc5c637acdb067693773efb09540 ("[PATCH] kill altroot") from
the vfs tree.
I removed both files.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: linux-next: manual merge of the vfs tree
2008-07-18 5:36 linux-next: manual merge of the vfs tree Stephen Rothwell
@ 2008-07-18 8:33 ` Ralf Baechle
2008-07-18 9:06 ` Stephen Rothwell
2008-07-18 12:51 ` Al Viro
0 siblings, 2 replies; 18+ messages in thread
From: Ralf Baechle @ 2008-07-18 8:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Al Viro, linux-next
On Fri, Jul 18, 2008 at 03:36:29PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the vfs tree got conflicts in
> arch/mips/kernel/irixelf.c and include/asm-mips/namei.h between commit
> 2957c9e61ee9c37e7ebf2c8acab03e073fe942fd ("[MIPS] IRIX: Goodbye and
> thanks for all the fish") from the mips tree and commit
> 2d810d154f1ffc5c637acdb067693773efb09540 ("[PATCH] kill altroot") from
> the vfs tree.
>
> I removed both files.
Removing arch/mips/kernel/irixelf.c is fine but removing <asm/namei.h>
will break the build of fs/namei.c.
Btw, shouldn't <linux/namei.h> include <asm/namei.h>? Or alternatively
maybe rename <asm/namei.h> to something else?
Ralf
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: linux-next: manual merge of the vfs tree
2008-07-18 8:33 ` Ralf Baechle
@ 2008-07-18 9:06 ` Stephen Rothwell
2008-07-18 12:51 ` Al Viro
1 sibling, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2008-07-18 9:06 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Al Viro, linux-next
[-- Attachment #1: Type: text/plain, Size: 852 bytes --]
Hi Ralf,
On Fri, 18 Jul 2008 09:33:41 +0100 Ralf Baechle <ralf@linux-mips.org> wrote:
>
> On Fri, Jul 18, 2008 at 03:36:29PM +1000, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the vfs tree got conflicts in
> > arch/mips/kernel/irixelf.c and include/asm-mips/namei.h between commit
> > 2957c9e61ee9c37e7ebf2c8acab03e073fe942fd ("[MIPS] IRIX: Goodbye and
> > thanks for all the fish") from the mips tree and commit
> > 2d810d154f1ffc5c637acdb067693773efb09540 ("[PATCH] kill altroot") from
> > the vfs tree.
> >
> > I removed both files.
>
> Removing arch/mips/kernel/irixelf.c is fine but removing <asm/namei.h>
> will break the build of fs/namei.c.
The vfs tree patch killed all references to asm/namei.h
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: linux-next: manual merge of the vfs tree
2008-07-18 8:33 ` Ralf Baechle
2008-07-18 9:06 ` Stephen Rothwell
@ 2008-07-18 12:51 ` Al Viro
1 sibling, 0 replies; 18+ messages in thread
From: Al Viro @ 2008-07-18 12:51 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Stephen Rothwell, linux-next
On Fri, Jul 18, 2008 at 09:33:41AM +0100, Ralf Baechle wrote:
> On Fri, Jul 18, 2008 at 03:36:29PM +1000, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the vfs tree got conflicts in
> > arch/mips/kernel/irixelf.c and include/asm-mips/namei.h between commit
> > 2957c9e61ee9c37e7ebf2c8acab03e073fe942fd ("[MIPS] IRIX: Goodbye and
> > thanks for all the fish") from the mips tree and commit
> > 2d810d154f1ffc5c637acdb067693773efb09540 ("[PATCH] kill altroot") from
> > the vfs tree.
> >
> > I removed both files.
>
> Removing arch/mips/kernel/irixelf.c is fine but removing <asm/namei.h>
> will break the build of fs/namei.c.
>
> Btw, shouldn't <linux/namei.h> include <asm/namei.h>? Or alternatively
> maybe rename <asm/namei.h> to something else?
No. altroot is *gone* and so is asm/namei.h. Patch in my tree removed that
one, along with the crap in fs/namei.c that used to use it. Since irixelf.c
used to use the value of IRIX_EMUL, the same patch moved that #define in there.
So the conflict resolution is correct...
^ permalink raw reply [flat|nested] 18+ messages in thread
* linux-next: manual merge of the vfs tree
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
@ 2013-10-01 11:07 ` Thierry Reding
0 siblings, 0 replies; 18+ messages in thread
From: Thierry Reding @ 2013-10-01 11:07 UTC (permalink / raw)
To: Trond Myklebust, Dave Kleikamp; +Cc: linux-next, linux-kernel
Today's linux-next merge of the vfs tree got conflicts in:
fs/nfs/direct.c
fs/nfs/file.c
I fixed them up (see below). Please check if the resolution looks correct.
Thanks,
Thierry
---
diff --cc fs/nfs/direct.c
index 239c2fe,d71d66c..e83817c
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@@ -118,18 -117,26 +118,17 @@@ static inline int put_dreq(struct nfs_d
* @nr_segs: size of iovec array
*
* The presence of this routine in the address space ops vector means
- * the NFS client supports direct I/O. However, for most direct IO, we
- * shunt off direct read and write requests before the VFS gets them,
- * so this method is only ever called for swap.
+ * the NFS client supports direct I/O. However, we shunt off direct
+ * read and write requests before the VFS gets them, so this method
+ * should never be called.
*/
-ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs)
+ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
+ loff_t pos)
{
- dprintk("NFS: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n",
- iocb->ki_filp->f_path.dentry->d_name.name,
- (long long) pos, iter->nr_segs);
-#ifndef CONFIG_NFS_SWAP
+ dprintk("NFS: nfs_direct_IO (%pD) off/no(%Ld/%lu) EINVAL\n",
+ iocb->ki_filp, (long long) pos, nr_segs);
return -EINVAL;
-#else
- VM_BUG_ON(iocb->ki_nbytes != PAGE_SIZE);
-
- if (rw == READ || rw == KERNEL_READ)
- return nfs_file_direct_read(iocb, iov, nr_segs, pos,
- rw == READ ? true : false);
- return nfs_file_direct_write(iocb, iov, nr_segs, pos,
- rw == WRITE ? true : false);
-#endif /* CONFIG_NFS_SWAP */
}
static void nfs_direct_release_pages(struct page **pages, unsigned int npages)
@@@ -1010,13 -905,11 +1009,11 @@@ ssize_t nfs_file_direct_read(struct kio
struct address_space *mapping = file->f_mapping;
size_t count;
- count = iov_length(iov, nr_segs);
+ count = iov_iter_count(iter);
nfs_add_stats(mapping->host, NFSIOS_DIRECTREADBYTES, count);
- dfprintk(FILE, "NFS: direct read(%s/%s, %zd@%Ld)\n",
- file->f_path.dentry->d_parent->d_name.name,
- file->f_path.dentry->d_name.name,
- count, (long long) pos);
+ dfprintk(FILE, "NFS: direct read(%pD2, %zd@%Ld)\n",
+ file, count, (long long) pos);
retval = 0;
if (!count)
@@@ -1065,13 -959,11 +1062,11 @@@ ssize_t nfs_file_direct_write(struct ki
struct address_space *mapping = file->f_mapping;
size_t count;
- count = iov_length(iov, nr_segs);
+ count = iov_iter_count(iter);
nfs_add_stats(mapping->host, NFSIOS_DIRECTWRITTENBYTES, count);
- dfprintk(FILE, "NFS: direct write(%s/%s, %zd@%Ld)\n",
- file->f_path.dentry->d_parent->d_name.name,
- file->f_path.dentry->d_name.name,
- count, (long long) pos);
+ dfprintk(FILE, "NFS: direct write(%pD2, %zd@%Ld)\n",
+ file, count, (long long) pos);
retval = generic_write_checks(file, &pos, &count, 0);
if (retval)
diff --cc fs/nfs/file.c
index 19ac4fd,e2fcacf..cb66d5f
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@@ -174,18 -165,18 +165,17 @@@ nfs_file_flush(struct file *file, fl_ow
EXPORT_SYMBOL_GPL(nfs_file_flush);
ssize_t
-nfs_file_read(struct kiocb *iocb, const struct iovec *iov,
- unsigned long nr_segs, loff_t pos)
+nfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter, loff_t pos)
{
- struct dentry * dentry = iocb->ki_filp->f_path.dentry;
- struct inode * inode = dentry->d_inode;
+ struct inode *inode = file_inode(iocb->ki_filp);
ssize_t result;
if (iocb->ki_filp->f_flags & O_DIRECT)
- return nfs_file_direct_read(iocb, iov, nr_segs, pos, true);
+ return nfs_file_direct_read(iocb, iter, pos);
- dprintk("NFS: read_iter(%s/%s, %lu@%lu)\n",
- dentry->d_parent->d_name.name, dentry->d_name.name,
- (unsigned long) iov_iter_count(iter), (unsigned long) pos);
- dprintk("NFS: read(%pD2, %lu@%lu)\n",
++ dprintk("NFS: read_iter(%pD2, %lu@%lu)\n",
+ iocb->ki_filp,
+ (unsigned long) iov_length(iov, nr_segs), (unsigned long) pos);
result = nfs_revalidate_mapping(inode, iocb->ki_filp->f_mapping);
if (!result) {
@@@ -655,25 -634,24 +633,24 @@@ static int nfs_need_sync_write(struct f
return 0;
}
-ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov,
- unsigned long nr_segs, loff_t pos)
+ssize_t nfs_file_write_iter(struct kiocb *iocb, struct iov_iter *iter,
+ loff_t pos)
{
- struct dentry * dentry = iocb->ki_filp->f_path.dentry;
- struct inode * inode = dentry->d_inode;
+ struct file *file = iocb->ki_filp;
+ struct inode *inode = file_inode(file);
unsigned long written = 0;
ssize_t result;
- size_t count = iov_length(iov, nr_segs);
+ size_t count = iov_iter_count(iter);
- result = nfs_key_timeout_notify(iocb->ki_filp, inode);
+ result = nfs_key_timeout_notify(file, inode);
if (result)
return result;
- if (iocb->ki_filp->f_flags & O_DIRECT)
+ if (file->f_flags & O_DIRECT)
- return nfs_file_direct_write(iocb, iov, nr_segs, pos, true);
+ return nfs_file_direct_write(iocb, iter, pos);
- dprintk("NFS: write_iter(%s/%s, %lu@%lld)\n",
- dentry->d_parent->d_name.name, dentry->d_name.name,
- (unsigned long) count, (long long) pos);
- dprintk("NFS: write(%pD2, %lu@%Ld)\n",
++ dprintk("NFS: write_iter(%pD2, %lu@%Ld)\n",
+ file, (unsigned long) count, (long long) pos);
result = -EBUSY;
if (IS_SWAPFILE(inode))
^ permalink raw reply [flat|nested] 18+ messages in thread
* linux-next: manual merge of the vfs tree
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
@ 2013-09-30 11:26 ` Thierry Reding
0 siblings, 0 replies; 18+ messages in thread
From: Thierry Reding @ 2013-09-30 11:26 UTC (permalink / raw)
To: Alexander Viro; +Cc: linux-fsdevel, linux-next, linux-kernel
Today's linux-next merge of the vfs tree got conflicts in
fs/nfs/direct.c
fs/nfs/file.c
I fixed them up (see below). Please check if the resolution looks correct.
Thanks,
Thierry
---
diff --cc fs/nfs/direct.c
index 239c2fe,d71d66c..e83817c
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@@ -118,18 -117,26 +118,17 @@@ static inline int put_dreq(struct nfs_d
* @nr_segs: size of iovec array
*
* The presence of this routine in the address space ops vector means
- * the NFS client supports direct I/O. However, for most direct IO, we
- * shunt off direct read and write requests before the VFS gets them,
- * so this method is only ever called for swap.
+ * the NFS client supports direct I/O. However, we shunt off direct
+ * read and write requests before the VFS gets them, so this method
+ * should never be called.
*/
-ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs)
+ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
+ loff_t pos)
{
- dprintk("NFS: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n",
- iocb->ki_filp->f_path.dentry->d_name.name,
- (long long) pos, iter->nr_segs);
-#ifndef CONFIG_NFS_SWAP
+ dprintk("NFS: nfs_direct_IO (%pD) off/no(%Ld/%lu) EINVAL\n",
+ iocb->ki_filp, (long long) pos, nr_segs);
return -EINVAL;
-#else
- VM_BUG_ON(iocb->ki_nbytes != PAGE_SIZE);
-
- if (rw == READ || rw == KERNEL_READ)
- return nfs_file_direct_read(iocb, iov, nr_segs, pos,
- rw == READ ? true : false);
- return nfs_file_direct_write(iocb, iov, nr_segs, pos,
- rw == WRITE ? true : false);
-#endif /* CONFIG_NFS_SWAP */
}
static void nfs_direct_release_pages(struct page **pages, unsigned int npages)
@@@ -1010,13 -905,11 +1009,11 @@@ ssize_t nfs_file_direct_read(struct kio
struct address_space *mapping = file->f_mapping;
size_t count;
- count = iov_length(iov, nr_segs);
+ count = iov_iter_count(iter);
nfs_add_stats(mapping->host, NFSIOS_DIRECTREADBYTES, count);
- dfprintk(FILE, "NFS: direct read(%s/%s, %zd@%Ld)\n",
- file->f_path.dentry->d_parent->d_name.name,
- file->f_path.dentry->d_name.name,
- count, (long long) pos);
+ dfprintk(FILE, "NFS: direct read(%pD2, %zd@%Ld)\n",
+ file, count, (long long) pos);
retval = 0;
if (!count)
@@@ -1065,13 -959,11 +1062,11 @@@ ssize_t nfs_file_direct_write(struct ki
struct address_space *mapping = file->f_mapping;
size_t count;
- count = iov_length(iov, nr_segs);
+ count = iov_iter_count(iter);
nfs_add_stats(mapping->host, NFSIOS_DIRECTWRITTENBYTES, count);
- dfprintk(FILE, "NFS: direct write(%s/%s, %zd@%Ld)\n",
- file->f_path.dentry->d_parent->d_name.name,
- file->f_path.dentry->d_name.name,
- count, (long long) pos);
+ dfprintk(FILE, "NFS: direct write(%pD2, %zd@%Ld)\n",
+ file, count, (long long) pos);
retval = generic_write_checks(file, &pos, &count, 0);
if (retval)
diff --cc fs/nfs/file.c
index 19ac4fd,e2fcacf..cb66d5f
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@@ -174,18 -165,18 +165,17 @@@ nfs_file_flush(struct file *file, fl_ow
EXPORT_SYMBOL_GPL(nfs_file_flush);
ssize_t
-nfs_file_read(struct kiocb *iocb, const struct iovec *iov,
- unsigned long nr_segs, loff_t pos)
+nfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter, loff_t pos)
{
- struct dentry * dentry = iocb->ki_filp->f_path.dentry;
- struct inode * inode = dentry->d_inode;
+ struct inode *inode = file_inode(iocb->ki_filp);
ssize_t result;
if (iocb->ki_filp->f_flags & O_DIRECT)
- return nfs_file_direct_read(iocb, iov, nr_segs, pos, true);
+ return nfs_file_direct_read(iocb, iter, pos);
- dprintk("NFS: read_iter(%s/%s, %lu@%lu)\n",
- dentry->d_parent->d_name.name, dentry->d_name.name,
- (unsigned long) iov_iter_count(iter), (unsigned long) pos);
- dprintk("NFS: read(%pD2, %lu@%lu)\n",
++ dprintk("NFS: read_iter(%pD2, %lu@%lu)\n",
+ iocb->ki_filp,
+ (unsigned long) iov_length(iov, nr_segs), (unsigned long) pos);
result = nfs_revalidate_mapping(inode, iocb->ki_filp->f_mapping);
if (!result) {
@@@ -655,25 -634,24 +633,24 @@@ static int nfs_need_sync_write(struct f
return 0;
}
-ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov,
- unsigned long nr_segs, loff_t pos)
+ssize_t nfs_file_write_iter(struct kiocb *iocb, struct iov_iter *iter,
+ loff_t pos)
{
- struct dentry * dentry = iocb->ki_filp->f_path.dentry;
- struct inode * inode = dentry->d_inode;
+ struct file *file = iocb->ki_filp;
+ struct inode *inode = file_inode(file);
unsigned long written = 0;
ssize_t result;
- size_t count = iov_length(iov, nr_segs);
+ size_t count = iov_iter_count(iter);
- result = nfs_key_timeout_notify(iocb->ki_filp, inode);
+ result = nfs_key_timeout_notify(file, inode);
if (result)
return result;
- if (iocb->ki_filp->f_flags & O_DIRECT)
+ if (file->f_flags & O_DIRECT)
- return nfs_file_direct_write(iocb, iov, nr_segs, pos, true);
+ return nfs_file_direct_write(iocb, iter, pos);
- dprintk("NFS: write_iter(%s/%s, %lu@%lld)\n",
- dentry->d_parent->d_name.name, dentry->d_name.name,
- (unsigned long) count, (long long) pos);
- dprintk("NFS: write(%pD2, %lu@%Ld)\n",
++ dprintk("NFS: write_iter(%pD2, %lu@%Ld)\n",
+ file, (unsigned long) count, (long long) pos);
result = -EBUSY;
if (IS_SWAPFILE(inode))
^ permalink raw reply [flat|nested] 18+ messages in thread
* linux-next: manual merge of the vfs tree
@ 2008-10-15 6:50 Stephen Rothwell
0 siblings, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2008-10-15 6:50 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Theodore Ts'o, Christoph Hellwig
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/ext4/namei.c between commit f702ba0fd7d50b5f5f5aea5317875a10d40b869f
("ext4: Don't use 'struct dentry' for internal lookups") from Linus' tree
and commit 8ee6b8fff20962d17a008e230006e48c7f79ade4 ("[PATCH] switch all
filesystems over to d_obtain_alias") from the vfs tree.
Just context changes. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc fs/ext4/namei.c
index 92db9e9,542c013..0000000
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@@ -1061,17 -1060,15 +1061,14 @@@ static struct dentry *ext4_lookup(struc
struct dentry *ext4_get_parent(struct dentry *child)
{
unsigned long ino;
- struct dentry *parent;
- struct inode *inode;
- struct dentry dotdot;
+ static const struct qstr dotdot = {
+ .name = "..",
+ .len = 2,
+ };
struct ext4_dir_entry_2 * de;
struct buffer_head *bh;
- dotdot.d_name.name = "..";
- dotdot.d_name.len = 2;
- dotdot.d_parent = child; /* confusing, isn't it! */
-
- bh = ext4_find_entry(&dotdot, &de);
+ bh = ext4_find_entry(child->d_inode, &dotdot, &de);
- inode = NULL;
if (!bh)
return ERR_PTR(-ENOENT);
ino = le32_to_cpu(de->inode);
^ permalink raw reply [flat|nested] 18+ messages in thread
* linux-next: manual merge of the vfs tree
@ 2008-08-19 5:25 Stephen Rothwell
0 siblings, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2008-08-19 5:25 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
arch/powerpc/kernel/sys_ppc32.c between commit
50d0b17645a26d2877c9d5538114498c3f82adac ("powerpc: Use generic
compat_sys_old_readdir") from Linus' tree and commit
7218c796efebbb70dce773d14d3cd3f359eebe2a ("[PATCH] fix powerpc compat
readdir()") from the vfs tree.
Again, the former removes the code that the latter updates. I used the
version from Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* linux-next: manual merge of the vfs tree
@ 2008-08-19 5:23 Stephen Rothwell
0 siblings, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2008-08-19 5:23 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Christoph Hellwig, Luck, Tony
[-- Attachment #1: Type: text/plain, Size: 544 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
arch/ia64/ia32/sys_ia32.c between commit
37c23e7fda6913d133ac12012395e58af1fe24c6 ("[IA64] use generic
compat_old_sys_readdir") from the ia64 tree and commit
8d88103c3046cd44df7591cb008afc22d526139b ("[PATCH] fix ia64 compat
readdir/getdents") from the vfs tree.
The former removes the code that the latter updates. I used the version
from the ia64 tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: linux-next: manual merge of the vfs tree
2008-08-12 5:20 Stephen Rothwell
@ 2008-08-12 19:27 ` J. Bruce Fields
0 siblings, 0 replies; 18+ messages in thread
From: J. Bruce Fields @ 2008-08-12 19:27 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Al Viro, linux-next, Julia Lawall
On Tue, Aug 12, 2008 at 03:20:37PM +1000, Stephen Rothwell wrote:
> Hi Al,
>
> Today's linux-next merge of the vfs tree got a conflict in
> fs/nfsd/export.c between commit 53e6d8d182e97c5211da4ee1f163c840c7ecf8ca
> ("fs/nfsd/export.c: Adjust error handling code involving
> auth_domain_put") from the nfsd tree and commit
> eec56f5904cd79d7cf99efd74ad02f39c829fff1 ("switch nfsd to kern_path()")
> from the vfs tree.
>
> The conflict is contextual. I fixed it up and can carry the fixup.
OK, thanks. Looks like I can't help for now as long as kern_path()
isn't upstream.
(Minor request, if it's easy to automate: would it be possible to
include a url for linux-next (or even for the specific tree that the
commit came from) with these messages? It'd just save a little googling
when I want to see what's going on.)
--b.
^ permalink raw reply [flat|nested] 18+ messages in thread
* linux-next: manual merge of the vfs tree
@ 2008-08-12 5:20 Stephen Rothwell
2008-08-12 19:27 ` J. Bruce Fields
0 siblings, 1 reply; 18+ messages in thread
From: Stephen Rothwell @ 2008-08-12 5:20 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Julia Lawall, J. Bruce Fields
[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/nfsd/export.c between commit 53e6d8d182e97c5211da4ee1f163c840c7ecf8ca
("fs/nfsd/export.c: Adjust error handling code involving
auth_domain_put") from the nfsd tree and commit
eec56f5904cd79d7cf99efd74ad02f39c829fff1 ("switch nfsd to kern_path()")
from the vfs tree.
The conflict is contextual. I fixed it up and can carry the fixup.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* linux-next: manual merge of the vfs tree
@ 2008-08-12 5:14 Stephen Rothwell
0 siblings, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2008-08-12 5:14 UTC (permalink / raw)
To: Al Viro
Cc: linux-next, Christoph Hellwig, Eric Sandeen, David Chinner, xfs-masters
[-- Attachment #1: Type: text/plain, Size: 614 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/xfs/linux-2.6/xfs_export.c between commits
31048586a1d967e855dce8a8d420b3acbcb7d879 ("[XFS] convert xfs to use
ERR_CAST") and 293a47c282254cbae1c96cfb2e242e57c050f5c7 ("[XFS] In
several places we directly convert from the XFS inode to the") from the
xfs tree and commit 55b773e574bc6e14b11605059faeea613880b72b ("switch all
filesystems over to d_obtain_alias") from the vfs tree.
I did the obvious fixups and can carry them.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* linux-next: manual merge of the vfs tree
@ 2008-08-12 5:01 Stephen Rothwell
0 siblings, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2008-08-12 5:01 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Christoph Hellwig, David Chinner, xfs-masters
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/xfs/linux-2.6/xfs_iops.c between commit
293a47c282254cbae1c96cfb2e242e57c050f5c7 ("[XFS] In several places we
directly convert from the XFS inode to the") from the xfs tree and commit
c019d29bf7a7989cab5adfeb4d46c507ea9db087 ("change d_add_ci argument
ordering") from the vfs tree.
I did the obvious fixup and can carry it.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* linux-next: manual merge of the vfs tree
@ 2008-07-25 4:30 Stephen Rothwell
0 siblings, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2008-07-25 4:30 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Denys Vlasenko, Ulrich Drepper
[-- Attachment #1: Type: text/plain, Size: 524 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/pipe.c
between commit be61a86d7237dd80510615f38ae21d6e1e98660c ("flag
parameters: NONBLOCK in pipe") from Linus' tree and commit
6d865512f04526c702efda424b825ee946e659de ("Re: [PATCH] (resend) reuse
xxx_fifo_fops for xxx_pipe_fops") from the vfs tree.
Just overlapping context changes in create_read_pipe(). I did the
obvious fixup.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: linux-next: manual merge of the vfs tree
2008-07-18 5:27 Stephen Rothwell
@ 2008-07-18 9:44 ` Stephen Rothwell
0 siblings, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2008-07-18 9:44 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Miklos Szeredi
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
Hi Al,
On Fri, 18 Jul 2008 15:27:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in
> security/dummy.c between commit 5915eb53861c5776cfec33ca4fcc1fd20d66dd27
> ("security: remove dummy module") from the tree and commit
^^^^^^^^^
Linus' tree
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* linux-next: manual merge of the vfs tree
@ 2008-07-18 5:33 Stephen Rothwell
0 siblings, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2008-07-18 5:33 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Sam Ravnborg, David Miller
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
include/asm-sparc64/namei.h include/asm-sparc/namei.h between commit
0d4b5053275562b4ff7a9a98942936c9eb9b5c18 ("sparc: join the remaining
header files") from the sparc tree and commit
2d810d154f1ffc5c637acdb067693773efb09540 ("[PATCH] kill altroot") from
the vfs tree.
I removed the files and the _{32,64} versions as well.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* linux-next: manual merge of the vfs tree
@ 2008-07-18 5:27 Stephen Rothwell
2008-07-18 9:44 ` Stephen Rothwell
0 siblings, 1 reply; 18+ messages in thread
From: Stephen Rothwell @ 2008-07-18 5:27 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Miklos Szeredi
[-- Attachment #1: Type: text/plain, Size: 469 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
security/dummy.c between commit 5915eb53861c5776cfec33ca4fcc1fd20d66dd27
("security: remove dummy module") from the tree and commit
3a889e59496c03e409b66afa3ac9d91b6ff8a937 ("[PATCH] get rid of passing
nameidata to security_inode_permission()") from the vfs tree.
I removed the file.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* linux-next: manual merge of the vfs tree
@ 2008-06-25 5:47 Stephen Rothwell
0 siblings, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2008-06-25 5:47 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, Paul E. McKenney, Ingo Molnar
[-- Attachment #1: Type: text/plain, Size: 590 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a trivial contextual
conflict in kernel/sysctl.c between commit
31a72bce0bd6f3e0114009288bccbc96376eeeca ("rcu: make rcutorture more
vicious: reinstate boot-time testing") from the sched tree and commit
5f12804f188a8f2fe6d7fdb5c1b9a4340cfa0458 ("[PATCH] avoid multiplication
overflows and signedness issues for max_fds") from the vfs tree (which is
also in Linus' tree).
I just fixed it up and will carry the fixup.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2013-10-01 11:07 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-07-18 5:36 linux-next: manual merge of the vfs tree Stephen Rothwell
2008-07-18 8:33 ` Ralf Baechle
2008-07-18 9:06 ` Stephen Rothwell
2008-07-18 12:51 ` Al Viro
-- strict thread matches above, loose matches on Subject: below --
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the vfs tree Thierry Reding
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
2013-09-30 11:26 ` linux-next: manual merge of the vfs tree Thierry Reding
2008-10-15 6:50 Stephen Rothwell
2008-08-19 5:25 Stephen Rothwell
2008-08-19 5:23 Stephen Rothwell
2008-08-12 5:20 Stephen Rothwell
2008-08-12 19:27 ` J. Bruce Fields
2008-08-12 5:14 Stephen Rothwell
2008-08-12 5:01 Stephen Rothwell
2008-07-25 4:30 Stephen Rothwell
2008-07-18 5:33 Stephen Rothwell
2008-07-18 5:27 Stephen Rothwell
2008-07-18 9:44 ` Stephen Rothwell
2008-06-25 5:47 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).