Re: [openib-general] [PATCH v4 0/3] ofed_1_2 - Chelsio T3 RDMA Support
Er, hold on. Its 2007. I need to redo this. Don't pull yet until I reply again. Sorry. Steve. On Mon, 2007-01-15 at 13:39 -0600, Steve WIse wrote: > On Mon, 2007-01-15 at 21:00 +0200, Michael S. Tsirkin wrote: > > But, can the license in files be fixed first pls? > > > > Done. > > > > > commit 0ce8edf32779b0915b6cf4b2ddbd1c5ef004e4b4 > Author: Steve Wise <[EMAIL PROTECTED]> > Date: Mon Jan 15 13:26:23 2007 -0600 > > Add dual bsd/gpl license text to cxgb3 files > > This is needed for the OFED 1.2 distribution. > > Signed-off-by: Steve Wise <[EMAIL PROTECTED]> > > diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h > index 8902007..63048ca 100755 > --- a/drivers/net/cxgb3/adapter.h > +++ b/drivers/net/cxgb3/adapter.h > @@ -1,12 +1,33 @@ > /* > - * This file is part of the Chelsio T3 Ethernet driver for Linux. > + * Copyright (c) 2003-2006 Chelsio, Inc. All rights reserved. > * > - * Copyright (C) 2003-2006 Chelsio Communications. All rights reserved. > + * This software is available to you under a choice of one of two > + * licenses. You may choose to be licensed under the terms of the GNU > + * General Public License (GPL) Version 2, available from the file > + * COPYING in the main directory of this source tree, or the > + * OpenIB.org BSD license below: > * > - * This program is distributed in the hope that it will be useful, but > WITHOUT > - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > - * FITNESS FOR A PARTICULAR PURPOSE. See the LICENSE file included in this > - * release for licensing terms and conditions. > + * Redistribution and use in source and binary forms, with or > + * without modification, are permitted provided that the following > + * conditions are met: > + * > + * - Redistributions of source code must retain the above > + *copyright notice, this list of conditions and the following > + *disclaimer. > + * > + * - Redistributions in binary form must reproduce the above > + *copyright notice, this list of conditions and the following > + *disclaimer in the documentation and/or other materials > + *provided with the distribution. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS > + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN > + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN > + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE > + * SOFTWARE. > */ > > /* This file should not be included directly. Include common.h instead. */ > diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c > index 93a90d8..e9f3244 100755 > --- a/drivers/net/cxgb3/ael1002.c > +++ b/drivers/net/cxgb3/ael1002.c > @@ -1,14 +1,34 @@ > /* > - * This file is part of the Chelsio T3 Ethernet driver. > + * Copyright (c) 2005-2006 Chelsio, Inc. All rights reserved. > * > - * Copyright (C) 2005-2006 Chelsio Communications. All rights reserved. > + * This software is available to you under a choice of one of two > + * licenses. You may choose to be licensed under the terms of the GNU > + * General Public License (GPL) Version 2, available from the file > + * COPYING in the main directory of this source tree, or the > + * OpenIB.org BSD license below: > * > - * This program is distributed in the hope that it will be useful, but > WITHOUT > - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > - * FITNESS FOR A PARTICULAR PURPOSE. See the LICENSE file included in this > - * release for licensing terms and conditions. > + * Redistribution and use in source and binary forms, with or > + * without modification, are permitted provided that the following > + * conditions are met: > + * > + * - Redistributions of source code must retain the above > + *copyright notice, this list of conditions and the following > + *disclaimer. > + * > + * - Redistributions in binary form must reproduce the above > + *copyright notice, this list of conditions and the following > + *disclaimer in the documentation and/or other materials > + *provided with the distribution. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS > + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN > + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN > + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE > + * SOFTWARE. > */ > - > #in
Re: [openib-general] [PATCH v4 0/3] ofed_1_2 - Chelsio T3 RDMA Support
On Mon, 2007-01-15 at 21:00 +0200, Michael S. Tsirkin wrote: > But, can the license in files be fixed first pls? > Done. commit 0ce8edf32779b0915b6cf4b2ddbd1c5ef004e4b4 Author: Steve Wise <[EMAIL PROTECTED]> Date: Mon Jan 15 13:26:23 2007 -0600 Add dual bsd/gpl license text to cxgb3 files This is needed for the OFED 1.2 distribution. Signed-off-by: Steve Wise <[EMAIL PROTECTED]> diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h index 8902007..63048ca 100755 --- a/drivers/net/cxgb3/adapter.h +++ b/drivers/net/cxgb3/adapter.h @@ -1,12 +1,33 @@ /* - * This file is part of the Chelsio T3 Ethernet driver for Linux. + * Copyright (c) 2003-2006 Chelsio, Inc. All rights reserved. * - * Copyright (C) 2003-2006 Chelsio Communications. All rights reserved. + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the LICENSE file included in this - * release for licensing terms and conditions. + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + *copyright notice, this list of conditions and the following + *disclaimer. + * + * - Redistributions in binary form must reproduce the above + *copyright notice, this list of conditions and the following + *disclaimer in the documentation and/or other materials + *provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ /* This file should not be included directly. Include common.h instead. */ diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c index 93a90d8..e9f3244 100755 --- a/drivers/net/cxgb3/ael1002.c +++ b/drivers/net/cxgb3/ael1002.c @@ -1,14 +1,34 @@ /* - * This file is part of the Chelsio T3 Ethernet driver. + * Copyright (c) 2005-2006 Chelsio, Inc. All rights reserved. * - * Copyright (C) 2005-2006 Chelsio Communications. All rights reserved. + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the LICENSE file included in this - * release for licensing terms and conditions. + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + *copyright notice, this list of conditions and the following + *disclaimer. + * + * - Redistributions in binary form must reproduce the above + *copyright notice, this list of conditions and the following + *disclaimer in the documentation and/or other materials + *provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ - #include "common.h" #include "regs.h" diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h index 60a979b..4b37036 100755 --- a/drivers/net/cxgb3/common.h +++ b/drivers/net/cxgb3/common.h @@ -1,14 +1,34 @@ /* - * This file is part of the Chelsio T3 Ethernet driver. + * Copyright (c) 2005-2006 Chelsio, Inc. All rights reserved. * - * Copyright (C) 2005-20
Re: [openib-general] [PATCH v4 0/3] ofed_1_2 - Chelsio T3 RDMA Support
But, can the license in files be fixed first pls? Quoting Vladimir Sokolovsky <[EMAIL PROTECTED]>: Subject: Re: [PATCH v4 0/3] ofed_1_2 - Chelsio T3 RDMA Support Hi Steve, We need to pull 2.6.20-rc4 to ofed_1_2 first and then will pull your tree. This will be done tomorrow, I hope. Regards, Vladimir On Mon, 2007-01-15 at 07:56 -0600, Steve Wise wrote: > Michael/Vlad, > > Here is version 4. > > Changes since version 3: > > - No need to alter the genalloc.c file. > > - The patch to add genalloc.o to ib_core.ko was incorrect. It was adding > genalloc.o to ib_core.ko, but also building a genalloc.ko. > > > In addition to this patch series, the Chelsio driver code needs to be > pulled from > > git://staging.openfabrics.org/~swise/cxgb3.git for-ofed_1_2 > > I've tested this on 2.6.20-rc4. If you're happy with the changes, I > ask that you pull these patches in and pull the T3 drivers into vlad's > ofed_1_2 git tree. That will give us a base package for Chelsio's > drivers. Then I'll post additional patches for the backports to the > supported distros as I get them implemented and tested. > > How's that sound? If you would rather a patch for the chelsio drivers, > lemme know and I'll email it to you directly. > > Signed-off-by: Steve Wise <[EMAIL PROTECTED]> > > ___ > openib-general mailing list > openib-general@openib.org > http://openib.org/mailman/listinfo/openib-general > > To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general ___ openib-general mailing list openib-general@openib.org http://openib.org/mailman/listinfo/openib-general To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general -- MST ___ openib-general mailing list openib-general@openib.org http://openib.org/mailman/listinfo/openib-general To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
Re: [openib-general] [PATCH v4 0/3] ofed_1_2 - Chelsio T3 RDMA Support
Hi Steve, We need to pull 2.6.20-rc4 to ofed_1_2 first and then will pull your tree. This will be done tomorrow, I hope. Regards, Vladimir On Mon, 2007-01-15 at 07:56 -0600, Steve Wise wrote: > Michael/Vlad, > > Here is version 4. > > Changes since version 3: > > - No need to alter the genalloc.c file. > > - The patch to add genalloc.o to ib_core.ko was incorrect. It was adding > genalloc.o to ib_core.ko, but also building a genalloc.ko. > > > In addition to this patch series, the Chelsio driver code needs to be > pulled from > > git://staging.openfabrics.org/~swise/cxgb3.git for-ofed_1_2 > > I've tested this on 2.6.20-rc4. If you're happy with the changes, I > ask that you pull these patches in and pull the T3 drivers into vlad's > ofed_1_2 git tree. That will give us a base package for Chelsio's > drivers. Then I'll post additional patches for the backports to the > supported distros as I get them implemented and tested. > > How's that sound? If you would rather a patch for the chelsio drivers, > lemme know and I'll email it to you directly. > > Signed-off-by: Steve Wise <[EMAIL PROTECTED]> > > ___ > openib-general mailing list > openib-general@openib.org > http://openib.org/mailman/listinfo/openib-general > > To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general ___ openib-general mailing list openib-general@openib.org http://openib.org/mailman/listinfo/openib-general To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
