Merge lp:~milo/linaro-patchmetrics/patch-from-upstream into lp:linaro-patchmetrics
- patch-from-upstream
- Merge into trunk
Proposed by
Milo Casagrande
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 372 | ||||
| Proposed branch: | lp:~milo/linaro-patchmetrics/patch-from-upstream | ||||
| Merge into: | lp:linaro-patchmetrics | ||||
| Diff against target: |
1181 lines (+1082/-8) 10 files modified
apps/patchwork/bin/parsemail.py (+1/-1) apps/patchwork/filters.py (+8/-2) apps/patchwork/parser.py (+1/-1) apps/patchwork/tests/filters.py (+9/-0) apps/patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox (+348/-0) apps/patchwork/tests/mail/0005-git-pull-request-ssh.mbox (+348/-0) apps/patchwork/tests/mail/0006-git-pull-request-http.mbox (+348/-0) apps/patchwork/tests/patchparser.py (+15/-0) apps/patchwork/tests/utils.py (+2/-2) apps/settings.py (+2/-2) |
||||
| To merge this branch: | bzr merge lp:~milo/linaro-patchmetrics/patch-from-upstream | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Paul Sokolovsky | Approve | ||
| James Tunnicliffe | Pending | ||
| Linaro Infrastructure | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
Cherry-picked some patches from the upstream project.
Not all the upstream patches have been ported, these are the ones that do not cange DB models, and some might not even bother us (but at least we are a little bit more aligned).
To post a comment you must log in.
Revision history for this message
| Paul Sokolovsky (pfalcon) wrote : | # |
Revision history for this message
| Paul Sokolovsky (pfalcon) wrote : | # |
r372 looks good
r373 is especially good, I believe we already had those ascii codec errors?
r374,r375,r376 good
I assume testsuite run was done on these.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'apps/patchwork/bin/parsemail.py' | |||
| 2 | --- apps/patchwork/bin/parsemail.py 2012-04-04 11:08:22 +0000 | |||
| 3 | +++ apps/patchwork/bin/parsemail.py 2012-10-18 10:13:36 +0000 | |||
| 4 | @@ -168,7 +168,7 @@ | |||
| 5 | 168 | def find_pull_request(content): | 168 | def find_pull_request(content): |
| 6 | 169 | git_re = re.compile('^The following changes since commit.*' + | 169 | git_re = re.compile('^The following changes since commit.*' + |
| 7 | 170 | '^are available in the git repository at:\n' | 170 | '^are available in the git repository at:\n' |
| 9 | 171 | '^\s*(git://[^\n]+)$', | 171 | '^\s*([\S]+://[^\n]+)$', |
| 10 | 172 | re.DOTALL | re.MULTILINE) | 172 | re.DOTALL | re.MULTILINE) |
| 11 | 173 | match = git_re.search(content) | 173 | match = git_re.search(content) |
| 12 | 174 | if match: | 174 | if match: |
| 13 | 175 | 175 | ||
| 14 | === modified file 'apps/patchwork/filters.py' | |||
| 15 | --- apps/patchwork/filters.py 2011-07-05 12:31:04 +0000 | |||
| 16 | +++ apps/patchwork/filters.py 2012-10-18 10:13:36 +0000 | |||
| 17 | @@ -446,8 +446,14 @@ | |||
| 18 | 446 | if remove.param in params.keys(): | 446 | if remove.param in params.keys(): |
| 19 | 447 | del params[remove.param] | 447 | del params[remove.param] |
| 20 | 448 | 448 | ||
| 23 | 449 | return '?' + '&'.join(['%s=%s' % (quote(k), quote(v)) | 449 | pairs = params.iteritems() |
| 24 | 450 | for (k,v) in params.iteritems()]) | 450 | |
| 25 | 451 | def sanitise(s): | ||
| 26 | 452 | if not isinstance(s, basestring): | ||
| 27 | 453 | s = unicode(s) | ||
| 28 | 454 | return quote(s.encode('utf-8')) | ||
| 29 | 455 | |||
| 30 | 456 | return '?' + '&'.join(['%s=%s' % map(sanitise, p) for p in pairs]) | ||
| 31 | 451 | 457 | ||
| 32 | 452 | def querystring_without_filter(self, filter): | 458 | def querystring_without_filter(self, filter): |
| 33 | 453 | return self.querystring(filter) | 459 | return self.querystring(filter) |
| 34 | 454 | 460 | ||
| 35 | === modified file 'apps/patchwork/parser.py' | |||
| 36 | --- apps/patchwork/parser.py 2011-02-10 03:19:23 +0000 | |||
| 37 | +++ apps/patchwork/parser.py 2012-10-18 10:13:36 +0000 | |||
| 38 | @@ -68,7 +68,7 @@ | |||
| 39 | 68 | line += '\n' | 68 | line += '\n' |
| 40 | 69 | 69 | ||
| 41 | 70 | if state == 0: | 70 | if state == 0: |
| 43 | 71 | if line.startswith('diff') or line.startswith('===') \ | 71 | if line.startswith('diff ') or line.startswith('===') \ |
| 44 | 72 | or line.startswith('Index: '): | 72 | or line.startswith('Index: '): |
| 45 | 73 | state = 1 | 73 | state = 1 |
| 46 | 74 | buf += line | 74 | buf += line |
| 47 | 75 | 75 | ||
| 48 | === modified file 'apps/patchwork/tests/filters.py' | |||
| 49 | --- apps/patchwork/tests/filters.py 2011-06-14 18:53:47 +0000 | |||
| 50 | +++ apps/patchwork/tests/filters.py 2012-10-18 10:13:36 +0000 | |||
| 51 | @@ -35,3 +35,12 @@ | |||
| 52 | 35 | self.failUnlessEqual(response.status_code, 200) | 35 | self.failUnlessEqual(response.status_code, 200) |
| 53 | 36 | self.failIf('submitter=a&b=c' in response.content) | 36 | self.failIf('submitter=a&b=c' in response.content) |
| 54 | 37 | self.failIf('submitter=a&b=c' in response.content) | 37 | self.failIf('submitter=a&b=c' in response.content) |
| 55 | 38 | |||
| 56 | 39 | def testUTF8QSHandling(self): | ||
| 57 | 40 | """test that non-ascii characters can be handled by the filter | ||
| 58 | 41 | code""" | ||
| 59 | 42 | project = defaults.project | ||
| 60 | 43 | defaults.project.save() | ||
| 61 | 44 | url = '/project/%s/list/?submitter=%%E2%%98%%83' % project.linkname | ||
| 62 | 45 | response = self.client.get(url) | ||
| 63 | 46 | self.failUnlessEqual(response.status_code, 200) | ||
| 64 | 38 | 47 | ||
| 65 | === added file 'apps/patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox' | |||
| 66 | --- apps/patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox 1970-01-01 00:00:00 +0000 | |||
| 67 | +++ apps/patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox 2012-10-18 10:13:36 +0000 | |||
| 68 | @@ -0,0 +1,348 @@ | |||
| 69 | 1 | From benh@kernel.crashing.org Fri Oct 22 11:51:02 2010 | ||
| 70 | 2 | Return-Path: <linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org> | ||
| 71 | 3 | X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bilbo.ozlabs.org | ||
| 72 | 4 | X-Spam-Level: | ||
| 73 | 5 | X-Spam-Status: No, score=0.0 required=3.0 tests=none autolearn=disabled | ||
| 74 | 6 | version=3.3.1 | ||
| 75 | 7 | X-Original-To: jk@ozlabs.org | ||
| 76 | 8 | Delivered-To: jk@ozlabs.org | ||
| 77 | 9 | Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) | ||
| 78 | 10 | by ozlabs.org (Postfix) with ESMTP id ED4B3100937 | ||
| 79 | 11 | for <jk@ozlabs.org>; Fri, 22 Oct 2010 14:51:54 +1100 (EST) | ||
| 80 | 12 | Received: by ozlabs.org (Postfix) | ||
| 81 | 13 | id BF799B70CB; Fri, 22 Oct 2010 14:51:50 +1100 (EST) | ||
| 82 | 14 | Delivered-To: linuxppc-dev@ozlabs.org | ||
| 83 | 15 | Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) | ||
| 84 | 16 | (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) | ||
| 85 | 17 | (Client did not present a certificate) | ||
| 86 | 18 | by ozlabs.org (Postfix) with ESMTPS id 94629B7043 | ||
| 87 | 19 | for <linuxppc-dev@ozlabs.org>; Fri, 22 Oct 2010 14:51:49 +1100 (EST) | ||
| 88 | 20 | Received: from [IPv6:::1] (localhost.localdomain [127.0.0.1]) | ||
| 89 | 21 | by gate.crashing.org (8.14.1/8.13.8) with ESMTP id o9M3p3SP018234; | ||
| 90 | 22 | Thu, 21 Oct 2010 22:51:04 -0500 | ||
| 91 | 23 | Subject: [git pull] Please pull powerpc.git next branch | ||
| 92 | 24 | From: Benjamin Herrenschmidt <benh@kernel.crashing.org> | ||
| 93 | 25 | To: Linus Torvalds <torvalds@linux-foundation.org> | ||
| 94 | 26 | Date: Fri, 22 Oct 2010 14:51:02 +1100 | ||
| 95 | 27 | Message-ID: <1287719462.2198.37.camel@pasglop> | ||
| 96 | 28 | Mime-Version: 1.0 | ||
| 97 | 29 | X-Mailer: Evolution 2.30.3 | ||
| 98 | 30 | Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>, | ||
| 99 | 31 | Andrew Morton <akpm@linux-foundation.org>, | ||
| 100 | 32 | Linux Kernel list <linux-kernel@vger.kernel.org> | ||
| 101 | 33 | X-BeenThere: linuxppc-dev@lists.ozlabs.org | ||
| 102 | 34 | X-Mailman-Version: 2.1.13 | ||
| 103 | 35 | Precedence: list | ||
| 104 | 36 | List-Id: Linux on PowerPC Developers Mail List <cbe-oss-dev.ozlabs.org> | ||
| 105 | 37 | List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>, | ||
| 106 | 38 | <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe> | ||
| 107 | 39 | List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev> | ||
| 108 | 40 | List-Post: <mailto:linuxppc-dev@lists.ozlabs.org> | ||
| 109 | 41 | List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help> | ||
| 110 | 42 | List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>, | ||
| 111 | 43 | <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe> | ||
| 112 | 44 | Content-Type: text/plain; | ||
| 113 | 45 | charset="us-ascii" | ||
| 114 | 46 | Content-Transfer-Encoding: 7bit | ||
| 115 | 47 | Sender: linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org | ||
| 116 | 48 | Errors-To: linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org | ||
| 117 | 49 | X-UID: 11446 | ||
| 118 | 50 | X-Length: 16781 | ||
| 119 | 51 | Status: R | ||
| 120 | 52 | X-Status: N | ||
| 121 | 53 | X-KMail-EncryptionState: | ||
| 122 | 54 | X-KMail-SignatureState: | ||
| 123 | 55 | X-KMail-MDN-Sent: | ||
| 124 | 56 | |||
| 125 | 57 | Hi Linus ! | ||
| 126 | 58 | |||
| 127 | 59 | Here's powerpc's batch for this merge window. Mostly bits and pieces, | ||
| 128 | 60 | such as Anton doing some performance tuning left and right, and the | ||
| 129 | 61 | usual churn. One hilight is the support for the new Freescale e5500 core | ||
| 130 | 62 | (64-bit BookE). Another one is that we now wire up the whole lot of | ||
| 131 | 63 | socket calls as direct syscalls in addition to the old style indirect | ||
| 132 | 64 | method. | ||
| 133 | 65 | |||
| 134 | 66 | Cheers, | ||
| 135 | 67 | Ben. | ||
| 136 | 68 | |||
| 137 | 69 | The following changes since commit e10117d36ef758da0690c95ecffc09d5dd7da479: | ||
| 138 | 70 | Linus Torvalds (1): | ||
| 139 | 71 | Merge branch 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev | ||
| 140 | 72 | |||
| 141 | 73 | are available in the git repository at: | ||
| 142 | 74 | |||
| 143 | 75 | git+ssh://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git next | ||
| 144 | 76 | |||
| 145 | 77 | Andreas Schwab (1): | ||
| 146 | 78 | powerpc: Remove fpscr use from [kvm_]cvt_{fd,df} | ||
| 147 | 79 | |||
| 148 | 80 | Anton Blanchard (5): | ||
| 149 | 81 | powerpc: Optimise 64bit csum_partial | ||
| 150 | 82 | powerpc: Optimise 64bit csum_partial_copy_generic and add csum_and_copy_from_user | ||
| 151 | 83 | powerpc: Add 64bit csum_and_copy_to_user | ||
| 152 | 84 | powerpc: Feature nop out reservation clear when stcx checks address | ||
| 153 | 85 | powerpc: Check end of stack canary at oops time | ||
| 154 | 86 | |||
| 155 | 87 | Arnd Bergmann (1): | ||
| 156 | 88 | powerpc/spufs: Use llseek in all file operations | ||
| 157 | 89 | |||
| 158 | 90 | Benjamin Herrenschmidt (4): | ||
| 159 | 91 | powerpc/dma: Add optional platform override of dma_set_mask() | ||
| 160 | 92 | powerpc/dart_iommu: Support for 64-bit iommu bypass window on PCIe | ||
| 161 | 93 | Merge remote branch 'kumar/merge' into next | ||
| 162 | 94 | Merge remote branch 'jwb/next' into next | ||
| 163 | 95 | |||
| 164 | 96 | Denis Kirjanov (1): | ||
| 165 | 97 | powerpc: Use is_32bit_task() helper to test 32-bit binary | ||
| 166 | 98 | |||
| 167 | 99 | Harninder Rai (1): | ||
| 168 | 100 | powerpc/85xx: add cache-sram support | ||
| 169 | 101 | |||
| 170 | 102 | Ian Munsie (1): | ||
| 171 | 103 | powerpc: Wire up direct socket system calls | ||
| 172 | 104 | |||
| 173 | 105 | Ilya Yanok (1): | ||
| 174 | 106 | powerpc/mpc83xx: Support for MPC8308 P1M board | ||
| 175 | 107 | |||
| 176 | 108 | Joe Perches (2): | ||
| 177 | 109 | powerpc: Use static const char arrays | ||
| 178 | 110 | powerpc: Remove pr_<level> uses of KERN_<level> | ||
| 179 | 111 | |||
| 180 | 112 | Josh Boyer (1): | ||
| 181 | 113 | powerpc/44x: Update ppc44x_defconfig | ||
| 182 | 114 | |||
| 183 | 115 | Julia Lawall (7): | ||
| 184 | 116 | powerpc/via-pmu-led.c: Add of_node_put to avoid memory leak | ||
| 185 | 117 | powerpc/maple: Add of_node_put to avoid memory leak | ||
| 186 | 118 | powerpc/powermac/pfunc_core.c: Add of_node_put to avoid memory leak | ||
| 187 | 119 | powerpc/cell: Add of_node_put to avoid memory leak | ||
| 188 | 120 | powerpc/chrp/nvram.c: Add of_node_put to avoid memory leak | ||
| 189 | 121 | powerpc/irq.c: Add of_node_put to avoid memory leak | ||
| 190 | 122 | i2c/i2c-pasemi.c: Fix unsigned return type | ||
| 191 | 123 | |||
| 192 | 124 | Kumar Gala (11): | ||
| 193 | 125 | powerpc/ppc64e: Fix link problem when building ppc64e_defconfig | ||
| 194 | 126 | powerpc/fsl-pci: Fix MSI support on 83xx platforms | ||
| 195 | 127 | powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers | ||
| 196 | 128 | powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips | ||
| 197 | 129 | powerpc/fsl-booke: Add p3041 DS board support | ||
| 198 | 130 | powerpc: Fix compile error with paca code on ppc64e | ||
| 199 | 131 | powerpc/fsl-booke: Add support for FSL 64-bit e5500 core | ||
| 200 | 132 | powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes | ||
| 201 | 133 | powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips | ||
| 202 | 134 | powerpc/fsl-booke: Add p5020 DS board support | ||
| 203 | 135 | powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig | ||
| 204 | 136 | |||
| 205 | 137 | Matthew McClintock (7): | ||
| 206 | 138 | powerpc/mm: Assume first cpu is boot_cpuid not 0 | ||
| 207 | 139 | powerpc/kexec: make masking/disabling interrupts generic | ||
| 208 | 140 | powerpc/85xx: Remove call to mpic_teardown_this_cpu in kexec | ||
| 209 | 141 | powerpc/85xx: Minor fixups for kexec on 85xx | ||
| 210 | 142 | powerpc/85xx: flush dcache before resetting cores | ||
| 211 | 143 | powerpc/fsl_soc: Search all global-utilities nodes for rstccr | ||
| 212 | 144 | powerpc/fsl_booke: Add support to boot from core other than 0 | ||
| 213 | 145 | |||
| 214 | 146 | Michael Neuling (1): | ||
| 215 | 147 | powerpc: Move arch_sd_sibling_asym_packing() to smp.c | ||
| 216 | 148 | |||
| 217 | 149 | Nathan Fontenot (3): | ||
| 218 | 150 | powerpc/pseries: Export device tree updating routines | ||
| 219 | 151 | powerpc/pseries: Export rtas_ibm_suspend_me() | ||
| 220 | 152 | powerpc/pseries: Partition migration in the kernel | ||
| 221 | 153 | |||
| 222 | 154 | Nishanth Aravamudan (8): | ||
| 223 | 155 | powerpc/pci: Fix return type of BUID_{HI,LO} macros | ||
| 224 | 156 | powerpc/dma: Fix dma_iommu_dma_supported compare | ||
| 225 | 157 | powerpc/dma: Fix check for direct DMA support | ||
| 226 | 158 | powerpc/vio: Use put_device() on device_register failure | ||
| 227 | 159 | powerpc/viobus: Free TCE table on device release | ||
| 228 | 160 | powerpc/pseries: Use kmemdup | ||
| 229 | 161 | powerpc/pci: Cleanup device dma setup code | ||
| 230 | 162 | powerpc/pseries/xics: Use cpu_possible_mask rather than cpu_all_mask | ||
| 231 | 163 | |||
| 232 | 164 | Paul Gortmaker (1): | ||
| 233 | 165 | powerpc: Fix invalid page flags in create TLB CAM path for PTE_64BIT | ||
| 234 | 166 | |||
| 235 | 167 | Paul Mackerras (5): | ||
| 236 | 168 | powerpc: Abstract indexing of lppaca structs | ||
| 237 | 169 | powerpc: Dynamically allocate most lppaca structs | ||
| 238 | 170 | powerpc: Account time using timebase rather than PURR | ||
| 239 | 171 | powerpc/pseries: Re-enable dispatch trace log userspace interface | ||
| 240 | 172 | powerpc/perf: Fix sampling enable for PPC970 | ||
| 241 | 173 | |||
| 242 | 174 | Scott Wood (1): | ||
| 243 | 175 | oprofile/fsl emb: Don't set MSR[PMM] until after clearing the interrupt. | ||
| 244 | 176 | |||
| 245 | 177 | Sean MacLennan (2): | ||
| 246 | 178 | powerpc: Fix incorrect .stabs entry for copy_32.S | ||
| 247 | 179 | powerpc: mtmsrd not defined | ||
| 248 | 180 | |||
| 249 | 181 | Shaohui Xie (1): | ||
| 250 | 182 | fsl_rio: Add comments for sRIO registers. | ||
| 251 | 183 | |||
| 252 | 184 | Stephen Rothwell (1): | ||
| 253 | 185 | powerpc: define a compat_sys_recv cond_syscall | ||
| 254 | 186 | |||
| 255 | 187 | Timur Tabi (5): | ||
| 256 | 188 | powerpc: export ppc_proc_freq and ppc_tb_freq as GPL symbols | ||
| 257 | 189 | powerpc/watchdog: Allow the Book-E driver to be compiled as a module | ||
| 258 | 190 | powerpc/p1022: Add probing for individual DMA channels | ||
| 259 | 191 | powerpc/85xx: add ngPIXIS FPGA device tree node to the P1022DS board | ||
| 260 | 192 | powerpc/watchdog: Make default timeout for Book-E watchdog a Kconfig option | ||
| 261 | 193 | |||
| 262 | 194 | Tirumala Marri (1): | ||
| 263 | 195 | powerpc/44x: Add support for the AMCC APM821xx SoC | ||
| 264 | 196 | |||
| 265 | 197 | matt mooney (1): | ||
| 266 | 198 | powerpc/Makefiles: Change to new flag variables | ||
| 267 | 199 | |||
| 268 | 200 | arch/powerpc/boot/addnote.c | 4 +- | ||
| 269 | 201 | arch/powerpc/boot/dts/bluestone.dts | 254 +++++++++++++ | ||
| 270 | 202 | arch/powerpc/boot/dts/mpc8308_p1m.dts | 332 ++++++++++++++++ | ||
| 271 | 203 | arch/powerpc/boot/dts/p1022ds.dts | 11 + | ||
| 272 | 204 | arch/powerpc/configs/44x/bluestone_defconfig | 68 ++++ | ||
| 273 | 205 | arch/powerpc/configs/e55xx_smp_defconfig | 84 ++++ | ||
| 274 | 206 | arch/powerpc/configs/ppc44x_defconfig | 9 +- | ||
| 275 | 207 | arch/powerpc/configs/ppc64e_defconfig | 4 +- | ||
| 276 | 208 | arch/powerpc/include/asm/checksum.h | 10 + | ||
| 277 | 209 | arch/powerpc/include/asm/compat.h | 4 +- | ||
| 278 | 210 | arch/powerpc/include/asm/cputable.h | 14 +- | ||
| 279 | 211 | arch/powerpc/include/asm/dma-mapping.h | 14 +- | ||
| 280 | 212 | arch/powerpc/include/asm/elf.h | 2 +- | ||
| 281 | 213 | arch/powerpc/include/asm/exception-64s.h | 3 +- | ||
| 282 | 214 | arch/powerpc/include/asm/fsl_85xx_cache_sram.h | 48 +++ | ||
| 283 | 215 | arch/powerpc/include/asm/kexec.h | 1 + | ||
| 284 | 216 | arch/powerpc/include/asm/kvm_fpu.h | 4 +- | ||
| 285 | 217 | arch/powerpc/include/asm/lppaca.h | 29 ++ | ||
| 286 | 218 | arch/powerpc/include/asm/machdep.h | 3 + | ||
| 287 | 219 | arch/powerpc/include/asm/mmu-book3e.h | 15 + | ||
| 288 | 220 | arch/powerpc/include/asm/paca.h | 10 +- | ||
| 289 | 221 | arch/powerpc/include/asm/page_64.h | 4 +- | ||
| 290 | 222 | arch/powerpc/include/asm/ppc-pci.h | 4 +- | ||
| 291 | 223 | arch/powerpc/include/asm/ppc_asm.h | 50 ++- | ||
| 292 | 224 | arch/powerpc/include/asm/processor.h | 4 +- | ||
| 293 | 225 | arch/powerpc/include/asm/pte-common.h | 7 + | ||
| 294 | 226 | arch/powerpc/include/asm/rtas.h | 1 + | ||
| 295 | 227 | arch/powerpc/include/asm/systbl.h | 19 + | ||
| 296 | 228 | arch/powerpc/include/asm/system.h | 4 +- | ||
| 297 | 229 | arch/powerpc/include/asm/time.h | 5 - | ||
| 298 | 230 | arch/powerpc/include/asm/unistd.h | 21 +- | ||
| 299 | 231 | arch/powerpc/kernel/Makefile | 4 +- | ||
| 300 | 232 | arch/powerpc/kernel/align.c | 4 +- | ||
| 301 | 233 | arch/powerpc/kernel/asm-offsets.c | 12 +- | ||
| 302 | 234 | arch/powerpc/kernel/cpu_setup_44x.S | 1 + | ||
| 303 | 235 | arch/powerpc/kernel/cpu_setup_fsl_booke.S | 15 + | ||
| 304 | 236 | arch/powerpc/kernel/cputable.c | 43 ++- | ||
| 305 | 237 | arch/powerpc/kernel/crash.c | 13 +- | ||
| 306 | 238 | arch/powerpc/kernel/dma-iommu.c | 21 +- | ||
| 307 | 239 | arch/powerpc/kernel/dma.c | 20 +- | ||
| 308 | 240 | arch/powerpc/kernel/entry_64.S | 40 ++ | ||
| 309 | 241 | arch/powerpc/kernel/fpu.S | 10 - | ||
| 310 | 242 | arch/powerpc/kernel/head_fsl_booke.S | 10 +- | ||
| 311 | 243 | arch/powerpc/kernel/irq.c | 6 +- | ||
| 312 | 244 | arch/powerpc/kernel/lparcfg.c | 14 +- | ||
| 313 | 245 | arch/powerpc/kernel/machine_kexec.c | 24 ++ | ||
| 314 | 246 | arch/powerpc/kernel/machine_kexec_32.c | 4 + | ||
| 315 | 247 | arch/powerpc/kernel/paca.c | 70 ++++- | ||
| 316 | 248 | arch/powerpc/kernel/pci-common.c | 4 +- | ||
| 317 | 249 | arch/powerpc/kernel/ppc970-pmu.c | 2 + | ||
| 318 | 250 | arch/powerpc/kernel/process.c | 12 - | ||
| 319 | 251 | arch/powerpc/kernel/ptrace.c | 2 +- | ||
| 320 | 252 | arch/powerpc/kernel/rtas.c | 4 +- | ||
| 321 | 253 | arch/powerpc/kernel/setup_32.c | 2 +- | ||
| 322 | 254 | arch/powerpc/kernel/smp.c | 14 +- | ||
| 323 | 255 | arch/powerpc/kernel/time.c | 275 +++++++------- | ||
| 324 | 256 | arch/powerpc/kernel/traps.c | 5 + | ||
| 325 | 257 | arch/powerpc/kernel/vdso.c | 6 +- | ||
| 326 | 258 | arch/powerpc/kernel/vdso32/Makefile | 6 +- | ||
| 327 | 259 | arch/powerpc/kernel/vdso64/Makefile | 6 +- | ||
| 328 | 260 | arch/powerpc/kernel/vio.c | 10 +- | ||
| 329 | 261 | arch/powerpc/kvm/Makefile | 2 +- | ||
| 330 | 262 | arch/powerpc/kvm/book3s_paired_singles.c | 44 +-- | ||
| 331 | 263 | arch/powerpc/kvm/emulate.c | 4 +- | ||
| 332 | 264 | arch/powerpc/kvm/fpu.S | 8 - | ||
| 333 | 265 | arch/powerpc/lib/Makefile | 7 +- | ||
| 334 | 266 | arch/powerpc/lib/checksum_64.S | 482 +++++++++++++++++------- | ||
| 335 | 267 | arch/powerpc/lib/checksum_wrappers_64.c | 102 +++++ | ||
| 336 | 268 | arch/powerpc/lib/copy_32.S | 2 +- | ||
| 337 | 269 | arch/powerpc/lib/ldstfp.S | 36 +- | ||
| 338 | 270 | arch/powerpc/lib/locks.c | 4 +- | ||
| 339 | 271 | arch/powerpc/lib/sstep.c | 8 + | ||
| 340 | 272 | arch/powerpc/math-emu/Makefile | 2 +- | ||
| 341 | 273 | arch/powerpc/mm/Makefile | 6 +- | ||
| 342 | 274 | arch/powerpc/mm/fault.c | 6 + | ||
| 343 | 275 | arch/powerpc/mm/fsl_booke_mmu.c | 15 +- | ||
| 344 | 276 | arch/powerpc/mm/mmu_context_nohash.c | 6 +- | ||
| 345 | 277 | arch/powerpc/mm/mmu_decl.h | 5 +- | ||
| 346 | 278 | arch/powerpc/mm/tlb_nohash.c | 56 +++- | ||
| 347 | 279 | arch/powerpc/mm/tlb_nohash_low.S | 2 +- | ||
| 348 | 280 | arch/powerpc/oprofile/Makefile | 4 +- | ||
| 349 | 281 | arch/powerpc/oprofile/backtrace.c | 2 +- | ||
| 350 | 282 | arch/powerpc/oprofile/op_model_fsl_emb.c | 15 +- | ||
| 351 | 283 | arch/powerpc/platforms/44x/Kconfig | 16 + | ||
| 352 | 284 | arch/powerpc/platforms/44x/ppc44x_simple.c | 1 + | ||
| 353 | 285 | arch/powerpc/platforms/83xx/Kconfig | 4 +- | ||
| 354 | 286 | arch/powerpc/platforms/83xx/mpc830x_rdb.c | 3 +- | ||
| 355 | 287 | arch/powerpc/platforms/85xx/Kconfig | 28 ++- | ||
| 356 | 288 | arch/powerpc/platforms/85xx/Makefile | 2 + | ||
| 357 | 289 | arch/powerpc/platforms/85xx/p1022_ds.c | 2 + | ||
| 358 | 290 | arch/powerpc/platforms/85xx/p3041_ds.c | 64 ++++ | ||
| 359 | 291 | arch/powerpc/platforms/85xx/p5020_ds.c | 69 ++++ | ||
| 360 | 292 | arch/powerpc/platforms/85xx/smp.c | 83 ++++- | ||
| 361 | 293 | arch/powerpc/platforms/Kconfig.cputype | 8 +- | ||
| 362 | 294 | arch/powerpc/platforms/cell/ras.c | 4 +- | ||
| 363 | 295 | arch/powerpc/platforms/cell/spider-pic.c | 4 +- | ||
| 364 | 296 | arch/powerpc/platforms/cell/spufs/file.c | 18 + | ||
| 365 | 297 | arch/powerpc/platforms/chrp/nvram.c | 4 +- | ||
| 366 | 298 | arch/powerpc/platforms/iseries/Makefile | 2 +- | ||
| 367 | 299 | arch/powerpc/platforms/iseries/dt.c | 4 +- | ||
| 368 | 300 | arch/powerpc/platforms/iseries/smp.c | 2 +- | ||
| 369 | 301 | arch/powerpc/platforms/maple/setup.c | 1 + | ||
| 370 | 302 | arch/powerpc/platforms/powermac/pfunc_core.c | 9 +- | ||
| 371 | 303 | arch/powerpc/platforms/pseries/Makefile | 13 +- | ||
| 372 | 304 | arch/powerpc/platforms/pseries/dlpar.c | 7 +- | ||
| 373 | 305 | arch/powerpc/platforms/pseries/dtl.c | 224 +++++++++--- | ||
| 374 | 306 | arch/powerpc/platforms/pseries/lpar.c | 25 ++- | ||
| 375 | 307 | arch/powerpc/platforms/pseries/mobility.c | 362 ++++++++++++++++++ | ||
| 376 | 308 | arch/powerpc/platforms/pseries/pseries.h | 9 + | ||
| 377 | 309 | arch/powerpc/platforms/pseries/setup.c | 52 +++ | ||
| 378 | 310 | arch/powerpc/platforms/pseries/xics.c | 2 +- | ||
| 379 | 311 | arch/powerpc/sysdev/Makefile | 5 +- | ||
| 380 | 312 | arch/powerpc/sysdev/dart_iommu.c | 74 ++++- | ||
| 381 | 313 | arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | 101 +++++ | ||
| 382 | 314 | arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 159 ++++++++ | ||
| 383 | 315 | arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 231 +++++++++++ | ||
| 384 | 316 | arch/powerpc/sysdev/fsl_msi.c | 9 +- | ||
| 385 | 317 | arch/powerpc/sysdev/fsl_pci.c | 60 +++- | ||
| 386 | 318 | arch/powerpc/sysdev/fsl_pci.h | 1 + | ||
| 387 | 319 | arch/powerpc/sysdev/fsl_rio.c | 65 ++-- | ||
| 388 | 320 | arch/powerpc/sysdev/fsl_soc.c | 20 +- | ||
| 389 | 321 | arch/powerpc/sysdev/mpc8xxx_gpio.c | 3 + | ||
| 390 | 322 | arch/powerpc/sysdev/pmi.c | 2 +- | ||
| 391 | 323 | arch/powerpc/xmon/Makefile | 4 +- | ||
| 392 | 324 | drivers/i2c/busses/i2c-pasemi.c | 2 +- | ||
| 393 | 325 | drivers/macintosh/via-pmu-led.c | 4 +- | ||
| 394 | 326 | drivers/watchdog/Kconfig | 22 +- | ||
| 395 | 327 | drivers/watchdog/booke_wdt.c | 47 ++- | ||
| 396 | 328 | include/linux/pci_ids.h | 8 + | ||
| 397 | 329 | kernel/sys_ni.c | 1 + | ||
| 398 | 330 | 130 files changed, 3676 insertions(+), 683 deletions(-) | ||
| 399 | 331 | create mode 100644 arch/powerpc/boot/dts/bluestone.dts | ||
| 400 | 332 | create mode 100644 arch/powerpc/boot/dts/mpc8308_p1m.dts | ||
| 401 | 333 | create mode 100644 arch/powerpc/configs/44x/bluestone_defconfig | ||
| 402 | 334 | create mode 100644 arch/powerpc/configs/e55xx_smp_defconfig | ||
| 403 | 335 | create mode 100644 arch/powerpc/include/asm/fsl_85xx_cache_sram.h | ||
| 404 | 336 | create mode 100644 arch/powerpc/lib/checksum_wrappers_64.c | ||
| 405 | 337 | create mode 100644 arch/powerpc/platforms/85xx/p3041_ds.c | ||
| 406 | 338 | create mode 100644 arch/powerpc/platforms/85xx/p5020_ds.c | ||
| 407 | 339 | create mode 100644 arch/powerpc/platforms/pseries/mobility.c | ||
| 408 | 340 | create mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | ||
| 409 | 341 | create mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_sram.c | ||
| 410 | 342 | create mode 100644 arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | ||
| 411 | 343 | |||
| 412 | 344 | |||
| 413 | 345 | _______________________________________________ | ||
| 414 | 346 | Linuxppc-dev mailing list | ||
| 415 | 347 | Linuxppc-dev@lists.ozlabs.org | ||
| 416 | 348 | https://lists.ozlabs.org/listinfo/linuxppc-dev | ||
| 417 | 0 | 349 | ||
| 418 | === added file 'apps/patchwork/tests/mail/0005-git-pull-request-ssh.mbox' | |||
| 419 | --- apps/patchwork/tests/mail/0005-git-pull-request-ssh.mbox 1970-01-01 00:00:00 +0000 | |||
| 420 | +++ apps/patchwork/tests/mail/0005-git-pull-request-ssh.mbox 2012-10-18 10:13:36 +0000 | |||
| 421 | @@ -0,0 +1,348 @@ | |||
| 422 | 1 | From benh@kernel.crashing.org Fri Oct 22 11:51:02 2010 | ||
| 423 | 2 | Return-Path: <linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org> | ||
| 424 | 3 | X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bilbo.ozlabs.org | ||
| 425 | 4 | X-Spam-Level: | ||
| 426 | 5 | X-Spam-Status: No, score=0.0 required=3.0 tests=none autolearn=disabled | ||
| 427 | 6 | version=3.3.1 | ||
| 428 | 7 | X-Original-To: jk@ozlabs.org | ||
| 429 | 8 | Delivered-To: jk@ozlabs.org | ||
| 430 | 9 | Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) | ||
| 431 | 10 | by ozlabs.org (Postfix) with ESMTP id ED4B3100937 | ||
| 432 | 11 | for <jk@ozlabs.org>; Fri, 22 Oct 2010 14:51:54 +1100 (EST) | ||
| 433 | 12 | Received: by ozlabs.org (Postfix) | ||
| 434 | 13 | id BF799B70CB; Fri, 22 Oct 2010 14:51:50 +1100 (EST) | ||
| 435 | 14 | Delivered-To: linuxppc-dev@ozlabs.org | ||
| 436 | 15 | Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) | ||
| 437 | 16 | (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) | ||
| 438 | 17 | (Client did not present a certificate) | ||
| 439 | 18 | by ozlabs.org (Postfix) with ESMTPS id 94629B7043 | ||
| 440 | 19 | for <linuxppc-dev@ozlabs.org>; Fri, 22 Oct 2010 14:51:49 +1100 (EST) | ||
| 441 | 20 | Received: from [IPv6:::1] (localhost.localdomain [127.0.0.1]) | ||
| 442 | 21 | by gate.crashing.org (8.14.1/8.13.8) with ESMTP id o9M3p3SP018234; | ||
| 443 | 22 | Thu, 21 Oct 2010 22:51:04 -0500 | ||
| 444 | 23 | Subject: [git pull] Please pull powerpc.git next branch | ||
| 445 | 24 | From: Benjamin Herrenschmidt <benh@kernel.crashing.org> | ||
| 446 | 25 | To: Linus Torvalds <torvalds@linux-foundation.org> | ||
| 447 | 26 | Date: Fri, 22 Oct 2010 14:51:02 +1100 | ||
| 448 | 27 | Message-ID: <1287719462.2198.37.camel@pasglop> | ||
| 449 | 28 | Mime-Version: 1.0 | ||
| 450 | 29 | X-Mailer: Evolution 2.30.3 | ||
| 451 | 30 | Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>, | ||
| 452 | 31 | Andrew Morton <akpm@linux-foundation.org>, | ||
| 453 | 32 | Linux Kernel list <linux-kernel@vger.kernel.org> | ||
| 454 | 33 | X-BeenThere: linuxppc-dev@lists.ozlabs.org | ||
| 455 | 34 | X-Mailman-Version: 2.1.13 | ||
| 456 | 35 | Precedence: list | ||
| 457 | 36 | List-Id: Linux on PowerPC Developers Mail List <cbe-oss-dev.ozlabs.org> | ||
| 458 | 37 | List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>, | ||
| 459 | 38 | <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe> | ||
| 460 | 39 | List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev> | ||
| 461 | 40 | List-Post: <mailto:linuxppc-dev@lists.ozlabs.org> | ||
| 462 | 41 | List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help> | ||
| 463 | 42 | List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>, | ||
| 464 | 43 | <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe> | ||
| 465 | 44 | Content-Type: text/plain; | ||
| 466 | 45 | charset="us-ascii" | ||
| 467 | 46 | Content-Transfer-Encoding: 7bit | ||
| 468 | 47 | Sender: linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org | ||
| 469 | 48 | Errors-To: linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org | ||
| 470 | 49 | X-UID: 11446 | ||
| 471 | 50 | X-Length: 16781 | ||
| 472 | 51 | Status: R | ||
| 473 | 52 | X-Status: N | ||
| 474 | 53 | X-KMail-EncryptionState: | ||
| 475 | 54 | X-KMail-SignatureState: | ||
| 476 | 55 | X-KMail-MDN-Sent: | ||
| 477 | 56 | |||
| 478 | 57 | Hi Linus ! | ||
| 479 | 58 | |||
| 480 | 59 | Here's powerpc's batch for this merge window. Mostly bits and pieces, | ||
| 481 | 60 | such as Anton doing some performance tuning left and right, and the | ||
| 482 | 61 | usual churn. One hilight is the support for the new Freescale e5500 core | ||
| 483 | 62 | (64-bit BookE). Another one is that we now wire up the whole lot of | ||
| 484 | 63 | socket calls as direct syscalls in addition to the old style indirect | ||
| 485 | 64 | method. | ||
| 486 | 65 | |||
| 487 | 66 | Cheers, | ||
| 488 | 67 | Ben. | ||
| 489 | 68 | |||
| 490 | 69 | The following changes since commit e10117d36ef758da0690c95ecffc09d5dd7da479: | ||
| 491 | 70 | Linus Torvalds (1): | ||
| 492 | 71 | Merge branch 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev | ||
| 493 | 72 | |||
| 494 | 73 | are available in the git repository at: | ||
| 495 | 74 | |||
| 496 | 75 | ssh://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git next | ||
| 497 | 76 | |||
| 498 | 77 | Andreas Schwab (1): | ||
| 499 | 78 | powerpc: Remove fpscr use from [kvm_]cvt_{fd,df} | ||
| 500 | 79 | |||
| 501 | 80 | Anton Blanchard (5): | ||
| 502 | 81 | powerpc: Optimise 64bit csum_partial | ||
| 503 | 82 | powerpc: Optimise 64bit csum_partial_copy_generic and add csum_and_copy_from_user | ||
| 504 | 83 | powerpc: Add 64bit csum_and_copy_to_user | ||
| 505 | 84 | powerpc: Feature nop out reservation clear when stcx checks address | ||
| 506 | 85 | powerpc: Check end of stack canary at oops time | ||
| 507 | 86 | |||
| 508 | 87 | Arnd Bergmann (1): | ||
| 509 | 88 | powerpc/spufs: Use llseek in all file operations | ||
| 510 | 89 | |||
| 511 | 90 | Benjamin Herrenschmidt (4): | ||
| 512 | 91 | powerpc/dma: Add optional platform override of dma_set_mask() | ||
| 513 | 92 | powerpc/dart_iommu: Support for 64-bit iommu bypass window on PCIe | ||
| 514 | 93 | Merge remote branch 'kumar/merge' into next | ||
| 515 | 94 | Merge remote branch 'jwb/next' into next | ||
| 516 | 95 | |||
| 517 | 96 | Denis Kirjanov (1): | ||
| 518 | 97 | powerpc: Use is_32bit_task() helper to test 32-bit binary | ||
| 519 | 98 | |||
| 520 | 99 | Harninder Rai (1): | ||
| 521 | 100 | powerpc/85xx: add cache-sram support | ||
| 522 | 101 | |||
| 523 | 102 | Ian Munsie (1): | ||
| 524 | 103 | powerpc: Wire up direct socket system calls | ||
| 525 | 104 | |||
| 526 | 105 | Ilya Yanok (1): | ||
| 527 | 106 | powerpc/mpc83xx: Support for MPC8308 P1M board | ||
| 528 | 107 | |||
| 529 | 108 | Joe Perches (2): | ||
| 530 | 109 | powerpc: Use static const char arrays | ||
| 531 | 110 | powerpc: Remove pr_<level> uses of KERN_<level> | ||
| 532 | 111 | |||
| 533 | 112 | Josh Boyer (1): | ||
| 534 | 113 | powerpc/44x: Update ppc44x_defconfig | ||
| 535 | 114 | |||
| 536 | 115 | Julia Lawall (7): | ||
| 537 | 116 | powerpc/via-pmu-led.c: Add of_node_put to avoid memory leak | ||
| 538 | 117 | powerpc/maple: Add of_node_put to avoid memory leak | ||
| 539 | 118 | powerpc/powermac/pfunc_core.c: Add of_node_put to avoid memory leak | ||
| 540 | 119 | powerpc/cell: Add of_node_put to avoid memory leak | ||
| 541 | 120 | powerpc/chrp/nvram.c: Add of_node_put to avoid memory leak | ||
| 542 | 121 | powerpc/irq.c: Add of_node_put to avoid memory leak | ||
| 543 | 122 | i2c/i2c-pasemi.c: Fix unsigned return type | ||
| 544 | 123 | |||
| 545 | 124 | Kumar Gala (11): | ||
| 546 | 125 | powerpc/ppc64e: Fix link problem when building ppc64e_defconfig | ||
| 547 | 126 | powerpc/fsl-pci: Fix MSI support on 83xx platforms | ||
| 548 | 127 | powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers | ||
| 549 | 128 | powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips | ||
| 550 | 129 | powerpc/fsl-booke: Add p3041 DS board support | ||
| 551 | 130 | powerpc: Fix compile error with paca code on ppc64e | ||
| 552 | 131 | powerpc/fsl-booke: Add support for FSL 64-bit e5500 core | ||
| 553 | 132 | powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes | ||
| 554 | 133 | powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips | ||
| 555 | 134 | powerpc/fsl-booke: Add p5020 DS board support | ||
| 556 | 135 | powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig | ||
| 557 | 136 | |||
| 558 | 137 | Matthew McClintock (7): | ||
| 559 | 138 | powerpc/mm: Assume first cpu is boot_cpuid not 0 | ||
| 560 | 139 | powerpc/kexec: make masking/disabling interrupts generic | ||
| 561 | 140 | powerpc/85xx: Remove call to mpic_teardown_this_cpu in kexec | ||
| 562 | 141 | powerpc/85xx: Minor fixups for kexec on 85xx | ||
| 563 | 142 | powerpc/85xx: flush dcache before resetting cores | ||
| 564 | 143 | powerpc/fsl_soc: Search all global-utilities nodes for rstccr | ||
| 565 | 144 | powerpc/fsl_booke: Add support to boot from core other than 0 | ||
| 566 | 145 | |||
| 567 | 146 | Michael Neuling (1): | ||
| 568 | 147 | powerpc: Move arch_sd_sibling_asym_packing() to smp.c | ||
| 569 | 148 | |||
| 570 | 149 | Nathan Fontenot (3): | ||
| 571 | 150 | powerpc/pseries: Export device tree updating routines | ||
| 572 | 151 | powerpc/pseries: Export rtas_ibm_suspend_me() | ||
| 573 | 152 | powerpc/pseries: Partition migration in the kernel | ||
| 574 | 153 | |||
| 575 | 154 | Nishanth Aravamudan (8): | ||
| 576 | 155 | powerpc/pci: Fix return type of BUID_{HI,LO} macros | ||
| 577 | 156 | powerpc/dma: Fix dma_iommu_dma_supported compare | ||
| 578 | 157 | powerpc/dma: Fix check for direct DMA support | ||
| 579 | 158 | powerpc/vio: Use put_device() on device_register failure | ||
| 580 | 159 | powerpc/viobus: Free TCE table on device release | ||
| 581 | 160 | powerpc/pseries: Use kmemdup | ||
| 582 | 161 | powerpc/pci: Cleanup device dma setup code | ||
| 583 | 162 | powerpc/pseries/xics: Use cpu_possible_mask rather than cpu_all_mask | ||
| 584 | 163 | |||
| 585 | 164 | Paul Gortmaker (1): | ||
| 586 | 165 | powerpc: Fix invalid page flags in create TLB CAM path for PTE_64BIT | ||
| 587 | 166 | |||
| 588 | 167 | Paul Mackerras (5): | ||
| 589 | 168 | powerpc: Abstract indexing of lppaca structs | ||
| 590 | 169 | powerpc: Dynamically allocate most lppaca structs | ||
| 591 | 170 | powerpc: Account time using timebase rather than PURR | ||
| 592 | 171 | powerpc/pseries: Re-enable dispatch trace log userspace interface | ||
| 593 | 172 | powerpc/perf: Fix sampling enable for PPC970 | ||
| 594 | 173 | |||
| 595 | 174 | Scott Wood (1): | ||
| 596 | 175 | oprofile/fsl emb: Don't set MSR[PMM] until after clearing the interrupt. | ||
| 597 | 176 | |||
| 598 | 177 | Sean MacLennan (2): | ||
| 599 | 178 | powerpc: Fix incorrect .stabs entry for copy_32.S | ||
| 600 | 179 | powerpc: mtmsrd not defined | ||
| 601 | 180 | |||
| 602 | 181 | Shaohui Xie (1): | ||
| 603 | 182 | fsl_rio: Add comments for sRIO registers. | ||
| 604 | 183 | |||
| 605 | 184 | Stephen Rothwell (1): | ||
| 606 | 185 | powerpc: define a compat_sys_recv cond_syscall | ||
| 607 | 186 | |||
| 608 | 187 | Timur Tabi (5): | ||
| 609 | 188 | powerpc: export ppc_proc_freq and ppc_tb_freq as GPL symbols | ||
| 610 | 189 | powerpc/watchdog: Allow the Book-E driver to be compiled as a module | ||
| 611 | 190 | powerpc/p1022: Add probing for individual DMA channels | ||
| 612 | 191 | powerpc/85xx: add ngPIXIS FPGA device tree node to the P1022DS board | ||
| 613 | 192 | powerpc/watchdog: Make default timeout for Book-E watchdog a Kconfig option | ||
| 614 | 193 | |||
| 615 | 194 | Tirumala Marri (1): | ||
| 616 | 195 | powerpc/44x: Add support for the AMCC APM821xx SoC | ||
| 617 | 196 | |||
| 618 | 197 | matt mooney (1): | ||
| 619 | 198 | powerpc/Makefiles: Change to new flag variables | ||
| 620 | 199 | |||
| 621 | 200 | arch/powerpc/boot/addnote.c | 4 +- | ||
| 622 | 201 | arch/powerpc/boot/dts/bluestone.dts | 254 +++++++++++++ | ||
| 623 | 202 | arch/powerpc/boot/dts/mpc8308_p1m.dts | 332 ++++++++++++++++ | ||
| 624 | 203 | arch/powerpc/boot/dts/p1022ds.dts | 11 + | ||
| 625 | 204 | arch/powerpc/configs/44x/bluestone_defconfig | 68 ++++ | ||
| 626 | 205 | arch/powerpc/configs/e55xx_smp_defconfig | 84 ++++ | ||
| 627 | 206 | arch/powerpc/configs/ppc44x_defconfig | 9 +- | ||
| 628 | 207 | arch/powerpc/configs/ppc64e_defconfig | 4 +- | ||
| 629 | 208 | arch/powerpc/include/asm/checksum.h | 10 + | ||
| 630 | 209 | arch/powerpc/include/asm/compat.h | 4 +- | ||
| 631 | 210 | arch/powerpc/include/asm/cputable.h | 14 +- | ||
| 632 | 211 | arch/powerpc/include/asm/dma-mapping.h | 14 +- | ||
| 633 | 212 | arch/powerpc/include/asm/elf.h | 2 +- | ||
| 634 | 213 | arch/powerpc/include/asm/exception-64s.h | 3 +- | ||
| 635 | 214 | arch/powerpc/include/asm/fsl_85xx_cache_sram.h | 48 +++ | ||
| 636 | 215 | arch/powerpc/include/asm/kexec.h | 1 + | ||
| 637 | 216 | arch/powerpc/include/asm/kvm_fpu.h | 4 +- | ||
| 638 | 217 | arch/powerpc/include/asm/lppaca.h | 29 ++ | ||
| 639 | 218 | arch/powerpc/include/asm/machdep.h | 3 + | ||
| 640 | 219 | arch/powerpc/include/asm/mmu-book3e.h | 15 + | ||
| 641 | 220 | arch/powerpc/include/asm/paca.h | 10 +- | ||
| 642 | 221 | arch/powerpc/include/asm/page_64.h | 4 +- | ||
| 643 | 222 | arch/powerpc/include/asm/ppc-pci.h | 4 +- | ||
| 644 | 223 | arch/powerpc/include/asm/ppc_asm.h | 50 ++- | ||
| 645 | 224 | arch/powerpc/include/asm/processor.h | 4 +- | ||
| 646 | 225 | arch/powerpc/include/asm/pte-common.h | 7 + | ||
| 647 | 226 | arch/powerpc/include/asm/rtas.h | 1 + | ||
| 648 | 227 | arch/powerpc/include/asm/systbl.h | 19 + | ||
| 649 | 228 | arch/powerpc/include/asm/system.h | 4 +- | ||
| 650 | 229 | arch/powerpc/include/asm/time.h | 5 - | ||
| 651 | 230 | arch/powerpc/include/asm/unistd.h | 21 +- | ||
| 652 | 231 | arch/powerpc/kernel/Makefile | 4 +- | ||
| 653 | 232 | arch/powerpc/kernel/align.c | 4 +- | ||
| 654 | 233 | arch/powerpc/kernel/asm-offsets.c | 12 +- | ||
| 655 | 234 | arch/powerpc/kernel/cpu_setup_44x.S | 1 + | ||
| 656 | 235 | arch/powerpc/kernel/cpu_setup_fsl_booke.S | 15 + | ||
| 657 | 236 | arch/powerpc/kernel/cputable.c | 43 ++- | ||
| 658 | 237 | arch/powerpc/kernel/crash.c | 13 +- | ||
| 659 | 238 | arch/powerpc/kernel/dma-iommu.c | 21 +- | ||
| 660 | 239 | arch/powerpc/kernel/dma.c | 20 +- | ||
| 661 | 240 | arch/powerpc/kernel/entry_64.S | 40 ++ | ||
| 662 | 241 | arch/powerpc/kernel/fpu.S | 10 - | ||
| 663 | 242 | arch/powerpc/kernel/head_fsl_booke.S | 10 +- | ||
| 664 | 243 | arch/powerpc/kernel/irq.c | 6 +- | ||
| 665 | 244 | arch/powerpc/kernel/lparcfg.c | 14 +- | ||
| 666 | 245 | arch/powerpc/kernel/machine_kexec.c | 24 ++ | ||
| 667 | 246 | arch/powerpc/kernel/machine_kexec_32.c | 4 + | ||
| 668 | 247 | arch/powerpc/kernel/paca.c | 70 ++++- | ||
| 669 | 248 | arch/powerpc/kernel/pci-common.c | 4 +- | ||
| 670 | 249 | arch/powerpc/kernel/ppc970-pmu.c | 2 + | ||
| 671 | 250 | arch/powerpc/kernel/process.c | 12 - | ||
| 672 | 251 | arch/powerpc/kernel/ptrace.c | 2 +- | ||
| 673 | 252 | arch/powerpc/kernel/rtas.c | 4 +- | ||
| 674 | 253 | arch/powerpc/kernel/setup_32.c | 2 +- | ||
| 675 | 254 | arch/powerpc/kernel/smp.c | 14 +- | ||
| 676 | 255 | arch/powerpc/kernel/time.c | 275 +++++++------- | ||
| 677 | 256 | arch/powerpc/kernel/traps.c | 5 + | ||
| 678 | 257 | arch/powerpc/kernel/vdso.c | 6 +- | ||
| 679 | 258 | arch/powerpc/kernel/vdso32/Makefile | 6 +- | ||
| 680 | 259 | arch/powerpc/kernel/vdso64/Makefile | 6 +- | ||
| 681 | 260 | arch/powerpc/kernel/vio.c | 10 +- | ||
| 682 | 261 | arch/powerpc/kvm/Makefile | 2 +- | ||
| 683 | 262 | arch/powerpc/kvm/book3s_paired_singles.c | 44 +-- | ||
| 684 | 263 | arch/powerpc/kvm/emulate.c | 4 +- | ||
| 685 | 264 | arch/powerpc/kvm/fpu.S | 8 - | ||
| 686 | 265 | arch/powerpc/lib/Makefile | 7 +- | ||
| 687 | 266 | arch/powerpc/lib/checksum_64.S | 482 +++++++++++++++++------- | ||
| 688 | 267 | arch/powerpc/lib/checksum_wrappers_64.c | 102 +++++ | ||
| 689 | 268 | arch/powerpc/lib/copy_32.S | 2 +- | ||
| 690 | 269 | arch/powerpc/lib/ldstfp.S | 36 +- | ||
| 691 | 270 | arch/powerpc/lib/locks.c | 4 +- | ||
| 692 | 271 | arch/powerpc/lib/sstep.c | 8 + | ||
| 693 | 272 | arch/powerpc/math-emu/Makefile | 2 +- | ||
| 694 | 273 | arch/powerpc/mm/Makefile | 6 +- | ||
| 695 | 274 | arch/powerpc/mm/fault.c | 6 + | ||
| 696 | 275 | arch/powerpc/mm/fsl_booke_mmu.c | 15 +- | ||
| 697 | 276 | arch/powerpc/mm/mmu_context_nohash.c | 6 +- | ||
| 698 | 277 | arch/powerpc/mm/mmu_decl.h | 5 +- | ||
| 699 | 278 | arch/powerpc/mm/tlb_nohash.c | 56 +++- | ||
| 700 | 279 | arch/powerpc/mm/tlb_nohash_low.S | 2 +- | ||
| 701 | 280 | arch/powerpc/oprofile/Makefile | 4 +- | ||
| 702 | 281 | arch/powerpc/oprofile/backtrace.c | 2 +- | ||
| 703 | 282 | arch/powerpc/oprofile/op_model_fsl_emb.c | 15 +- | ||
| 704 | 283 | arch/powerpc/platforms/44x/Kconfig | 16 + | ||
| 705 | 284 | arch/powerpc/platforms/44x/ppc44x_simple.c | 1 + | ||
| 706 | 285 | arch/powerpc/platforms/83xx/Kconfig | 4 +- | ||
| 707 | 286 | arch/powerpc/platforms/83xx/mpc830x_rdb.c | 3 +- | ||
| 708 | 287 | arch/powerpc/platforms/85xx/Kconfig | 28 ++- | ||
| 709 | 288 | arch/powerpc/platforms/85xx/Makefile | 2 + | ||
| 710 | 289 | arch/powerpc/platforms/85xx/p1022_ds.c | 2 + | ||
| 711 | 290 | arch/powerpc/platforms/85xx/p3041_ds.c | 64 ++++ | ||
| 712 | 291 | arch/powerpc/platforms/85xx/p5020_ds.c | 69 ++++ | ||
| 713 | 292 | arch/powerpc/platforms/85xx/smp.c | 83 ++++- | ||
| 714 | 293 | arch/powerpc/platforms/Kconfig.cputype | 8 +- | ||
| 715 | 294 | arch/powerpc/platforms/cell/ras.c | 4 +- | ||
| 716 | 295 | arch/powerpc/platforms/cell/spider-pic.c | 4 +- | ||
| 717 | 296 | arch/powerpc/platforms/cell/spufs/file.c | 18 + | ||
| 718 | 297 | arch/powerpc/platforms/chrp/nvram.c | 4 +- | ||
| 719 | 298 | arch/powerpc/platforms/iseries/Makefile | 2 +- | ||
| 720 | 299 | arch/powerpc/platforms/iseries/dt.c | 4 +- | ||
| 721 | 300 | arch/powerpc/platforms/iseries/smp.c | 2 +- | ||
| 722 | 301 | arch/powerpc/platforms/maple/setup.c | 1 + | ||
| 723 | 302 | arch/powerpc/platforms/powermac/pfunc_core.c | 9 +- | ||
| 724 | 303 | arch/powerpc/platforms/pseries/Makefile | 13 +- | ||
| 725 | 304 | arch/powerpc/platforms/pseries/dlpar.c | 7 +- | ||
| 726 | 305 | arch/powerpc/platforms/pseries/dtl.c | 224 +++++++++--- | ||
| 727 | 306 | arch/powerpc/platforms/pseries/lpar.c | 25 ++- | ||
| 728 | 307 | arch/powerpc/platforms/pseries/mobility.c | 362 ++++++++++++++++++ | ||
| 729 | 308 | arch/powerpc/platforms/pseries/pseries.h | 9 + | ||
| 730 | 309 | arch/powerpc/platforms/pseries/setup.c | 52 +++ | ||
| 731 | 310 | arch/powerpc/platforms/pseries/xics.c | 2 +- | ||
| 732 | 311 | arch/powerpc/sysdev/Makefile | 5 +- | ||
| 733 | 312 | arch/powerpc/sysdev/dart_iommu.c | 74 ++++- | ||
| 734 | 313 | arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | 101 +++++ | ||
| 735 | 314 | arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 159 ++++++++ | ||
| 736 | 315 | arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 231 +++++++++++ | ||
| 737 | 316 | arch/powerpc/sysdev/fsl_msi.c | 9 +- | ||
| 738 | 317 | arch/powerpc/sysdev/fsl_pci.c | 60 +++- | ||
| 739 | 318 | arch/powerpc/sysdev/fsl_pci.h | 1 + | ||
| 740 | 319 | arch/powerpc/sysdev/fsl_rio.c | 65 ++-- | ||
| 741 | 320 | arch/powerpc/sysdev/fsl_soc.c | 20 +- | ||
| 742 | 321 | arch/powerpc/sysdev/mpc8xxx_gpio.c | 3 + | ||
| 743 | 322 | arch/powerpc/sysdev/pmi.c | 2 +- | ||
| 744 | 323 | arch/powerpc/xmon/Makefile | 4 +- | ||
| 745 | 324 | drivers/i2c/busses/i2c-pasemi.c | 2 +- | ||
| 746 | 325 | drivers/macintosh/via-pmu-led.c | 4 +- | ||
| 747 | 326 | drivers/watchdog/Kconfig | 22 +- | ||
| 748 | 327 | drivers/watchdog/booke_wdt.c | 47 ++- | ||
| 749 | 328 | include/linux/pci_ids.h | 8 + | ||
| 750 | 329 | kernel/sys_ni.c | 1 + | ||
| 751 | 330 | 130 files changed, 3676 insertions(+), 683 deletions(-) | ||
| 752 | 331 | create mode 100644 arch/powerpc/boot/dts/bluestone.dts | ||
| 753 | 332 | create mode 100644 arch/powerpc/boot/dts/mpc8308_p1m.dts | ||
| 754 | 333 | create mode 100644 arch/powerpc/configs/44x/bluestone_defconfig | ||
| 755 | 334 | create mode 100644 arch/powerpc/configs/e55xx_smp_defconfig | ||
| 756 | 335 | create mode 100644 arch/powerpc/include/asm/fsl_85xx_cache_sram.h | ||
| 757 | 336 | create mode 100644 arch/powerpc/lib/checksum_wrappers_64.c | ||
| 758 | 337 | create mode 100644 arch/powerpc/platforms/85xx/p3041_ds.c | ||
| 759 | 338 | create mode 100644 arch/powerpc/platforms/85xx/p5020_ds.c | ||
| 760 | 339 | create mode 100644 arch/powerpc/platforms/pseries/mobility.c | ||
| 761 | 340 | create mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | ||
| 762 | 341 | create mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_sram.c | ||
| 763 | 342 | create mode 100644 arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | ||
| 764 | 343 | |||
| 765 | 344 | |||
| 766 | 345 | _______________________________________________ | ||
| 767 | 346 | Linuxppc-dev mailing list | ||
| 768 | 347 | Linuxppc-dev@lists.ozlabs.org | ||
| 769 | 348 | https://lists.ozlabs.org/listinfo/linuxppc-dev | ||
| 770 | 0 | 349 | ||
| 771 | === added file 'apps/patchwork/tests/mail/0006-git-pull-request-http.mbox' | |||
| 772 | --- apps/patchwork/tests/mail/0006-git-pull-request-http.mbox 1970-01-01 00:00:00 +0000 | |||
| 773 | +++ apps/patchwork/tests/mail/0006-git-pull-request-http.mbox 2012-10-18 10:13:36 +0000 | |||
| 774 | @@ -0,0 +1,348 @@ | |||
| 775 | 1 | From benh@kernel.crashing.org Fri Oct 22 11:51:02 2010 | ||
| 776 | 2 | Return-Path: <linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org> | ||
| 777 | 3 | X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bilbo.ozlabs.org | ||
| 778 | 4 | X-Spam-Level: | ||
| 779 | 5 | X-Spam-Status: No, score=0.0 required=3.0 tests=none autolearn=disabled | ||
| 780 | 6 | version=3.3.1 | ||
| 781 | 7 | X-Original-To: jk@ozlabs.org | ||
| 782 | 8 | Delivered-To: jk@ozlabs.org | ||
| 783 | 9 | Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) | ||
| 784 | 10 | by ozlabs.org (Postfix) with ESMTP id ED4B3100937 | ||
| 785 | 11 | for <jk@ozlabs.org>; Fri, 22 Oct 2010 14:51:54 +1100 (EST) | ||
| 786 | 12 | Received: by ozlabs.org (Postfix) | ||
| 787 | 13 | id BF799B70CB; Fri, 22 Oct 2010 14:51:50 +1100 (EST) | ||
| 788 | 14 | Delivered-To: linuxppc-dev@ozlabs.org | ||
| 789 | 15 | Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) | ||
| 790 | 16 | (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) | ||
| 791 | 17 | (Client did not present a certificate) | ||
| 792 | 18 | by ozlabs.org (Postfix) with ESMTPS id 94629B7043 | ||
| 793 | 19 | for <linuxppc-dev@ozlabs.org>; Fri, 22 Oct 2010 14:51:49 +1100 (EST) | ||
| 794 | 20 | Received: from [IPv6:::1] (localhost.localdomain [127.0.0.1]) | ||
| 795 | 21 | by gate.crashing.org (8.14.1/8.13.8) with ESMTP id o9M3p3SP018234; | ||
| 796 | 22 | Thu, 21 Oct 2010 22:51:04 -0500 | ||
| 797 | 23 | Subject: [git pull] Please pull powerpc.git next branch | ||
| 798 | 24 | From: Benjamin Herrenschmidt <benh@kernel.crashing.org> | ||
| 799 | 25 | To: Linus Torvalds <torvalds@linux-foundation.org> | ||
| 800 | 26 | Date: Fri, 22 Oct 2010 14:51:02 +1100 | ||
| 801 | 27 | Message-ID: <1287719462.2198.37.camel@pasglop> | ||
| 802 | 28 | Mime-Version: 1.0 | ||
| 803 | 29 | X-Mailer: Evolution 2.30.3 | ||
| 804 | 30 | Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>, | ||
| 805 | 31 | Andrew Morton <akpm@linux-foundation.org>, | ||
| 806 | 32 | Linux Kernel list <linux-kernel@vger.kernel.org> | ||
| 807 | 33 | X-BeenThere: linuxppc-dev@lists.ozlabs.org | ||
| 808 | 34 | X-Mailman-Version: 2.1.13 | ||
| 809 | 35 | Precedence: list | ||
| 810 | 36 | List-Id: Linux on PowerPC Developers Mail List <cbe-oss-dev.ozlabs.org> | ||
| 811 | 37 | List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>, | ||
| 812 | 38 | <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe> | ||
| 813 | 39 | List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev> | ||
| 814 | 40 | List-Post: <mailto:linuxppc-dev@lists.ozlabs.org> | ||
| 815 | 41 | List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help> | ||
| 816 | 42 | List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>, | ||
| 817 | 43 | <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe> | ||
| 818 | 44 | Content-Type: text/plain; | ||
| 819 | 45 | charset="us-ascii" | ||
| 820 | 46 | Content-Transfer-Encoding: 7bit | ||
| 821 | 47 | Sender: linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org | ||
| 822 | 48 | Errors-To: linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org | ||
| 823 | 49 | X-UID: 11446 | ||
| 824 | 50 | X-Length: 16781 | ||
| 825 | 51 | Status: R | ||
| 826 | 52 | X-Status: N | ||
| 827 | 53 | X-KMail-EncryptionState: | ||
| 828 | 54 | X-KMail-SignatureState: | ||
| 829 | 55 | X-KMail-MDN-Sent: | ||
| 830 | 56 | |||
| 831 | 57 | Hi Linus ! | ||
| 832 | 58 | |||
| 833 | 59 | Here's powerpc's batch for this merge window. Mostly bits and pieces, | ||
| 834 | 60 | such as Anton doing some performance tuning left and right, and the | ||
| 835 | 61 | usual churn. One hilight is the support for the new Freescale e5500 core | ||
| 836 | 62 | (64-bit BookE). Another one is that we now wire up the whole lot of | ||
| 837 | 63 | socket calls as direct syscalls in addition to the old style indirect | ||
| 838 | 64 | method. | ||
| 839 | 65 | |||
| 840 | 66 | Cheers, | ||
| 841 | 67 | Ben. | ||
| 842 | 68 | |||
| 843 | 69 | The following changes since commit e10117d36ef758da0690c95ecffc09d5dd7da479: | ||
| 844 | 70 | Linus Torvalds (1): | ||
| 845 | 71 | Merge branch 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev | ||
| 846 | 72 | |||
| 847 | 73 | are available in the git repository at: | ||
| 848 | 74 | |||
| 849 | 75 | http://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git next | ||
| 850 | 76 | |||
| 851 | 77 | Andreas Schwab (1): | ||
| 852 | 78 | powerpc: Remove fpscr use from [kvm_]cvt_{fd,df} | ||
| 853 | 79 | |||
| 854 | 80 | Anton Blanchard (5): | ||
| 855 | 81 | powerpc: Optimise 64bit csum_partial | ||
| 856 | 82 | powerpc: Optimise 64bit csum_partial_copy_generic and add csum_and_copy_from_user | ||
| 857 | 83 | powerpc: Add 64bit csum_and_copy_to_user | ||
| 858 | 84 | powerpc: Feature nop out reservation clear when stcx checks address | ||
| 859 | 85 | powerpc: Check end of stack canary at oops time | ||
| 860 | 86 | |||
| 861 | 87 | Arnd Bergmann (1): | ||
| 862 | 88 | powerpc/spufs: Use llseek in all file operations | ||
| 863 | 89 | |||
| 864 | 90 | Benjamin Herrenschmidt (4): | ||
| 865 | 91 | powerpc/dma: Add optional platform override of dma_set_mask() | ||
| 866 | 92 | powerpc/dart_iommu: Support for 64-bit iommu bypass window on PCIe | ||
| 867 | 93 | Merge remote branch 'kumar/merge' into next | ||
| 868 | 94 | Merge remote branch 'jwb/next' into next | ||
| 869 | 95 | |||
| 870 | 96 | Denis Kirjanov (1): | ||
| 871 | 97 | powerpc: Use is_32bit_task() helper to test 32-bit binary | ||
| 872 | 98 | |||
| 873 | 99 | Harninder Rai (1): | ||
| 874 | 100 | powerpc/85xx: add cache-sram support | ||
| 875 | 101 | |||
| 876 | 102 | Ian Munsie (1): | ||
| 877 | 103 | powerpc: Wire up direct socket system calls | ||
| 878 | 104 | |||
| 879 | 105 | Ilya Yanok (1): | ||
| 880 | 106 | powerpc/mpc83xx: Support for MPC8308 P1M board | ||
| 881 | 107 | |||
| 882 | 108 | Joe Perches (2): | ||
| 883 | 109 | powerpc: Use static const char arrays | ||
| 884 | 110 | powerpc: Remove pr_<level> uses of KERN_<level> | ||
| 885 | 111 | |||
| 886 | 112 | Josh Boyer (1): | ||
| 887 | 113 | powerpc/44x: Update ppc44x_defconfig | ||
| 888 | 114 | |||
| 889 | 115 | Julia Lawall (7): | ||
| 890 | 116 | powerpc/via-pmu-led.c: Add of_node_put to avoid memory leak | ||
| 891 | 117 | powerpc/maple: Add of_node_put to avoid memory leak | ||
| 892 | 118 | powerpc/powermac/pfunc_core.c: Add of_node_put to avoid memory leak | ||
| 893 | 119 | powerpc/cell: Add of_node_put to avoid memory leak | ||
| 894 | 120 | powerpc/chrp/nvram.c: Add of_node_put to avoid memory leak | ||
| 895 | 121 | powerpc/irq.c: Add of_node_put to avoid memory leak | ||
| 896 | 122 | i2c/i2c-pasemi.c: Fix unsigned return type | ||
| 897 | 123 | |||
| 898 | 124 | Kumar Gala (11): | ||
| 899 | 125 | powerpc/ppc64e: Fix link problem when building ppc64e_defconfig | ||
| 900 | 126 | powerpc/fsl-pci: Fix MSI support on 83xx platforms | ||
| 901 | 127 | powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers | ||
| 902 | 128 | powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips | ||
| 903 | 129 | powerpc/fsl-booke: Add p3041 DS board support | ||
| 904 | 130 | powerpc: Fix compile error with paca code on ppc64e | ||
| 905 | 131 | powerpc/fsl-booke: Add support for FSL 64-bit e5500 core | ||
| 906 | 132 | powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes | ||
| 907 | 133 | powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips | ||
| 908 | 134 | powerpc/fsl-booke: Add p5020 DS board support | ||
| 909 | 135 | powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig | ||
| 910 | 136 | |||
| 911 | 137 | Matthew McClintock (7): | ||
| 912 | 138 | powerpc/mm: Assume first cpu is boot_cpuid not 0 | ||
| 913 | 139 | powerpc/kexec: make masking/disabling interrupts generic | ||
| 914 | 140 | powerpc/85xx: Remove call to mpic_teardown_this_cpu in kexec | ||
| 915 | 141 | powerpc/85xx: Minor fixups for kexec on 85xx | ||
| 916 | 142 | powerpc/85xx: flush dcache before resetting cores | ||
| 917 | 143 | powerpc/fsl_soc: Search all global-utilities nodes for rstccr | ||
| 918 | 144 | powerpc/fsl_booke: Add support to boot from core other than 0 | ||
| 919 | 145 | |||
| 920 | 146 | Michael Neuling (1): | ||
| 921 | 147 | powerpc: Move arch_sd_sibling_asym_packing() to smp.c | ||
| 922 | 148 | |||
| 923 | 149 | Nathan Fontenot (3): | ||
| 924 | 150 | powerpc/pseries: Export device tree updating routines | ||
| 925 | 151 | powerpc/pseries: Export rtas_ibm_suspend_me() | ||
| 926 | 152 | powerpc/pseries: Partition migration in the kernel | ||
| 927 | 153 | |||
| 928 | 154 | Nishanth Aravamudan (8): | ||
| 929 | 155 | powerpc/pci: Fix return type of BUID_{HI,LO} macros | ||
| 930 | 156 | powerpc/dma: Fix dma_iommu_dma_supported compare | ||
| 931 | 157 | powerpc/dma: Fix check for direct DMA support | ||
| 932 | 158 | powerpc/vio: Use put_device() on device_register failure | ||
| 933 | 159 | powerpc/viobus: Free TCE table on device release | ||
| 934 | 160 | powerpc/pseries: Use kmemdup | ||
| 935 | 161 | powerpc/pci: Cleanup device dma setup code | ||
| 936 | 162 | powerpc/pseries/xics: Use cpu_possible_mask rather than cpu_all_mask | ||
| 937 | 163 | |||
| 938 | 164 | Paul Gortmaker (1): | ||
| 939 | 165 | powerpc: Fix invalid page flags in create TLB CAM path for PTE_64BIT | ||
| 940 | 166 | |||
| 941 | 167 | Paul Mackerras (5): | ||
| 942 | 168 | powerpc: Abstract indexing of lppaca structs | ||
| 943 | 169 | powerpc: Dynamically allocate most lppaca structs | ||
| 944 | 170 | powerpc: Account time using timebase rather than PURR | ||
| 945 | 171 | powerpc/pseries: Re-enable dispatch trace log userspace interface | ||
| 946 | 172 | powerpc/perf: Fix sampling enable for PPC970 | ||
| 947 | 173 | |||
| 948 | 174 | Scott Wood (1): | ||
| 949 | 175 | oprofile/fsl emb: Don't set MSR[PMM] until after clearing the interrupt. | ||
| 950 | 176 | |||
| 951 | 177 | Sean MacLennan (2): | ||
| 952 | 178 | powerpc: Fix incorrect .stabs entry for copy_32.S | ||
| 953 | 179 | powerpc: mtmsrd not defined | ||
| 954 | 180 | |||
| 955 | 181 | Shaohui Xie (1): | ||
| 956 | 182 | fsl_rio: Add comments for sRIO registers. | ||
| 957 | 183 | |||
| 958 | 184 | Stephen Rothwell (1): | ||
| 959 | 185 | powerpc: define a compat_sys_recv cond_syscall | ||
| 960 | 186 | |||
| 961 | 187 | Timur Tabi (5): | ||
| 962 | 188 | powerpc: export ppc_proc_freq and ppc_tb_freq as GPL symbols | ||
| 963 | 189 | powerpc/watchdog: Allow the Book-E driver to be compiled as a module | ||
| 964 | 190 | powerpc/p1022: Add probing for individual DMA channels | ||
| 965 | 191 | powerpc/85xx: add ngPIXIS FPGA device tree node to the P1022DS board | ||
| 966 | 192 | powerpc/watchdog: Make default timeout for Book-E watchdog a Kconfig option | ||
| 967 | 193 | |||
| 968 | 194 | Tirumala Marri (1): | ||
| 969 | 195 | powerpc/44x: Add support for the AMCC APM821xx SoC | ||
| 970 | 196 | |||
| 971 | 197 | matt mooney (1): | ||
| 972 | 198 | powerpc/Makefiles: Change to new flag variables | ||
| 973 | 199 | |||
| 974 | 200 | arch/powerpc/boot/addnote.c | 4 +- | ||
| 975 | 201 | arch/powerpc/boot/dts/bluestone.dts | 254 +++++++++++++ | ||
| 976 | 202 | arch/powerpc/boot/dts/mpc8308_p1m.dts | 332 ++++++++++++++++ | ||
| 977 | 203 | arch/powerpc/boot/dts/p1022ds.dts | 11 + | ||
| 978 | 204 | arch/powerpc/configs/44x/bluestone_defconfig | 68 ++++ | ||
| 979 | 205 | arch/powerpc/configs/e55xx_smp_defconfig | 84 ++++ | ||
| 980 | 206 | arch/powerpc/configs/ppc44x_defconfig | 9 +- | ||
| 981 | 207 | arch/powerpc/configs/ppc64e_defconfig | 4 +- | ||
| 982 | 208 | arch/powerpc/include/asm/checksum.h | 10 + | ||
| 983 | 209 | arch/powerpc/include/asm/compat.h | 4 +- | ||
| 984 | 210 | arch/powerpc/include/asm/cputable.h | 14 +- | ||
| 985 | 211 | arch/powerpc/include/asm/dma-mapping.h | 14 +- | ||
| 986 | 212 | arch/powerpc/include/asm/elf.h | 2 +- | ||
| 987 | 213 | arch/powerpc/include/asm/exception-64s.h | 3 +- | ||
| 988 | 214 | arch/powerpc/include/asm/fsl_85xx_cache_sram.h | 48 +++ | ||
| 989 | 215 | arch/powerpc/include/asm/kexec.h | 1 + | ||
| 990 | 216 | arch/powerpc/include/asm/kvm_fpu.h | 4 +- | ||
| 991 | 217 | arch/powerpc/include/asm/lppaca.h | 29 ++ | ||
| 992 | 218 | arch/powerpc/include/asm/machdep.h | 3 + | ||
| 993 | 219 | arch/powerpc/include/asm/mmu-book3e.h | 15 + | ||
| 994 | 220 | arch/powerpc/include/asm/paca.h | 10 +- | ||
| 995 | 221 | arch/powerpc/include/asm/page_64.h | 4 +- | ||
| 996 | 222 | arch/powerpc/include/asm/ppc-pci.h | 4 +- | ||
| 997 | 223 | arch/powerpc/include/asm/ppc_asm.h | 50 ++- | ||
| 998 | 224 | arch/powerpc/include/asm/processor.h | 4 +- | ||
| 999 | 225 | arch/powerpc/include/asm/pte-common.h | 7 + | ||
| 1000 | 226 | arch/powerpc/include/asm/rtas.h | 1 + | ||
| 1001 | 227 | arch/powerpc/include/asm/systbl.h | 19 + | ||
| 1002 | 228 | arch/powerpc/include/asm/system.h | 4 +- | ||
| 1003 | 229 | arch/powerpc/include/asm/time.h | 5 - | ||
| 1004 | 230 | arch/powerpc/include/asm/unistd.h | 21 +- | ||
| 1005 | 231 | arch/powerpc/kernel/Makefile | 4 +- | ||
| 1006 | 232 | arch/powerpc/kernel/align.c | 4 +- | ||
| 1007 | 233 | arch/powerpc/kernel/asm-offsets.c | 12 +- | ||
| 1008 | 234 | arch/powerpc/kernel/cpu_setup_44x.S | 1 + | ||
| 1009 | 235 | arch/powerpc/kernel/cpu_setup_fsl_booke.S | 15 + | ||
| 1010 | 236 | arch/powerpc/kernel/cputable.c | 43 ++- | ||
| 1011 | 237 | arch/powerpc/kernel/crash.c | 13 +- | ||
| 1012 | 238 | arch/powerpc/kernel/dma-iommu.c | 21 +- | ||
| 1013 | 239 | arch/powerpc/kernel/dma.c | 20 +- | ||
| 1014 | 240 | arch/powerpc/kernel/entry_64.S | 40 ++ | ||
| 1015 | 241 | arch/powerpc/kernel/fpu.S | 10 - | ||
| 1016 | 242 | arch/powerpc/kernel/head_fsl_booke.S | 10 +- | ||
| 1017 | 243 | arch/powerpc/kernel/irq.c | 6 +- | ||
| 1018 | 244 | arch/powerpc/kernel/lparcfg.c | 14 +- | ||
| 1019 | 245 | arch/powerpc/kernel/machine_kexec.c | 24 ++ | ||
| 1020 | 246 | arch/powerpc/kernel/machine_kexec_32.c | 4 + | ||
| 1021 | 247 | arch/powerpc/kernel/paca.c | 70 ++++- | ||
| 1022 | 248 | arch/powerpc/kernel/pci-common.c | 4 +- | ||
| 1023 | 249 | arch/powerpc/kernel/ppc970-pmu.c | 2 + | ||
| 1024 | 250 | arch/powerpc/kernel/process.c | 12 - | ||
| 1025 | 251 | arch/powerpc/kernel/ptrace.c | 2 +- | ||
| 1026 | 252 | arch/powerpc/kernel/rtas.c | 4 +- | ||
| 1027 | 253 | arch/powerpc/kernel/setup_32.c | 2 +- | ||
| 1028 | 254 | arch/powerpc/kernel/smp.c | 14 +- | ||
| 1029 | 255 | arch/powerpc/kernel/time.c | 275 +++++++------- | ||
| 1030 | 256 | arch/powerpc/kernel/traps.c | 5 + | ||
| 1031 | 257 | arch/powerpc/kernel/vdso.c | 6 +- | ||
| 1032 | 258 | arch/powerpc/kernel/vdso32/Makefile | 6 +- | ||
| 1033 | 259 | arch/powerpc/kernel/vdso64/Makefile | 6 +- | ||
| 1034 | 260 | arch/powerpc/kernel/vio.c | 10 +- | ||
| 1035 | 261 | arch/powerpc/kvm/Makefile | 2 +- | ||
| 1036 | 262 | arch/powerpc/kvm/book3s_paired_singles.c | 44 +-- | ||
| 1037 | 263 | arch/powerpc/kvm/emulate.c | 4 +- | ||
| 1038 | 264 | arch/powerpc/kvm/fpu.S | 8 - | ||
| 1039 | 265 | arch/powerpc/lib/Makefile | 7 +- | ||
| 1040 | 266 | arch/powerpc/lib/checksum_64.S | 482 +++++++++++++++++------- | ||
| 1041 | 267 | arch/powerpc/lib/checksum_wrappers_64.c | 102 +++++ | ||
| 1042 | 268 | arch/powerpc/lib/copy_32.S | 2 +- | ||
| 1043 | 269 | arch/powerpc/lib/ldstfp.S | 36 +- | ||
| 1044 | 270 | arch/powerpc/lib/locks.c | 4 +- | ||
| 1045 | 271 | arch/powerpc/lib/sstep.c | 8 + | ||
| 1046 | 272 | arch/powerpc/math-emu/Makefile | 2 +- | ||
| 1047 | 273 | arch/powerpc/mm/Makefile | 6 +- | ||
| 1048 | 274 | arch/powerpc/mm/fault.c | 6 + | ||
| 1049 | 275 | arch/powerpc/mm/fsl_booke_mmu.c | 15 +- | ||
| 1050 | 276 | arch/powerpc/mm/mmu_context_nohash.c | 6 +- | ||
| 1051 | 277 | arch/powerpc/mm/mmu_decl.h | 5 +- | ||
| 1052 | 278 | arch/powerpc/mm/tlb_nohash.c | 56 +++- | ||
| 1053 | 279 | arch/powerpc/mm/tlb_nohash_low.S | 2 +- | ||
| 1054 | 280 | arch/powerpc/oprofile/Makefile | 4 +- | ||
| 1055 | 281 | arch/powerpc/oprofile/backtrace.c | 2 +- | ||
| 1056 | 282 | arch/powerpc/oprofile/op_model_fsl_emb.c | 15 +- | ||
| 1057 | 283 | arch/powerpc/platforms/44x/Kconfig | 16 + | ||
| 1058 | 284 | arch/powerpc/platforms/44x/ppc44x_simple.c | 1 + | ||
| 1059 | 285 | arch/powerpc/platforms/83xx/Kconfig | 4 +- | ||
| 1060 | 286 | arch/powerpc/platforms/83xx/mpc830x_rdb.c | 3 +- | ||
| 1061 | 287 | arch/powerpc/platforms/85xx/Kconfig | 28 ++- | ||
| 1062 | 288 | arch/powerpc/platforms/85xx/Makefile | 2 + | ||
| 1063 | 289 | arch/powerpc/platforms/85xx/p1022_ds.c | 2 + | ||
| 1064 | 290 | arch/powerpc/platforms/85xx/p3041_ds.c | 64 ++++ | ||
| 1065 | 291 | arch/powerpc/platforms/85xx/p5020_ds.c | 69 ++++ | ||
| 1066 | 292 | arch/powerpc/platforms/85xx/smp.c | 83 ++++- | ||
| 1067 | 293 | arch/powerpc/platforms/Kconfig.cputype | 8 +- | ||
| 1068 | 294 | arch/powerpc/platforms/cell/ras.c | 4 +- | ||
| 1069 | 295 | arch/powerpc/platforms/cell/spider-pic.c | 4 +- | ||
| 1070 | 296 | arch/powerpc/platforms/cell/spufs/file.c | 18 + | ||
| 1071 | 297 | arch/powerpc/platforms/chrp/nvram.c | 4 +- | ||
| 1072 | 298 | arch/powerpc/platforms/iseries/Makefile | 2 +- | ||
| 1073 | 299 | arch/powerpc/platforms/iseries/dt.c | 4 +- | ||
| 1074 | 300 | arch/powerpc/platforms/iseries/smp.c | 2 +- | ||
| 1075 | 301 | arch/powerpc/platforms/maple/setup.c | 1 + | ||
| 1076 | 302 | arch/powerpc/platforms/powermac/pfunc_core.c | 9 +- | ||
| 1077 | 303 | arch/powerpc/platforms/pseries/Makefile | 13 +- | ||
| 1078 | 304 | arch/powerpc/platforms/pseries/dlpar.c | 7 +- | ||
| 1079 | 305 | arch/powerpc/platforms/pseries/dtl.c | 224 +++++++++--- | ||
| 1080 | 306 | arch/powerpc/platforms/pseries/lpar.c | 25 ++- | ||
| 1081 | 307 | arch/powerpc/platforms/pseries/mobility.c | 362 ++++++++++++++++++ | ||
| 1082 | 308 | arch/powerpc/platforms/pseries/pseries.h | 9 + | ||
| 1083 | 309 | arch/powerpc/platforms/pseries/setup.c | 52 +++ | ||
| 1084 | 310 | arch/powerpc/platforms/pseries/xics.c | 2 +- | ||
| 1085 | 311 | arch/powerpc/sysdev/Makefile | 5 +- | ||
| 1086 | 312 | arch/powerpc/sysdev/dart_iommu.c | 74 ++++- | ||
| 1087 | 313 | arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | 101 +++++ | ||
| 1088 | 314 | arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 159 ++++++++ | ||
| 1089 | 315 | arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 231 +++++++++++ | ||
| 1090 | 316 | arch/powerpc/sysdev/fsl_msi.c | 9 +- | ||
| 1091 | 317 | arch/powerpc/sysdev/fsl_pci.c | 60 +++- | ||
| 1092 | 318 | arch/powerpc/sysdev/fsl_pci.h | 1 + | ||
| 1093 | 319 | arch/powerpc/sysdev/fsl_rio.c | 65 ++-- | ||
| 1094 | 320 | arch/powerpc/sysdev/fsl_soc.c | 20 +- | ||
| 1095 | 321 | arch/powerpc/sysdev/mpc8xxx_gpio.c | 3 + | ||
| 1096 | 322 | arch/powerpc/sysdev/pmi.c | 2 +- | ||
| 1097 | 323 | arch/powerpc/xmon/Makefile | 4 +- | ||
| 1098 | 324 | drivers/i2c/busses/i2c-pasemi.c | 2 +- | ||
| 1099 | 325 | drivers/macintosh/via-pmu-led.c | 4 +- | ||
| 1100 | 326 | drivers/watchdog/Kconfig | 22 +- | ||
| 1101 | 327 | drivers/watchdog/booke_wdt.c | 47 ++- | ||
| 1102 | 328 | include/linux/pci_ids.h | 8 + | ||
| 1103 | 329 | kernel/sys_ni.c | 1 + | ||
| 1104 | 330 | 130 files changed, 3676 insertions(+), 683 deletions(-) | ||
| 1105 | 331 | create mode 100644 arch/powerpc/boot/dts/bluestone.dts | ||
| 1106 | 332 | create mode 100644 arch/powerpc/boot/dts/mpc8308_p1m.dts | ||
| 1107 | 333 | create mode 100644 arch/powerpc/configs/44x/bluestone_defconfig | ||
| 1108 | 334 | create mode 100644 arch/powerpc/configs/e55xx_smp_defconfig | ||
| 1109 | 335 | create mode 100644 arch/powerpc/include/asm/fsl_85xx_cache_sram.h | ||
| 1110 | 336 | create mode 100644 arch/powerpc/lib/checksum_wrappers_64.c | ||
| 1111 | 337 | create mode 100644 arch/powerpc/platforms/85xx/p3041_ds.c | ||
| 1112 | 338 | create mode 100644 arch/powerpc/platforms/85xx/p5020_ds.c | ||
| 1113 | 339 | create mode 100644 arch/powerpc/platforms/pseries/mobility.c | ||
| 1114 | 340 | create mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | ||
| 1115 | 341 | create mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_sram.c | ||
| 1116 | 342 | create mode 100644 arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | ||
| 1117 | 343 | |||
| 1118 | 344 | |||
| 1119 | 345 | _______________________________________________ | ||
| 1120 | 346 | Linuxppc-dev mailing list | ||
| 1121 | 347 | Linuxppc-dev@lists.ozlabs.org | ||
| 1122 | 348 | https://lists.ozlabs.org/listinfo/linuxppc-dev | ||
| 1123 | 0 | 349 | ||
| 1124 | === modified file 'apps/patchwork/tests/patchparser.py' | |||
| 1125 | --- apps/patchwork/tests/patchparser.py 2012-04-03 13:16:22 +0000 | |||
| 1126 | +++ apps/patchwork/tests/patchparser.py 2012-10-18 10:13:36 +0000 | |||
| 1127 | @@ -125,6 +125,11 @@ | |||
| 1128 | 125 | (self.patch, self.comment) = find_content(self.project, email) | 125 | (self.patch, self.comment) = find_content(self.project, email) |
| 1129 | 126 | 126 | ||
| 1130 | 127 | 127 | ||
| 1131 | 128 | class DiffWordInCommentTest(InlinePatchTest): | ||
| 1132 | 129 | test_comment = 'Lines can start with words beginning in "diff"\n' + \ | ||
| 1133 | 130 | 'difficult\nDifferent' | ||
| 1134 | 131 | |||
| 1135 | 132 | |||
| 1136 | 128 | class UpdateCommentTest(InlinePatchTest): | 133 | class UpdateCommentTest(InlinePatchTest): |
| 1137 | 129 | """ Test for '---\nUpdate: v2' style comments to patches. """ | 134 | """ Test for '---\nUpdate: v2' style comments to patches. """ |
| 1138 | 130 | patch_filename = '0001-add-line.patch' | 135 | patch_filename = '0001-add-line.patch' |
| 1139 | @@ -534,3 +539,13 @@ | |||
| 1140 | 534 | patch.content.startswith('diff --git a/arch/x86/include/asm/smp.h'), | 539 | patch.content.startswith('diff --git a/arch/x86/include/asm/smp.h'), |
| 1141 | 535 | patch.content) | 540 | patch.content) |
| 1142 | 536 | self.assertTrue(comment is not None) | 541 | self.assertTrue(comment is not None) |
| 1143 | 542 | |||
| 1144 | 543 | class GitPullGitSSHUrlTest(GitPullTest): | ||
| 1145 | 544 | mail_file = '0004-git-pull-request-git+ssh.mbox' | ||
| 1146 | 545 | |||
| 1147 | 546 | class GitPullSSHUrlTest(GitPullTest): | ||
| 1148 | 547 | mail_file = '0005-git-pull-request-ssh.mbox' | ||
| 1149 | 548 | |||
| 1150 | 549 | class GitPullHTTPUrlTest(GitPullTest): | ||
| 1151 | 550 | mail_file = '0006-git-pull-request-http.mbox' | ||
| 1152 | 551 | |||
| 1153 | 537 | 552 | ||
| 1154 | === modified file 'apps/patchwork/tests/utils.py' | |||
| 1155 | --- apps/patchwork/tests/utils.py 2011-06-14 18:53:47 +0000 | |||
| 1156 | +++ apps/patchwork/tests/utils.py 2012-10-18 10:13:36 +0000 | |||
| 1157 | @@ -33,8 +33,8 @@ | |||
| 1158 | 33 | from email.MIMEMultipart import MIMEMultipart | 33 | from email.MIMEMultipart import MIMEMultipart |
| 1159 | 34 | 34 | ||
| 1160 | 35 | # helper functions for tests | 35 | # helper functions for tests |
| 1163 | 36 | _test_mail_dir = 'patchwork/tests/mail' | 36 | _test_mail_dir = os.path.join(os.path.dirname(__file__), 'mail') |
| 1164 | 37 | _test_patch_dir = 'patchwork/tests/patches' | 37 | _test_patch_dir = os.path.join(os.path.dirname(__file__), 'patches') |
| 1165 | 38 | 38 | ||
| 1166 | 39 | class defaults(object): | 39 | class defaults(object): |
| 1167 | 40 | project = Project(linkname = 'test-project', name = 'Test Project') | 40 | project = Project(linkname = 'test-project', name = 'Test Project') |
| 1168 | 41 | 41 | ||
| 1169 | === modified file 'apps/settings.py' | |||
| 1170 | --- apps/settings.py 2012-10-16 08:53:28 +0000 | |||
| 1171 | +++ apps/settings.py 2012-10-18 10:13:36 +0000 | |||
| 1172 | @@ -49,8 +49,8 @@ | |||
| 1173 | 49 | 49 | ||
| 1174 | 50 | # List of callables that know how to import templates from various sources. | 50 | # List of callables that know how to import templates from various sources. |
| 1175 | 51 | TEMPLATE_LOADERS = ( | 51 | TEMPLATE_LOADERS = ( |
| 1178 | 52 | 'django.template.loaders.filesystem.load_template_source', | 52 | 'django.template.loaders.filesystem.Loader', |
| 1179 | 53 | 'django.template.loaders.app_directories.load_template_source', | 53 | 'django.template.loaders.app_directories.Loader', |
| 1180 | 54 | # 'django.template.loaders.eggs.load_template_source', | 54 | # 'django.template.loaders.eggs.load_template_source', |
| 1181 | 55 | ) | 55 | ) |
| 1182 | 56 | 56 | ||
I hope one day light will shine on us and we will be allowed to use git to track upstream git projects. That will also give us free protection against typos like "herry-picked" & "from upstrea." ;-)