From fabien@ns.faxm0dem.org Fri Mar 24 11:25:43 2006 Received: with ECARTIS (v1.0.0; list csa); Fri, 24 Mar 2006 11:25:57 -0800 (PST) Received: from indy.faxm0dem.org (faxm0dem.org [82.67.28.135]) by oss.sgi.com (8.12.10/8.12.10/SuSE Linux 0.7) with ESMTP id k2OJPhW6008125 for ; Fri, 24 Mar 2006 11:25:43 -0800 Received: from nubox.faxm0dem.org (wrt54g.faxm0dem.org [192.168.1.1]) by indy.faxm0dem.org (Postfix) with ESMTP id 4B62476 for ; Fri, 24 Mar 2006 19:22:17 +0100 (CET) Received: by nubox.faxm0dem.org (Postfix, from userid 500) id CB84DC4102; Fri, 24 Mar 2006 19:23:21 +0100 (CET) Date: Fri, 24 Mar 2006 19:23:21 +0100 From: Fabien Wernli To: csa@oss.sgi.com Subject: Readme Message-ID: <20060324182320.GO10694@nubox.faxm0dem.org> Reply-To: wernli@in2p3.fr MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Organization: CC-IN2P3 (CNRS) User-Agent: Mutt/1.5.11+cvs20060126 X-archive-position: 454 X-ecartis-version: Ecartis v1.0.0 Sender: csa-bounce@oss.sgi.com Errors-to: csa-bounce@oss.sgi.com X-original-sender: wernli@in2p3.fr Precedence: bulk X-list: csa Hi, I am trying to apply the CSA patch to my fresh 2.6.15 tree. Now if I follow the README: | 2.6.15 | /* 'pagg' has been replaced by 'pnotify' | * pnotify-2.6.14-rc2-patch-3 or later | * Use JOB patch that supports pnotify | * job-2.6.14-rc2-patch-2 or later | */ | linux-2.6.15.acct_eop.patch csa-2.2.2 | linux-2.6.15.csa_module.patch does that mean I need to apply pnotify-2.6.14-rc2-patch-3 and job-2.6.14-rc2-patch-2 ? pnotify-2.6.14-rc2-patch-3 fails: | patching file fs/exec.c | Hunk #1 FAILED at 48. | Hunk #2 succeeded at 1196 (offset -8 lines). | 1 out of 2 hunks FAILED -- saving rejects to file fs/exec.c.rej | patching file include/linux/init_task.h | Hunk #2 succeeded at 121 (offset -1 lines). | patching file include/linux/sched.h | Hunk #1 succeeded at 851 (offset 56 lines). | patching file init/Kconfig | patching file kernel/Makefile | Hunk #1 succeeded at 20 with fuzz 1. | patching file kernel/fork.c | Hunk #1 FAILED at 42. | Hunk #2 succeeded at 153 (offset 1 line). | Hunk #3 succeeded at 1032 (offset -11 lines). | Hunk #4 succeeded at 1162 (offset -11 lines). | 1 out of 4 hunks FAILED -- saving rejects to file kernel/fork.c.rej | patching file kernel/exit.c | Hunk #1 succeeded at 26 with fuzz 1 (offset -3 lines). | Hunk #2 FAILED at 864. | 1 out of 2 hunks FAILED -- saving rejects to file kernel/exit.c.rej | patching file kernel/pnotify.c | patching file include/linux/pnotify.h | patching file Documentation/pnotify.txt job-2.6.14-rc2-patch-2 fuzzes linux-2.6.15.acct_eop.patch fuzzes too linux-2.6.15.csa_module.patch fuzzes too... From jlan@engr.sgi.com Fri Mar 24 15:48:03 2006 Received: with ECARTIS (v1.0.0; list csa); Fri, 24 Mar 2006 15:48:16 -0800 (PST) Received: from omx1.americas.sgi.com (omx1-ext.sgi.com [192.48.179.11]) by oss.sgi.com (8.12.10/8.12.10/SuSE Linux 0.7) with ESMTP id k2ONm3W6008521 for ; Fri, 24 Mar 2006 15:48:03 -0800 Received: from omx2.sgi.com ([198.149.32.25]) by omx1.americas.sgi.com (8.12.10/8.12.9/linux-outbound_gateway-1.1) with ESMTP id k2ONmgOX010132 for ; Fri, 24 Mar 2006 17:48:42 -0600 Received: from mtv-vpn-hw-jlan-2.corp.sgi.com (mtv-vpn-hw-jlan-2.corp.sgi.com [134.15.18.195]) by omx2.sgi.com (8.12.11/8.12.9/linux-outbound_gateway-1.1) with ESMTP id k2P1vJlH003640 for ; Fri, 24 Mar 2006 17:57:19 -0800 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mtv-vpn-hw-jlan-2.corp.sgi.com (Postfix) with ESMTP id EBE801FD8A; Fri, 24 Mar 2006 15:47:00 -0800 (PST) Message-ID: <442484F4.40207@engr.sgi.com> Date: Fri, 24 Mar 2006 15:47:00 -0800 From: Jay Lan User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.12) Gecko/20050921 X-Accept-Language: en-us, en MIME-Version: 1.0 To: wernli@in2p3.fr CC: csa@oss.sgi.com Subject: Re: Readme References: <20060324182320.GO10694@nubox.faxm0dem.org> In-Reply-To: <20060324182320.GO10694@nubox.faxm0dem.org> X-Enigmail-Version: 0.90.1.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-archive-position: 455 X-ecartis-version: Ecartis v1.0.0 Sender: csa-bounce@oss.sgi.com Errors-to: csa-bounce@oss.sgi.com X-original-sender: jlan@engr.sgi.com Precedence: bulk X-list: csa Fabien Wernli wrote: >Hi, > >I am trying to apply the CSA patch to my fresh 2.6.15 tree. >Now if I follow the README: > >| 2.6.15 >| /* 'pagg' has been replaced by 'pnotify' >| * pnotify-2.6.14-rc2-patch-3 or later >| * Use JOB patch that supports pnotify >| * job-2.6.14-rc2-patch-2 or later >| */ >| linux-2.6.15.acct_eop.patch csa-2.2.2 >| linux-2.6.15.csa_module.patch > >does that mean I need to apply pnotify-2.6.14-rc2-patch-3 and >job-2.6.14-rc2-patch-2 ? > When i posted the CSA patches, i expected to see 2.6.15 version of pnotify and job to be posted soon. But since then, pnotify, pagg, and similar projects from others tried to merge, and thus pnotify and job were not released against 2.6.15. I will release a new CSA kernel patch once it becomes clear what underlying kernel structure the CSA will build on. Until then... I will post a 2.6.15 version of pnotify and job at the CSA page so that CSA community have something working in 2.6.15. Thanks, - jay >pnotify-2.6.14-rc2-patch-3 fails: > >| patching file fs/exec.c >| Hunk #1 FAILED at 48. >| Hunk #2 succeeded at 1196 (offset -8 lines). >| 1 out of 2 hunks FAILED -- saving rejects to file fs/exec.c.rej >| patching file include/linux/init_task.h >| Hunk #2 succeeded at 121 (offset -1 lines). >| patching file include/linux/sched.h >| Hunk #1 succeeded at 851 (offset 56 lines). >| patching file init/Kconfig >| patching file kernel/Makefile >| Hunk #1 succeeded at 20 with fuzz 1. >| patching file kernel/fork.c >| Hunk #1 FAILED at 42. >| Hunk #2 succeeded at 153 (offset 1 line). >| Hunk #3 succeeded at 1032 (offset -11 lines). >| Hunk #4 succeeded at 1162 (offset -11 lines). >| 1 out of 4 hunks FAILED -- saving rejects to file kernel/fork.c.rej >| patching file kernel/exit.c >| Hunk #1 succeeded at 26 with fuzz 1 (offset -3 lines). >| Hunk #2 FAILED at 864. >| 1 out of 2 hunks FAILED -- saving rejects to file kernel/exit.c.rej >| patching file kernel/pnotify.c >| patching file include/linux/pnotify.h >| patching file Documentation/pnotify.txt > >job-2.6.14-rc2-patch-2 fuzzes >linux-2.6.15.acct_eop.patch fuzzes too >linux-2.6.15.csa_module.patch fuzzes too... > > > From jlan@engr.sgi.com Fri Mar 24 16:59:41 2006 Received: with ECARTIS (v1.0.0; list csa); Fri, 24 Mar 2006 16:59:49 -0800 (PST) Received: from omx2.sgi.com (omx2-ext.sgi.com [192.48.171.19]) by oss.sgi.com (8.12.10/8.12.10/SuSE Linux 0.7) with ESMTP id k2P0xeW6018906 for ; Fri, 24 Mar 2006 16:59:40 -0800 Received: from mtv-vpn-hw-jlan-2.corp.sgi.com (mtv-vpn-hw-jlan-2.corp.sgi.com [134.15.18.195]) by omx2.sgi.com (8.12.11/8.12.9/linux-outbound_gateway-1.1) with ESMTP id k2P3A6TO009640 for ; Fri, 24 Mar 2006 19:10:06 -0800 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mtv-vpn-hw-jlan-2.corp.sgi.com (Postfix) with ESMTP id 8721B1FD9B; Fri, 24 Mar 2006 16:59:47 -0800 (PST) Message-ID: <44249603.40300@engr.sgi.com> Date: Fri, 24 Mar 2006 16:59:47 -0800 From: Jay Lan User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.12) Gecko/20050921 X-Accept-Language: en-us, en MIME-Version: 1.0 To: csa@oss.sgi.com Subject: A newer CSA and friends kernel patches for 2.6.15 X-Enigmail-Version: 0.90.1.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-archive-position: 456 X-ecartis-version: Ecartis v1.0.0 Sender: csa-bounce@oss.sgi.com Errors-to: csa-bounce@oss.sgi.com X-original-sender: jlan@engr.sgi.com Precedence: bulk X-list: csa Hi CSA community, I have updated README file from the download page and uploaded pnotify-2.6.15, job-2.6.15, and a refreshed version of linux-2.6.15-1.acct_eop.patch so that they can be applied cleanly to 2.6.15. Thanks to Fabien Wemli for feedback that the 2.6.14 version of pnotify and job kernel patches were not applied cleanly to 2.6.15 kernel. Please note that both pnotify-2.6.15 and job-2.6.15 reside at the CSA download page. Regards, - jay