* Re: at91 next tree
From: Nicolas Ferre @ 2011-09-09 12:14 UTC (permalink / raw)
To: Stephen Rothwell, linux-next
Cc: Jean-Christophe PLAGNIOL-VILLARD, Andrew Victor, Russell King,
Patrice VILCHEZ, 'linux-arm-kernel@lists.infradead.org'
In-Reply-To: <20110423095558.99ee7136.sfr@canb.auug.org.au>
Stephen,
Le 23/04/2011 01:55, Stephen Rothwell :
> Hi,
>
> On Fri, 22 Apr 2011 17:51:22 +0200 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote:
>>
>> I'd like to known how we could get the at91 at91-next branch pull
>> in the next tree automaticaly?
>
> You request it :-)
>
>> git://github.com/at91linux/linux-2.6-at91.git at91-next
>
> I have added that tree to linux-next.
Can you please move our at91-next branch that is included currently in
linux-next to the "2.6-less" github tree?
git://github.com/at91linux/linux-at91.git
(I hope that the merge conflicts that you have just resolved will not
suffer from this move: but as commits are the same, I am pretty sure
that it will be transparent).
Thanks for your help, best regards,
--
Nicolas Ferre
^ permalink raw reply
* Re: linux-next: Tree for Sept 9
From: Lin Ming @ 2011-09-09 14:27 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20110909163825.f56274af231038ee31a735f6@canb.auug.org.au>
On Fri, Sep 9, 2011 at 2:38 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> With master.kernel.org down, there is not much change from September 1
> and the actual release will be delayed until master returns. I will
> still do the overnight builds, though.
>
Hi, Stephen
git.kernel.org is still down, then where can I pull -next tree?
Lin Ming
^ permalink raw reply
* Re: linux-next: Tree for Sept 9
From: Geert Uytterhoeven @ 2011-09-09 15:00 UTC (permalink / raw)
To: Lin Ming; +Cc: Stephen Rothwell, linux-next, LKML
In-Reply-To: <CAF1ivSZ6WdcNGMEDVZ0V+3PzZGb6cGYCVvdzzZGjB_RAeLAomg@mail.gmail.com>
On Fri, Sep 9, 2011 at 16:27, Lin Ming <mlin@ss.pku.edu.cn> wrote:
> On Fri, Sep 9, 2011 at 2:38 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> With master.kernel.org down, there is not much change from September 1
>> and the actual release will be delayed until master returns. I will
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>> still do the overnight builds, though.
>>
>
> Hi, Stephen
>
> git.kernel.org is still down, then where can I pull -next tree?
Nowhere, cfr. above.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* Re: linux-next: manual merge of the i.MX tree with the arm-soc tree
From: Stephen Rothwell @ 2011-09-11 3:34 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Sascha Hauer, linux-next, linux-kernel, Fabio Estevam,
Arnd Bergmann, Arnaud Patard (Rtp)
In-Reply-To: <20110909064058.GF28816@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 591 bytes --]
Hi Uwe,
On Fri, 9 Sep 2011 08:40:58 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
>
> Do you prefer that conflicts like these are resolved before you get
> them?
> (I.e. I could have done
>
> git merge -s ours $somecommitfromthearmsoctree
>
> but I wasn't sure that this is a good idea and so decided to wait until
> you write a mail about the conflict.)
No, these small conflicts are not a problem, so just leave them to me and
Arnd or Linus.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: at91 next tree
From: Stephen Rothwell @ 2011-09-11 4:10 UTC (permalink / raw)
To: Nicolas Ferre
Cc: linux-next, Jean-Christophe PLAGNIOL-VILLARD, Andrew Victor,
Russell King, Patrice VILCHEZ,
'linux-arm-kernel@lists.infradead.org'
In-Reply-To: <4E6A031B.6020804@atmel.com>
[-- Attachment #1: Type: text/plain, Size: 587 bytes --]
Hi Nicolas,
On Fri, 09 Sep 2011 14:14:19 +0200 Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
>
> Can you please move our at91-next branch that is included currently in
> linux-next to the "2.6-less" github tree?
>
> git://github.com/at91linux/linux-at91.git
Done.
> (I hope that the merge conflicts that you have just resolved will not
> suffer from this move: but as commits are the same, I am pretty sure
> that it will be transparent).
It will be fine.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: no tree for Sept 6
From: Stephen Rothwell @ 2011-09-11 4:19 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: Arnaud Lacombe, Josh Boyer, linux-next, LKML
In-Reply-To: <4E677AF5.7050903@infradead.org>
[-- Attachment #1: Type: text/plain, Size: 588 bytes --]
Hi Mauro,
On Wed, 07 Sep 2011 11:08:53 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
>
> It seems that we need a backup plan. In my case, I could put the tree
> for -next at infradead or at linuxtv, but that means to re-configure
> everything at Stephen's side.
That is not a big issue at all. If you wish to move your tree, just let
me know (preferably in a public manner to raise my confidence in its
provenance - I am a bit more paranoid, now :-)).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (tty tree related)
From: Stephen Rothwell @ 2011-09-11 4:23 UTC (permalink / raw)
To: Arnaud Lacombe; +Cc: Greg KH, linux-next, linux-kernel
In-Reply-To: <CACqU3MVbKJw5VVqnz+gfLDnQEDu9Lv4xV+7RvdD4ZbetGu79WQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 403 bytes --]
Hi Arnaud,
On Fri, 26 Aug 2011 11:47:40 -0400 Arnaud Lacombe <lacombar@gmail.com> wrote:
>
> Couldn't all the error log be public, rotated over a 7 iteration
> period ? That would be fair to everyone.
See http://kisskb.ellerman.id.au/linux-next (as stated in all my release
emails).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (tty tree related)
From: Geert Uytterhoeven @ 2011-09-11 9:05 UTC (permalink / raw)
To: Arnaud Lacombe; +Cc: Stephen Rothwell, Greg KH, linux-next, linux-kernel
In-Reply-To: <20110911142334.8df995a097763cd10f780f00@canb.auug.org.au>
Hi Arnaud,
On Sun, Sep 11, 2011 at 06:23, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Fri, 26 Aug 2011 11:47:40 -0400 Arnaud Lacombe <lacombar@gmail.com> wrote:
>> Couldn't all the error log be public, rotated over a 7 iteration
>> period ? That would be fair to everyone.
>
> See http://kisskb.ellerman.id.au/linux-next (as stated in all my release
> emails).
And if you want to analyze the results, you can use the scripts I use
to create the
regression/improvement reports for tagged Linux releases.
While it would be nice to have the same for linux-next releases, I
unfortunately don't
have the time for that, as there's still some manual work involved.
http://www.spinics.net/lists/linux-next/msg11040.html
You can get the scripts referenced in my email above from any kernel.org mirror,
e.g. ftp://ftp.belnet.be/mirrors/ftp.kernel.org/pub/linux/kernel/people/geert/linux-log/.
They may not be the latest version, though, have to check/fix when
master.kernel.org
is back.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* linux-next: manual merge of the arm-lpae tree with the arm tree
From: Stephen Rothwell @ 2011-09-12 1:15 UTC (permalink / raw)
To: Catalin Marinas; +Cc: linux-next, linux-kernel, Will Deacon, Russell King
Hi Catalin,
Today's linux-next merge of the arm-lpae tree got a conflict in
arch/arm/kernel/sleep.S between commit 805f72ef00a4 ("ARM: pm:
preallocate a page table for suspend/resume") (and later ones) from the
arm tree and commit 787dad4a57fb ("ARM: LPAE: add ISBs around MMU
enabling code") from the arm-lpae tree.
I attempted to fix it up (see below) and can carry the fix as necessary.
There are also other conflicts due to the same changes existaing in each
of these trees as different commits. Maybe some rebase or cleanup of the
arm-lpae tree is required.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/kernel/sleep.S
index 020e99c,ecece65..0000000
--- a/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
@@@ -52,17 -67,35 +52,19 @@@ ENDPROC(cpu_suspend_abort
/*
* r0 = control register value
- * r1 = v:p offset (preserved by cpu_do_resume)
- * r2 = phys page table base
- * r3 = L1 section flags
*/
+ .align 5
ENTRY(cpu_resume_mmu)
- adr r4, cpu_resume_turn_mmu_on
- mov r4, r4, lsr #20
- orr r3, r3, r4, lsl #20
- ldr r5, [r2, r4, lsl #2] @ save old mapping
- str r3, [r2, r4, lsl #2] @ setup 1:1 mapping for mmu code
- sub r2, r2, r1
ldr r3, =cpu_resume_after_mmu
- bic r1, r0, #CR_C @ ensure D-cache is disabled
- b cpu_resume_turn_mmu_on
-ENDPROC(cpu_resume_mmu)
- .ltorg
- .align 5
-cpu_resume_turn_mmu_on:
+ instr_sync
- mcr p15, 0, r1, c1, c0, 0 @ turn on MMU, I-cache, etc
- mrc p15, 0, r1, c0, c0, 0 @ read id reg
+ mcr p15, 0, r0, c1, c0, 0 @ turn on MMU, I-cache, etc
+ mrc p15, 0, r0, c0, c0, 0 @ read id reg
+ instr_sync
- mov r1, r1
- mov r1, r1
+ mov r0, r0
+ mov r0, r0
mov pc, r3 @ jump to virtual address
-ENDPROC(cpu_resume_turn_mmu_on)
+ENDPROC(cpu_resume_mmu)
cpu_resume_after_mmu:
- str r5, [r2, r4, lsl #2] @ restore old mapping
- mcr p15, 0, r0, c1, c0, 0 @ turn on D-cache
bl cpu_init @ restore the und/abt/irq banked regs
mov r0, #0 @ return zero on success
ldmfd sp!, {r4 - r11, pc}
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-09-12 2:05 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, David Brown, Stephen Boyd, Russell King
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-msm/board-msm8x60.c between commit 9e775ad19f52 ("ARM:
7012/1: Set proper TEXT_OFFSET for newer MSMs") from the arm tree and
commit 56e2d8a68803 ("ARM: msm: Add devicetree support for msm8660-surf")
from the arm-soc tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-msm/board-msm8x60.c
index 9221f54,10fa8f6..0000000
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@@ -20,7 -14,10 +14,11 @@@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/irq.h>
+#include <linux/memblock.h>
+ #include <linux/irqdomain.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
+ #include <linux/of_platform.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@@ -81,9 -62,42 +79,44 @@@ static void __init msm8x60_init(void
{
}
+ #ifdef CONFIG_OF
+ static struct of_dev_auxdata msm_auxdata_lookup[] __initdata = {
+ {}
+ };
+
+ static struct of_device_id msm_dt_gic_match[] __initdata = {
+ { .compatible = "qcom,msm-8660-qgic", },
+ {}
+ };
+
+ static void __init msm8x60_dt_init(void)
+ {
+ struct device_node *node;
+
+ node = of_find_matching_node_by_address(NULL, msm_dt_gic_match,
+ MSM8X60_QGIC_DIST_PHYS);
+ if (node)
+ irq_domain_add_simple(node, GIC_SPI_START);
+
+ if (of_machine_is_compatible("qcom,msm8660-surf")) {
+ printk(KERN_INFO "Init surf UART registers\n");
+ msm8x60_init_uart12dm();
+ }
+
+ of_platform_populate(NULL, of_default_bus_match_table,
+ msm_auxdata_lookup, NULL);
+ }
+
+ static const char *msm8x60_fluid_match[] __initdata = {
+ "qcom,msm8660-fluid",
+ "qcom,msm8660-surf",
+ NULL
+ };
+ #endif /* CONFIG_OF */
+
MACHINE_START(MSM8X60_RUMI3, "QCT MSM8X60 RUMI3")
+ .fixup = msm8x60_fixup,
+ .reserve = msm8x60_reserve,
.map_io = msm8x60_map_io,
.init_irq = msm8x60_init_irq,
.init_machine = msm8x60_init,
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-09-12 2:05 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Russell King, Shawn Guo, Sascha Hauer
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-mxs/include/mach/gpio.h between commit 22fe67837614 ("ARM:
gpio: consolidate trivial gpiolib implementations") and later ones from
the arm tree and commit 7e6c53aac38e ("gpio/mxs: move irq_to_gpio() into
gpio-mxs driver") and a579cebd76d8 ("arm/mxs: move MXS_GPIO_NR into
mach/mxs.h") from the arm-soc tree.
I fixed it up (which leaves this file essentailly empty - see below) and
can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-mxs/include/mach/gpio.h
index bb11e63,56025aa..0000000
--- a/arch/arm/mach-mxs/include/mach/gpio.h
+++ b/arch/arm/mach-mxs/include/mach/gpio.h
@@@ -20,8 -20,12 +20,4 @@@
#ifndef __MACH_MXS_GPIO_H__
#define __MACH_MXS_GPIO_H__
- #define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr))
-
- #define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START)
-
-#include <asm-generic/gpio.h>
-
-/* use gpiolib dispatchers */
-#define gpio_get_value __gpio_get_value
-#define gpio_set_value __gpio_set_value
-#define gpio_cansleep __gpio_cansleep
-#define gpio_to_irq __gpio_to_irq
-
#endif /* __MACH_MXS_GPIO_H__ */
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-09-12 2:05 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Russell King, Shawn Guo, Sascha Hauer
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-mxc/include/mach/gpio.h between commits 22fe67837614 ("ARM:
gpio: consolidate trivial gpiolib implementations") and 8f3c4537bb08
("ARM: gpio: make trivial GPIOLIB implementation the default") from the
arm tree and commits df1bac2e2f18 ("arm/mxc: use gpiolib helper for
gpio_to_irq"), a4395612290c ("gpio/mxc: move irq_to_gpio() into gpio-mxc
driver") and 1dfa86bb9d3f ("arm/mxc: move IMX_GPIO_NR into
mach/hardware.h") from the arm-soc tree.
I fixed it up (which leaves this file essentially empty - see below) anc
can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/plat-mxc/include/mach/gpio.h
index 3e1ffc8,44af006..0000000
--- a/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/arch/arm/plat-mxc/include/mach/gpio.h
@@@ -21,13 -21,12 +21,5 @@@
#include <linux/spinlock.h>
#include <mach/hardware.h>
-#include <asm-generic/gpio.h>
-
-/* use gpiolib dispatchers */
-#define gpio_get_value __gpio_get_value
-#define gpio_set_value __gpio_set_value
-#define gpio_cansleep __gpio_cansleep
-#define gpio_to_irq __gpio_to_irq
-
- /* There's a off-by-one betweem the gpio bank number and the gpiochip */
- /* range e.g. GPIO_1_5 is gpio 5 under linux */
- #define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr))
-
- #define gpio_to_irq(gpio) (MXC_GPIO_IRQ_START + (gpio))
- #define irq_to_gpio(irq) ((irq) - MXC_GPIO_IRQ_START)
-
#endif
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-09-12 2:05 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Russell King, Nico Erfurth,
Jean-Christophe PLAGNIOL-VILLARD, Nicolas Ferre
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-at91/board-usb-a9260.c between commit 2f8163baada3 ("ARM:
gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h")
from the arm tree and commit 6939fd49787e ("at91: merge board USB-A9260
and USB-A9263 together") from the arm-soc tree.
The latter removes this file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Boyd @ 2011-09-12 2:18 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Stephen Rothwell, linux-next, linux-kernel, David Brown,
Russell King
In-Reply-To: <20110912120501.764336af05069fa23a371b5e@canb.auug.org.au>
On 09/11/11 19:05, Stephen Rothwell wrote:
> Hi Arnd,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-msm/board-msm8x60.c between commit 9e775ad19f52 ("ARM:
> 7012/1: Set proper TEXT_OFFSET for newer MSMs") from the arm tree and
> commit 56e2d8a68803 ("ARM: msm: Add devicetree support for msm8660-surf")
> from the arm-soc tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
The device tree machine description also needs to have the .fixup and
.reserve callbacks added to it so that the device tree machines boot
properly. Perhaps the soc tree needs to pull in Russell's tree at some
point to resolve this subtle logical conflict or when the trees are
merged together someone will need to do an evil merge and add the
callbacks in the merge commit.
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply
* linux-next: Tree for Sept 12
From: Stephen Rothwell @ 2011-09-12 5:49 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 22497 bytes --]
Hi all,
With master.kernel.org down, there is not much change from September 1
and the actual release will be delayed until master returns. I will
still do the overnight builds, though.
The powerpc allyesconfig build still fails today.
Changes since 20110909:
Dropped tree: mips (process failure again :-()
The arm-lpae tree gained a conflict against the arm tree.
The arm-soc tree gained conflicts against the arm tree.
I have still reverted the x86/spinlocks branch from the tip tree for
today.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 199 trees (counting Linus' and 27 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
Merging arm-soc/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/hardware/cache-l2x0.h
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-imx/Makefile
Merging linux-spec/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (delete/modify): arch/arm/mach-exynos4/mach-smdkc210.c deleted in s5p/for-next and modified in HEAD. Version HEAD of arch/arm/mach-exynos4/mach-smdkc210.c left in tree.
$ git rm -f arch/arm/mach-exynos4/mach-smdkc210.c
Applying: s5p: merge fixup for atags_offset use
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/trans_virtio.c
Merging ubifs/linux-next
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-pci.c
Merging bluetooth/master
Merging mtd/master
Merging l2-mtd/master
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/rtc/rtc-twl.c
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/fbdev-next
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security/next
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging iommu/next
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging pm/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
CONFLICT (content): Merge conflict in drivers/mfd/twl4030-irq.c
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging devicetree/devicetree/next
CONFLICT (content): Merge conflict in drivers/of/base.c
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
[master 1b6f643] Revert "Merge branch 'x86/spinlocks' into auto-latest"
Merging rcu/rcu/next
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
Merging driver-core/driver-core-next
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
$ git rm -f drivers/staging/rtl8192e/r8192E_core.c
Merging bkl-config/config
Merging tmem/linux-next
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging moduleh/module.h-split
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
Applying: dm: use export.h instead of module.h where possible
Applying: block: bsg-lib.c needs export.h not module.h
Applying: PM: EXPORT_SYMBOL needs export.h
Merging kvmtool/master
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master
$ git checkout akpm
Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
Applying: When no floppy is found the module code can be released while a timer
Applying: Fix kconfig unmet dependency warning. BACKLIGHT_CLASS_DEVICE depends on
Applying: The parameter's origin type is long. On an i386 architecture, it can
Applying: Since the commit below which added O_PATH support to the *at() calls, the
Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error:
Applying: This makes the iris driver use the platform API, so it is properly exposed
Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
Applying: Cc: Ed Wildgoose <git@wildgooses.com>
Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
Applying: The x86 timer interrupt handler is the only handler not traced in the
Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
Applying: Don't allow everybody to use a modem.
Applying: The address limit is already set in flush_old_exec() so this
Applying: A call to va_copy() should always be followed by a call to va_end() in the
Applying: Don't dereference em if it's NULL or an error pointer.
Applying: Some messing with error codes to return 0 on out id's and match
Applying: kbuf is a buffer that is local to this function, so all of the error paths
Applying: fb_set_suspend() must be called with the console semaphore held, which
Applying: hwmon was using an idr with a NULL pointer, so convert to an
Applying: A straightforward looking use of idr for a device id.
Applying: This patchset aims at addressing /proc/stat issue which has been
Applying: update_ts_time_stat currently updates idle time even if we are in iowait
Applying: get_cpu_{idle,iowait}_time_us update idle/iowait counters unconditionally
Applying: show_stat handler of the /proc/stat file relies on kstat_cpu(cpu)
Applying: The address limit is already set in flush_old_exec() so this
Applying: The address limit is already set in flush_old_exec() so this
Applying: Add new check (assert_init) to make sure objects are initialized and
Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
Applying: The address limit is already set in flush_old_exec() so those calls to
Applying: When do pci remove/rescan on system that have more iommus, got
Applying: The current implementation of dmi_name_in_vendors() is an invitation to
Applying: For headers that get exported to userland and make use of u32 style
Applying: Fix sparse warnings of right shift bigger than source value size:
Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
Applying: Some mangling of errors was necessary to maintain current interface.
Applying: This does involve additional use of the spin lock in idr.c. Is this an
Applying: Instead of open coding this function use kstrtoul_from_user() directly.
Applying: brd_make_request() always returns 0, which doesn't make much sense.
Applying: The address limit is already set in flush_old_exec() so this assignment of
Applying: Unbreak the alpha build.
Applying: Unbreak alpha build.
Applying: Unbreak alpha build.
Applying: When we get corruption reports, it's useful to see if the kernel was
Applying: When we get corruption reports, it's useful to see if the kernel was
Applying: The basic idea behind cross memory attach is to allow MPI programs doing
Applying: - Add x86_64 specific wire up
Applying: > You might get some speed benefit by optimising for the small copies
Applying: acct_isolated of compaction uses page_lru_base_type which returns only
Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type. Normally,
Applying: In async mode, compaction doesn't migrate dirty or writeback pages. So,
Applying: In __zone_reclaim case, we don't want to shrink mapped page. Nonetheless,
Applying: unmap_and_move() is one a big messy function. Clean it up.
Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
Applying: per-task block plug can reduce block queue lock contention and increase
Applying: The tracing ring-buffer used this function briefly, but not anymore.
Applying: After selecting a task to kill, the oom killer iterates all processes and
Applying: Add the leading word "tmpfs" to the Kconfig string to make it blindingly
Applying: When we get a bad_page bug report, it's useful to see what modules the
Applying: Without swap, anonymous pages are not scanned. As such, they should not
Applying: fix comment
Applying: The nr_force_scan[] tuple holds the effective scan numbers for anon and
Applying: Some kernel components pin user space memory (infiniband and perf) (by
Applying: Add comments to explain the page statistics field in the mm_struct.
Applying: add missing ;
Applying: Testing from the XFS folk revealed that there is still too much I/O from
Applying: Lumpy reclaim worked with two passes - the first which queued pages for IO
Applying: Direct reclaim should never writeback pages. For now, handle the
Applying: Direct reclaim should never writeback pages. Warn if an attempt is made.
Applying: It is preferable that no dirty pages are dispatched for cleaning from the
Applying: Workloads that are allocating frequently and writing files place a large
Applying: When direct reclaim encounters a dirty page, it gets recycled around the
Applying: It's possible a zone watermark is ok when entering the balance_pgdat()
Applying: printk_ratelimit() should not be used, because it shares ratelimiting
Applying: memchr_inv() is mainly used to check whether the whole buffer is filled
Applying: Use newly introduced memchr_inv() for page verification.
Applying: A shrinker function can return -1, means that it cannot do anything
Applying: Use atomic-long operations instead of looping around cmpxchg().
Applying: massage atomic.h inclusions
Applying: The /proc/vmallocinfo shows information about vmalloc allocations in
Applying: Commit 645747462435 ("vmscan: detect mapped file pages used only once")
Applying: Logic added in commit 8cab4754d24a0 ("vmscan: make mapped executable pages
Applying: SPARC32 require access to the start address. Add a new helper
Applying: With the NO_BOOTMEM symbol added architectures may now use the following
Applying: Using "- 1" relies on the old_end to be page aligned and PAGE_SIZE > 1,
Applying: This replaces ptep_clear_flush() with ptep_get_and_clear() and a single
Applying: This adds THP support to mremap (decreases the number of split_huge_page()
Applying: coding-style nitpicking
Applying: Cc: Andrea Arcangeli <aarcange@redhat.com>
Applying: Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applying: vmstat_text is only available when PROC_FS or SYSFS is enabled. This
Applying: reduce ifdeffery
Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applying: Make the security_inode_init_security() initxattrs arg const, to match the
Applying: The current implementation of the /dev/hpet driver couples opening the
Applying: smp_call_function() only lets all other CPUs execute a specific function,
Applying: auto_demotion_disable is called only for online CPUs. For hotplugged
Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
Applying: Strict user copy checks are only really supported on x86_32 even though
Applying: The help text for this config is duplicated across the x86, parisc, and
Applying: s/lib-/obj-/ for usercopy.o
Applying: After an "unexpected" reboot, I found this Oops in my logs:
Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
Applying: Add axis correction for HP EliteBook 2730p.
Applying: Add axis correction for HP EliteBook 8540w.
Applying: Add axis correction for HP ProBook 6555b.
Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Change exported functions to use the device given as parameter
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: We are enabling some power features on medfield. To test suspend-2-RAM
Applying: We are enabling some power features on medfield. To test suspend-2-RAM
Applying: We are enabling some power features on medfield. To test suspend-2-RAM
Applying: Cc: Al Viro <viro@zeniv.linux.org.uk>
Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
Applying: include linux/module.h
Applying: The memory for struct led_trigger should be kfreed in the
Applying: Currently termination logic (\0 or \n\0) is hardcoded in _kstrtoull(),
Applying: Add support for slice by 8 to existing crc32 algorithm. Also modify
Applying: don't include asm/msr.h
Applying: epoll can acquire recursively acquire ep->mtx on multiple "struct
Applying: Currently in oprofilefs, files that use ulong_fops mis-handle writes of
Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
Applying: One can get this information from minix/inode.c, but adding the
Applying: The memcg code sometimes uses "struct mem_cgroup *mem" and sometimes uses
Applying: Before calling schedule_timeout(), task state should be changed.
Applying: Signed-off-by: Bob Liu <lliubbo@gmail.com>
Applying: While back-porting Johannes Weiner's patch "mm: memcg-aware global
Applying: If somebody is touching data too early, it might be easier to diagnose a
Applying: Both mem_cgroup_charge_statistics() and mem_cgroup_move_account() were
Applying: On reading sysctl dirs we should return -EISDIR instead of -EINVAL.
Applying: Force this on for -next/mm testing purposes.
Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
Applying: After merging the akpm tree, today's linux-next build (lost of them)
Applying: The discovered bit in PGCCSR register indicates if the device has been
Applying: Add RapidIO mport driver for IDT TSI721 PCI Express-to-SRIO bridge device.
Applying: When I tried to send a patch to remove it, Andi told me we still need to
Applying: A default echo function has been provided so it is no longer an error when
Applying: This client driver allows you to use a GPIO pin as a source for PPS
Applying: remove unneeded cast of void*
Applying: Straightforward. As an aside, the ida_init calls are not needed as far as
Applying: Simply creates one point to call the w1 interface.
Applying: Adds a nolock function to the w1 interface to avoid locking the
Applying: Fixes the deadlock when inserting and removing the ds2780.
Merging akpm
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Temporary -rcu tree location
From: Paul E. McKenney @ 2011-09-13 0:01 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-kernel
Hello, Stephen,
Could you please make the -next tree pull from branch next.2011.09.12a
of https://github.com/paulmckrcu/linux while kernel.org is down?
Thanx, Paul
PS. If someone knows how to make github delete a branch, please let me
know, as this would allow me to use the "rcu/next" nomenclature.
Yes, it is probably obvious, but I am new to github...
^ permalink raw reply
* Re: Temporary -rcu tree location
From: Jiri Kosina @ 2011-09-13 0:11 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: sfr, linux-next, linux-kernel
In-Reply-To: <20110913000107.GA15945@linux.vnet.ibm.com>
On Mon, 12 Sep 2011, Paul E. McKenney wrote:
> PS. If someone knows how to make github delete a branch, please let me
> know, as this would allow me to use the "rcu/next" nomenclature.
> Yes, it is probably obvious, but I am new to github...
git push origin :branch should work everywhere, right?
--
Jiri Kosina
SUSE Labs
^ permalink raw reply
* Re: Temporary -rcu tree location
From: Paul E. McKenney @ 2011-09-13 0:24 UTC (permalink / raw)
To: Jiri Kosina; +Cc: sfr, linux-next, linux-kernel
In-Reply-To: <alpine.LRH.2.00.1109130210090.19238@twin.jikos.cz>
On Tue, Sep 13, 2011 at 02:11:05AM +0200, Jiri Kosina wrote:
> On Mon, 12 Sep 2011, Paul E. McKenney wrote:
>
> > PS. If someone knows how to make github delete a branch, please let me
> > know, as this would allow me to use the "rcu/next" nomenclature.
> > Yes, it is probably obvious, but I am new to github...
>
> git push origin :branch should work everywhere, right?
Here is what happens when I try that:
git push github :rcu/next
Username:
Password:
error: unable to push to unqualified destination: rcu/next
The destination refspec neither matches an existing ref on the remote nor
begins with refs/, and we are unable to guess a prefix based on the source ref.
error: failed to push some refs to 'https://github.com/paulmckrcu/linux'
So what am I missing here?
Thanx, Paul
^ permalink raw reply
* Re: Temporary -rcu tree location
From: Jiri Kosina @ 2011-09-13 0:43 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: sfr, linux-next, linux-kernel
In-Reply-To: <20110913002419.GN2362@linux.vnet.ibm.com>
On Mon, 12 Sep 2011, Paul E. McKenney wrote:
> Here is what happens when I try that:
>
> git push github :rcu/next
> Username:
> Password:
> error: unable to push to unqualified destination: rcu/next
> The destination refspec neither matches an existing ref on the remote nor
> begins with refs/, and we are unable to guess a prefix based on the source ref.
> error: failed to push some refs to 'https://github.com/paulmckrcu/linux'
>
> So what am I missing here?
Looking at
https://github.com/paulmckrcu/linux/branches
there doesn't seem to be 'rcu/next' branch, right?
--
Jiri Kosina
SUSE Labs
^ permalink raw reply
* Re: Temporary -rcu tree location
From: Stephen Rothwell @ 2011-09-13 0:47 UTC (permalink / raw)
To: paulmck; +Cc: linux-next, linux-kernel
In-Reply-To: <20110913000107.GA15945@linux.vnet.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
Hi Paul,
On Mon, 12 Sep 2011 17:01:07 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
>
> Could you please make the -next tree pull from branch next.2011.09.12a
> of https://github.com/paulmckrcu/linux while kernel.org is down?
What branch?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: Temporary -rcu tree location
From: Stephen Rothwell @ 2011-09-13 1:14 UTC (permalink / raw)
To: paulmck; +Cc: linux-next, linux-kernel
In-Reply-To: <20110913104743.9087bec1bd105bec142c9e0e@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
On Tue, 13 Sep 2011 10:47:43 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Paul,
>
> On Mon, 12 Sep 2011 17:01:07 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
> >
> > Could you please make the -next tree pull from branch next.2011.09.12a
> > of https://github.com/paulmckrcu/linux while kernel.org is down?
>
> What branch?
Sorry, half asleep :-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: Temporary -rcu tree location
From: Stephen Rothwell @ 2011-09-13 1:21 UTC (permalink / raw)
To: paulmck; +Cc: linux-next, linux-kernel
In-Reply-To: <20110913000107.GA15945@linux.vnet.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
Hi Paul,
On Mon, 12 Sep 2011 17:01:07 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
>
> Could you please make the -next tree pull from branch next.2011.09.12a
> of https://github.com/paulmckrcu/linux while kernel.org is down?
I have swiched to that now (actually git://github.com/paulmckrcu/linux).
Just a couple of minor changes and some new commits, right? Hash of the
branch top commit is f88a19a.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: Temporary -rcu tree location
From: Paul E. McKenney @ 2011-09-13 1:32 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20110913112127.cd62b006c302a575ceae4dee@canb.auug.org.au>
On Tue, Sep 13, 2011 at 11:21:27AM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> On Mon, 12 Sep 2011 17:01:07 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
> >
> > Could you please make the -next tree pull from branch next.2011.09.12a
> > of https://github.com/paulmckrcu/linux while kernel.org is down?
>
> I have swiched to that now (actually git://github.com/paulmckrcu/linux).
> Just a couple of minor changes and some new commits, right? Hash of the
> branch top commit is f88a19a.
Yep, that is the one! And yes, not hugely different than the last
rcu/next from the kernel.org -rcu, but Linus seemed to be rather serious
about pull requests having been exposed to -next testing. ;-)
Thanx, Paul
^ permalink raw reply
* Re: Temporary -rcu tree location
From: Paul E. McKenney @ 2011-09-13 1:34 UTC (permalink / raw)
To: Jiri Kosina; +Cc: sfr, linux-next, linux-kernel
In-Reply-To: <alpine.LNX.2.00.1109130242440.13109@pobox.suse.cz>
On Tue, Sep 13, 2011 at 02:43:55AM +0200, Jiri Kosina wrote:
> On Mon, 12 Sep 2011, Paul E. McKenney wrote:
>
> > Here is what happens when I try that:
> >
> > git push github :rcu/next
> > Username:
> > Password:
> > error: unable to push to unqualified destination: rcu/next
> > The destination refspec neither matches an existing ref on the remote nor
> > begins with refs/, and we are unable to guess a prefix based on the source ref.
> > error: failed to push some refs to 'https://github.com/paulmckrcu/linux'
> >
> > So what am I missing here?
>
> Looking at
>
> https://github.com/paulmckrcu/linux/branches
>
> there doesn't seem to be 'rcu/next' branch, right?
No, there is not. So the idea is to push "rcu/next" the first time,
then ":rcu/next" thereafter?
Thanx, Paul
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-09-13 1:55 UTC (permalink / raw)
To: Stephen Boyd
Cc: Arnd Bergmann, linux-next, linux-kernel, David Brown,
Russell King
In-Reply-To: <4E6D6C0D.60100@codeaurora.org>
Hi Stephen,
On Sun, 11 Sep 2011 19:18:53 -0700 Stephen Boyd <sboyd@codeaurora.org> wrote:
>
> The device tree machine description also needs to have the .fixup and
> .reserve callbacks added to it so that the device tree machines boot
> properly. Perhaps the soc tree needs to pull in Russell's tree at some
> point to resolve this subtle logical conflict or when the trees are
> merged together someone will need to do an evil merge and add the
> callbacks in the merge commit.
Ah, right. I have added this merge fixup for today and can carry it as
necessary.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2011 11:51:48 +1000
Subject: [PATCH] arm-soc: merge fixup for fixup/reserve being added to
MACHINE descriptions
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/arm/mach-msm/board-msm8x60.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index 328df27..4ad2afb 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -153,6 +153,8 @@ MACHINE_END
#ifdef CONFIG_OF
/* TODO: General device tree support for all MSM. */
DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
+ .fixup = msm8x60_fixup,
+ .reserve = msm8x60_reserve,
.map_io = msm8x60_map_io,
.init_irq = msm8x60_init_irq,
.init_machine = msm8x60_dt_init,
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox