From: Linus Torvalds on
On Fri, Jun 11, 2010 at 12:37 PM, Chris Mason <chris.mason(a)oracle.com> wrote:
>
> The master branch of the btrfs-unstable tree is a collection of fixes
> and cleanups, including two btrfs regressions from rc1:

Ok, no pulling then. See all the millions of threads how I wanted only
critical fixes for -rc3 since I'll be offline.

You have a couple of hours for a minimal fix pull request with just
the regression fixes if you want to hit -rc3. Then I'll cut a release
and be gone for a while.

Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Chris Mason on
On Fri, Jun 11, 2010 at 12:43:10PM -0700, Linus Torvalds wrote:
> On Fri, Jun 11, 2010 at 12:37 PM, Chris Mason <chris.mason(a)oracle.com> wrote:
> >
> > The master branch of the btrfs-unstable tree is a collection of fixes
> > and cleanups, including two btrfs regressions from rc1:
>
> Ok, no pulling then. See all the millions of threads how I wanted only
> critical fixes for -rc3 since I'll be offline.
>
> You have a couple of hours for a minimal fix pull request with just
> the regression fixes if you want to hit -rc3. Then I'll cut a release
> and be gone for a while.

I did limit this to actual fixes, the only pure cleanups are a commit
from Andi that drops unused code (fixing warnings from gcc), one to fix
a sparse warning in ioctl.c, and fixing a gcc warning in tree_search.

The others all fix oopsen or big problems, and I think fixing warnings
helps avoid false negatives as others look for real problems?

I'm happy to rebase out the 3 non-criticals.

-chris

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Chris Mason on
On Fri, Jun 11, 2010 at 01:00:02PM -0700, Linus Torvalds wrote:
> On Fri, Jun 11, 2010 at 12:48 PM, Chris Mason <chris.mason(a)oracle.com> wrote:
> >
> > The others all fix oopsen or big problems, and I think fixing warnings
> > helps avoid false negatives as others look for real problems?
> >
> > I'm happy to rebase out the 3 non-criticals.
>
> There seems to be more than three non-criticals. There's the warning
> fixes, the "unused variables" thing, the "memdup_user()" thing, a
> couple of unnecessary NULL checks removed etc. On the whole, I do not
> get the feeling that the pull request was actively trying to be
> minimal, and that's what I really want to see.

No problem, I like to err on the side of pulling in safe fixes from the
automated checkers so they don't have to go through results again.

But, I've got a completely minimal rebase now and I'm double checking
it.

-chris

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Linus Torvalds on
On Fri, Jun 11, 2010 at 12:48 PM, Chris Mason <chris.mason(a)oracle.com> wrote:
>
> The others all fix oopsen or big problems, and I think fixing warnings
> helps avoid false negatives as others look for real problems?
>
> I'm happy to rebase out the 3 non-criticals.

There seems to be more than three non-criticals. There's the warning
fixes, the "unused variables" thing, the "memdup_user()" thing, a
couple of unnecessary NULL checks removed etc. On the whole, I do not
get the feeling that the pull request was actively trying to be
minimal, and that's what I really want to see.

Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Chris Mason on
On Fri, Jun 11, 2010 at 01:00:02PM -0700, Linus Torvalds wrote:
> On Fri, Jun 11, 2010 at 12:48 PM, Chris Mason <chris.mason(a)oracle.com> wrote:
> >
> > The others all fix oopsen or big problems, and I think fixing warnings
> > helps avoid false negatives as others look for real problems?
> >
> > I'm happy to rebase out the 3 non-criticals.
>
> There seems to be more than three non-criticals. There's the warning
> fixes, the "unused variables" thing, the "memdup_user()" thing, a
> couple of unnecessary NULL checks removed etc. On the whole, I do not
> get the feeling that the pull request was actively trying to be
> minimal, and that's what I really want to see.

The for-linus branch (note the change in branch name) has everything
that doesn't fix a bug removed.

git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git for-linus

I'll update the master branch to reflect any pulls you do.

Dan Carpenter (9) commits (+19/-8):
Btrfs: handle error returns from btrfs_lookup_dir_item() (+2/-0)
Btrfs: btrfs_read_fs_root_no_name() returns ERR_PTRs (+4/-0)
Btrfs: unwind after btrfs_start_transaction() errors (+1/-1)
Btrfs: The file argument for fsync() is never null (+1/-1)
Btrfs: handle ERR_PTR from posix_acl_from_xattr() (+2/-0)
Btrfs: btrfs_lookup_dir_item() can return ERR_PTR (+1/-1)
Btrfs: uninitialized data is check_path_shared() (+1/-1)
Btrfs: handle kzalloc() failure in open_ctree() (+5/-2)
Btrfs: btrfs_iget() returns ERR_PTR (+2/-2)

Zheng Yan (2) commits (+6/-4):
Btrfs: Fix BUG_ON for fs converted from extN (+2/-1)
Btrfs: Fix null dereference in relocation.c (+4/-3)

Shi Weihua (2) commits (+6/-0):
Btrfs: prohibit a operation of changing acl's mask when noacl mount option used (+3/-0)
Btrfs: should add a permission check for setfacl (+3/-0)

Miao Xie (2) commits (+9/-1):
Btrfs: fix loop device on top of btrfs (+1/-0)
Btrfs: fix remap_file_pages error (+8/-1)

Sage Weil (1) commits (+0/-3):
Btrfs: avoid BUG when dropping root and reference in same transaction

Josef Bacik (1) commits (+1/-1):
Btrfs: fix fallocate regression

Total: (17) commits (+41/-17)
fs/btrfs/acl.c | 8 ++++++++
fs/btrfs/disk-io.c | 11 +++++++++--
fs/btrfs/extent-tree.c | 3 ++-
fs/btrfs/file.c | 12 ++++++++++--
fs/btrfs/inode.c | 4 ++--
fs/btrfs/ioctl.c | 4 ++--
fs/btrfs/relocation.c | 7 ++++---
fs/btrfs/root-tree.c | 3 ---
fs/btrfs/super.c | 6 ++++--
9 files changed, 41 insertions(+), 17 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/