Skip to contentSkip to conversation

Btrfs for linux-next

GIT PULL Stephen Rothwell 2 participants 4 messages Oct 1, 2012 – Oct 2, 2012 1 message not in the archive Linux-next tree

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20120930115258.GA13506@shiny

#1 lore raw

Hi Chris,

Quoted 6 lines · On Sun, 30 Sep 2012 07:52:58 -0400 Chris Mason <[email protected]> wrote:

This is our large queue of changes for linux-next. They vary from bug fixes to huge optimizations. It also includes a new disk format feature from suse to remove a restriction on the number of hardlinks to a single file in a single dir.

Quoted 7 lines

I tested against linux-next on Friday, it was a clean merge and passes xfstests.

Just let me know if there are any problems, thanks! The changes are in my next branch

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next

I added your tree today, but as you have seen it broke :-(

Normally I would just go back to the previous days tree, but this is your first day, so I just dropped it. I will try again tomorrow (hopefully it will be fixed by then).

Thanks for adding your subsystem tree as a participant of linux-next. As you may know, this is not a judgment of your code. The purpose of linux-next is for integration testing and to lower the impact of conflicts between subsystems in the next merge window.

You will need to ensure that the patches/commits in your tree/series have been:
* submitted under GPL v2 (or later) and include the Contributor's Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary.

Signature · 15 lines
Cheers,
Stephen Rothwell 
[email protected]

Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees.  You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next.  These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc.  The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc.  If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
#2 lore raw
Quoted 12 lines · Stephen Rothwell

Hi Chris,

Quoted 9 lines · On Sun, 30 Sep 2012 07:52:58 -0400 Chris Mason <[email protected]> wrote:

This is our large queue of changes for linux-next. They vary from bug fixes to huge optimizations. It also includes a new disk format feature from suse to remove a restriction on the number of hardlinks to a single file in a single dir.

I tested against linux-next on Friday, it was a clean merge and passes xfstests.

Quoted 6 lines
Quoted 4 lines

Just let me know if there are any problems, thanks! The changes are in my next branch

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next

I added your tree today, but as you have seen it broke :-(

Hi Steve,

Sorry for the hassle, we've updated that patch and rebased the tree:

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next

-chris

#3 lore raw

Hi Chris,

Quoted 4 lines · On Mon, 1 Oct 2012 21:36:18 -0400 Chris Mason <[email protected]> wrote:

Sorry for the hassle, we've updated that patch and rebased the tree:

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next

Looks good today.

I am not sure if you are aware of exactly how linux-next works: I will fetch that branch of your tree every morning, so any changes will be automatically incorporated into linux-next.

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]
#4 lore raw
Quoted 6 lines · Stephen Rothwell

Hi Chris,

Quoted 3 lines · On Mon, 1 Oct 2012 21:36:18 -0400 Chris Mason <[email protected]> wrote:

Sorry for the hassle, we've updated that patch and rebased the tree:

Quoted 7 lines
Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next

Looks good today.

I am not sure if you are aware of exactly how linux-next works: I will fetch that branch of your tree every morning, so any changes will be automatically incorporated into linux-next.

Thanks! I knew you'd pull again but wanted to send an explicit ack that we had fixed up the first pull.

-chris