Skip to contentSkip to conversation

IBFT and SWIOTLB tree.

DISCUSSION Konrad Rzeszutek Wilk 2 participants 5 messages Feb 23, 2010 – Mar 1, 2010 Linux-next tree

lore
Share & tools
lore

Konrad Rzeszutek Wilk

author
#0 lore raw

I was wondering if it would be possible to include these two trees in the automatic merge/build process:

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git

and
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git

Thanks,
Konrad

#1 lore raw

Hi Konrad,

Quoted 3 lines · On Tue, 23 Feb 2010 11:00:34 -0500 Konrad Rzeszutek Wilk…

I was wondering if it would be possible to include these two trees in the automatic merge/build process:

I would need a bit a background for these trees since you are not listed as a maintainer in the MAINTAINERS file.

Quoted 4 lines

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git

and
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git

The master branch of both these trees is empty relative to Linus' tree ...

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
author
#2 lore raw
Quoted 9 lines · Stephen Rothwell

Hi Konrad,

Quoted 3 lines · On Tue, 23 Feb 2010 11:00:34 -0500 Konrad Rzeszutek Wilk…

I was wondering if it would be possible to include these two trees in the automatic merge/build process:

I would need a bit a background for these trees since you are not listed as a maintainer in the MAINTAINERS file.

Hmm, weird. IBFT is the patch set for the drivers/firmware/iscsi_ibft.c which was developed by me.

Quoted 5 lines
Quoted 5 lines

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git

and
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git

That one is the re-work of the SWIOTLB IOMMU code. Not a maintainer, but I want to make sure that the patches don't stomp/break other code.

Quoted 2 lines

The master branch of both these trees is empty relative to Linus' tree ...

Let me fix that. I had the HEAD point to the right branch, but didn't think of updating the refs/heads/master file.

#3 lore raw

Hi Konrad,

Quoted 8 lines · On Wed, 24 Feb 2010 10:00:34 -0500 Konrad Rzeszutek Wilk…
Quoted 3 lines · Stephen Rothwell

I would need a bit a background for these trees since you are not listed as a maintainer in the MAINTAINERS file.

Hmm, weird. IBFT is the patch set for the drivers/firmware/iscsi_ibft.c which was developed by me.

And I see you have added a MAINTAINERS entry and Linus has merged the two patches. I will add this tree tomorrow. Please don't add any 2.6.35 material until after 2.6.34-rc1 is released. 2.6.34 material and fixes are OK.

Quoted 4 lines
Quoted 1 line
Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git

That one is the re-work of the SWIOTLB IOMMU code. Not a maintainer, but I want to make sure that the patches don't stomp/break other code.

Is this intended for 3.6.34? I can't add that tree yet, as it has a series of patches in it that have no Signed-off-by lines. This material should also get fairly wide review and I would expect to see some Acked-by lines before the patches were ready for inclusion.

Quoted 4 lines
Quoted 1 line

The master branch of both these trees is empty relative to Linus' tree ...

Let me fix that. I had the HEAD point to the right branch, but didn't think of updating the refs/heads/master file.

Since you didn't tell me what branch to use, I assumed the master branch.

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.
author
#4 lore raw
Quoted 9 lines · Stephen Rothwell

Hi Konrad,

Quoted 6 lines · On Wed, 24 Feb 2010 10:00:34 -0500 Konrad Rzeszutek Wilk…
Quoted 3 lines · Stephen Rothwell

I would need a bit a background for these trees since you are not listed as a maintainer in the MAINTAINERS file.

Quoted 7 lines
Quoted 2 lines

Hmm, weird. IBFT is the patch set for the drivers/firmware/iscsi_ibft.c which was developed by me.

And I see you have added a MAINTAINERS entry and Linus has merged the two patches. I will add this tree tomorrow. Please don't add any 2.6.35 material until after 2.6.34-rc1 is released. 2.6.34 material and fixes are OK.

Excellent.

Quoted 10 lines
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git

That one is the re-work of the SWIOTLB IOMMU code. Not a maintainer, but I want to make sure that the patches don't stomp/break other code.

Is this intended for 3.6.34? I can't add that tree yet, as it has a series of patches in it that have no Signed-off-by lines. This material should also get fairly wide review and I would expect to see some Acked-by lines before the patches were ready for inclusion.

Ok. I am still a bit new at this so I wasn't sure about the inclusion criteria. Please defer that git tree (swiotlb-2.6) until I get it moving upstream.