* linux-next: manual merge of the s5p tree with the arm tree
From: Stephen Rothwell @ 2010-10-17 23:50 UTC (permalink / raw)
To: Kukjin Kim
Cc: linux-next, linux-kernel, Jeremy Kerr, Lorenzo Pieralisi,
Jason Wang, Tony Lindgren, Russell King
[-- Attachment #1: Type: text/plain, Size: 772 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5p6440/include/mach/debug-macro.S between commit
08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
virtual addresses from addruart") from the arm tree and commit
29159b7dd244def6e0073ff0e2d4cbb59599187f ("ARM: S5P64X0: Add S5P64X0
(S5P6440 and S5P6450) initialization support") from the s5p tree.
The latter removed the file modified by the former. I did that.
The appropriate part of the above arm commit needs to be done for the new
file arch/arm/mach-s5p64x0/include/mach/debug-macro.S . Unfortunately, I
am unqualified to do 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
* linux-next: manual merge of the s5p tree with the arm tree
From: Stephen Rothwell @ 2010-10-17 23:55 UTC (permalink / raw)
To: Kukjin Kim; +Cc: linux-next, linux-kernel, Nicolas Pitre, Russell King
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5p64x0/mach-smdk6440.c between commit
861bd81ee62a0d6759144c22909a8a3938951656 ("arm: remove
machine_desc.io_pg_offst and .phys_io") from the arm tree and commit
cae6a3066d19a0c8b69cb25ee42b949ad6fb8c66 ("ARM: S5P64X0: Move SMDK6440
board file and Add SMDK6450 board file") from the s5p tree.
I fixed it up (see below) and can carry the fix as necessary. I also
applied the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Oct 2010 10:52:24 +1100
Subject: [PATCH] s5p: merge fix for removal of fielda from machine_desc
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index 8e98217..d609f5a 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -171,8 +171,6 @@ static void __init smdk6450_machine_init(void)
MACHINE_START(SMDK6450, "SMDK6450")
/* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
- .phys_io = S5P6450_PA_UART(0) & 0xfff00000,
- .io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc,
.boot_params = S5P64X0_PA_SDRAM + 0x100,
.init_irq = s5p6450_init_irq,
--
1.7.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-s5p64x0/mach-smdk6440.c
index 59d9f5b,28de0a5..0000000
--- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
@@@ -135,7 -152,9 +152,7 @@@ static void __init smdk6440_machine_ini
MACHINE_START(SMDK6440, "SMDK6440")
/* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
- .boot_params = S5P_PA_SDRAM + 0x100,
- .phys_io = S5P6440_PA_UART(0) & 0xfff00000,
- .io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc,
+ .boot_params = S5P64X0_PA_SDRAM + 0x100,
.init_irq = s5p6440_init_irq,
.map_io = smdk6440_map_io,
^ permalink raw reply related
* Re: linux-next: manual merge of the davinci tree with the arm tree
From: Stephen Rothwell @ 2010-10-18 0:01 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-next, linux-kernel, Sekhar Nori, Nicolas Pitre
In-Reply-To: <20101018103152.33fa12cd.sfr@canb.auug.org.au>
[Just cc'ing Russell, sorry about that]
On Mon, 18 Oct 2010 10:31:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflicts in
> arch/arm/mach-davinci/board-da830-evm.c and
> arch/arm/mach-davinci/board-da850-evm.c between commit
> 861bd81ee62a0d6759144c22909a8a3938951656 ("arm: remove
> machine_desc.io_pg_offst and .phys_io") from the arm tree and commit
> 48ea89eabee96019a4a84615af921f8703320abb ("davinci: introduce support for
> AM1x ARM9 microprocessors") from the davinci tree.
>
> Just context changes, I fixed them up (see below) and can carry the fix
> as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-davinci/board-da830-evm.c
> index 7f3cdbf,1bb89d3..0000000
> --- a/arch/arm/mach-davinci/board-da830-evm.c
> +++ b/arch/arm/mach-davinci/board-da830-evm.c
> @@@ -596,7 -608,9 +608,7 @@@ static void __init da830_evm_map_io(voi
> da830_init();
> }
>
> - MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137 EVM")
> + MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM")
> - .phys_io = IO_PHYS,
> - .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
> .boot_params = (DA8XX_DDR_BASE + 0x100),
> .map_io = da830_evm_map_io,
> .init_irq = cp_intc_init,
> diff --cc arch/arm/mach-davinci/board-da850-evm.c
> index b26f5cb,ef97c7f..0000000
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@@ -816,7 -868,9 +868,7 @@@ static void __init da850_evm_map_io(voi
> da850_init();
> }
>
> - MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138 EVM")
> + MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM")
> - .phys_io = IO_PHYS,
> - .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
> .boot_params = (DA8XX_DDR_BASE + 0x100),
> .map_io = da850_evm_map_io,
> .init_irq = cp_intc_init,
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: manual merge of the msm tree with the arm tree
From: Stephen Rothwell @ 2010-10-18 0:02 UTC (permalink / raw)
To: Daniel Walker
Cc: linux-next, linux-kernel, Jeremy Kerr, Jeff Ohlstein,
Russell King
In-Reply-To: <20101018103540.7bd9c535.sfr@canb.auug.org.au>
[ Just cc'ing Russell, sorry about that]
On Mon, 18 Oct 2010 10:35:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Daniel,
>
> Today's linux-next merge of the msm tree got a conflict in
> arch/arm/mach-msm/include/mach/debug-macro.S between commit
> 08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
> virtual addresses from addruart") from the arm tree and commit
> 46fe5f29e3062f681cc3cf07a604d82396faea89 ("msm: allow uart to be
> conditionally disabled") from the msm tree.
>
> Just context changes. 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/include/mach/debug-macro.S
> index 3c35b0d,238c4f1..0000000
> --- a/arch/arm/mach-msm/include/mach/debug-macro.S
> +++ b/arch/arm/mach-msm/include/mach/debug-macro.S
> @@@ -19,11 -19,13 +19,11 @@@
> #include <mach/hardware.h>
> #include <mach/msm_iomap.h>
>
> - #ifdef CONFIG_MSM_DEBUG_UART
> + #ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS
> - .macro addruart, rx, tmp
> + .macro addruart, rp, rv
> @ see if the MMU is enabled and select appropriate base address
> - mrc p15, 0, \rx, c1, c0
> - tst \rx, #1
> - ldreq \rx, =MSM_DEBUG_UART_PHYS
> - ldrne \rx, =MSM_DEBUG_UART_BASE
> + ldr \rp, =MSM_DEBUG_UART_PHYS
> + ldr \rv, =MSM_DEBUG_UART_BASE
> .endm
>
> .macro senduart,rd,rx
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply
* RE: linux-next: manual merge of the s5p tree with the arm tree
From: Kukjin Kim @ 2010-10-18 0:57 UTC (permalink / raw)
To: 'Stephen Rothwell'
Cc: linux-next, linux-kernel, 'Jeremy Kerr',
'Lorenzo Pieralisi', 'Jason Wang',
'Tony Lindgren', 'Russell King'
In-Reply-To: <20101018105046.368420c2.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi Stephen :-)
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s5p6440/include/mach/debug-macro.S between commit
> 08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
> virtual addresses from addruart") from the arm tree and commit
> 29159b7dd244def6e0073ff0e2d4cbb59599187f ("ARM: S5P64X0: Add S5P64X0
> (S5P6440 and S5P6450) initialization support") from the s5p tree.
>
Hmm...ok...
> The latter removed the file modified by the former. I did that.
>
Ok.
> The appropriate part of the above arm commit needs to be done for the new
> file arch/arm/mach-s5p64x0/include/mach/debug-macro.S . Unfortunately, I
> am unqualified to do that ...
I see...so may I do only fix
arch/arm/mach-s5p64x0/include/mach/debug-macro.S in my tree?
Or...need to fix other things?
Anyway, thanks for your linux-next ;-)
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply
* RE: linux-next: manual merge of the s5p tree with the arm tree
From: Kukjin Kim @ 2010-10-18 1:04 UTC (permalink / raw)
To: 'Stephen Rothwell'
Cc: linux-next, linux-kernel, 'Nicolas Pitre',
'Russell King'
In-Reply-To: <20101018105524.e2460535.sfr@canb.auug.org.au>
Stephen wrote:
>
> Hi Kukjin,
>
Hi ;-)
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s5p64x0/mach-smdk6440.c between commit
> 861bd81ee62a0d6759144c22909a8a3938951656 ("arm: remove
> machine_desc.io_pg_offst and .phys_io") from the arm tree and commit
> cae6a3066d19a0c8b69cb25ee42b949ad6fb8c66 ("ARM: S5P64X0: Move SMDK6440
> board file and Add SMDK6450 board file") from the s5p tree.
>
> I fixed it up (see below) and can carry the fix as necessary. I also
> applied the following merge fix patch:
>
Ok...thanks, if need any my handling, please let me know.
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 18 Oct 2010 10:52:24 +1100
> Subject: [PATCH] s5p: merge fix for removal of fielda from machine_desc
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-
> s5p64x0/mach-smdk6450.c
> index 8e98217..d609f5a 100644
> --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
> +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
> @@ -171,8 +171,6 @@ static void __init smdk6450_machine_init(void)
>
> MACHINE_START(SMDK6450, "SMDK6450")
> /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
> - .phys_io = S5P6450_PA_UART(0) & 0xfff00000,
> - .io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc,
> .boot_params = S5P64X0_PA_SDRAM + 0x100,
>
> .init_irq = s5p6450_init_irq,
> --
> 1.7.1
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-s5p64x0/mach-smdk6440.c
> index 59d9f5b,28de0a5..0000000
> --- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
> +++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
> @@@ -135,7 -152,9 +152,7 @@@ static void __init smdk6440_machine_ini
>
> MACHINE_START(SMDK6440, "SMDK6440")
> /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
> - .boot_params = S5P_PA_SDRAM + 0x100,
> - .phys_io = S5P6440_PA_UART(0) & 0xfff00000,
> - .io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc,
> + .boot_params = S5P64X0_PA_SDRAM + 0x100,
>
> .init_irq = s5p6440_init_irq,
> .map_io = smdk6440_map_io,
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply
* linux-next: build failure after merge of the pci tree
From: Stephen Rothwell @ 2010-10-18 2:20 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Tejun Heo
[-- Attachment #1: Type: text/plain, Size: 606 bytes --]
Hi Jesse,
After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/pci/hotplug/pciehp_core.c: In function 'pcied_init':
drivers/pci/hotplug/pciehp_core.c:348: error: implicit declaration of function 'alloc_ordered_workqueue'
That function is not declared anywhere except the (yet to be merged)
workqueues tree.
I have used the pci tree from next-20101015 for today.
Please build test what you are exporting for merging into linux-next.
--
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 pci tree
From: Jesse Barnes @ 2010-10-18 3:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Tejun Heo
In-Reply-To: <20101018132035.c506beff.sfr@canb.auug.org.au>
On Mon, 18 Oct 2010 13:20:35 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jesse,
>
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/pci/hotplug/pciehp_core.c: In function 'pcied_init':
> drivers/pci/hotplug/pciehp_core.c:348: error: implicit declaration of function 'alloc_ordered_workqueue'
>
> That function is not declared anywhere except the (yet to be merged)
> workqueues tree.
>
> I have used the pci tree from next-20101015 for today.
>
> Please build test what you are exporting for merging into linux-next.
Arg, sorry about that, I'll drop these and just ack them for inclusion
by Tejun.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply
* linux-next: build failure after merge of the sound-asoc tree
From: Stephen Rothwell @ 2010-10-18 3:29 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel, Peter Hsiang
[-- Attachment #1: Type: text/plain, Size: 3791 bytes --]
Hi all,
After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
sound/soc/codecs/max98088.c:28:28: error: sound/max98088.h: No such file or directory
sound/soc/codecs/max98088.c: In function 'max98088_setup_eq1':
sound/soc/codecs/max98088.c:1712: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1713: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1714: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1716: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1720: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1720: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1728: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1730: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1731: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1732: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1733: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1734: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c: In function 'max98088_setup_eq2':
sound/soc/codecs/max98088.c:1759: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1760: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1761: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1763: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1767: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1767: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1775: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1777: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1778: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1779: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1780: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1781: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c: In function 'max98088_put_eq_enum':
sound/soc/codecs/max98088.c:1800: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c: In function 'max98088_handle_eq_pdata':
sound/soc/codecs/max98088.c:1851: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1852: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1861: error: invalid use of undefined type 'struct max98088_eq_cfg'
sound/soc/codecs/max98088.c:1861: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1876: error: invalid use of undefined type 'struct max98088_eq_cfg'
sound/soc/codecs/max98088.c:1876: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c: In function 'max98088_handle_pdata':
sound/soc/codecs/max98088.c:1902: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1905: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1913: error: dereferencing pointer to incomplete type
sound/soc/codecs/max98088.c:1918: error: dereferencing pointer to incomplete type
Caused by commit e65d255a5a610ce9e185e0df855250706aca7c21 ("ASoC: Add
max98088 CODEC driver").
Please, please build test what you are submitting.
I have used the sound-asoc tree from next-20101015 for today.
--
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 sound-asoc tree
From: Stephen Rothwell @ 2010-10-18 3:39 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Takashi Iwai
Cc: linux-next, linux-kernel, Peter Hsiang
In-Reply-To: <20101018142934.65f5d0fa.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
Hi all,
On Mon, 18 Oct 2010 14:29:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the sound-asoc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> sound/soc/codecs/max98088.c:28:28: error: sound/max98088.h: No such file or directory
.
.
>
> Caused by commit e65d255a5a610ce9e185e0df855250706aca7c21 ("ASoC: Add
> max98088 CODEC driver").
>
> Please, please build test what you are submitting.
>
> I have used the sound-asoc tree from next-20101015 for today.
I have also had to use the version of the sound tree from next-20101015
since it had merged the sound-asoc tree.
--
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
* linux-next: manual merge of the xen tree with the swiotlb-xen tree
From: Stephen Rothwell @ 2010-10-18 4:52 UTC (permalink / raw)
To: Jeremy Fitzhardinge, Xen Devel
Cc: linux-next, linux-kernel, Konrad Rzeszutek Wilk, Andrew Morton,
Linus
[-- Attachment #1: Type: text/plain, Size: 708 bytes --]
Hi all,
Today's linux-next merge of the xen tree got conplex conflicts in
drivers/xen/events.c between several commits from the swiotlb-xen tree
and several commits from the xen tree.
I am unqualified to fix this mess, sorry. I am dropping the xen tree
for today (and only not dropping the swiotlb-xen tree because that would
be too much work).
I wonder, of course, why I have seen nothing in either of these trees
until today (less than a week before the merge window opens).
Please sort this mess out. I will drop the swiotlb-xen tree as well
tomorrow if nothing has changed.
--
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 sound-asoc tree
From: Mark Brown @ 2010-10-18 5:03 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next, linux-kernel, Peter Hsiang
In-Reply-To: <20101018142934.65f5d0fa.sfr@canb.auug.org.au>
On Mon, Oct 18, 2010 at 02:29:34PM +1100, Stephen Rothwell wrote:
> Please, please build test what you are submitting.
> I have used the sound-asoc tree from next-20101015 for today.
Pushed a reversion of the MAX98088 driver so this will be fixed
tomorrow.
^ permalink raw reply
* linux-next: manual merge of the tip tree with the swiotlb-xen tree
From: Stephen Rothwell @ 2010-10-18 5:28 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Konrad Rzeszutek Wilk,
Jeremy Fitzhardinge, Alex Nixon
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/xen/events.c between commits
c21c96b81d9fbe7b2f8e5531792a79fe5d62e737 ("xen: identity map gsi->irqs")
and 4c0acdf07475c087a49262bc69efdf8e68037e39 ("xen: Find an unbound irq
number in reverse order (high to low)") from the swiotlb-xen tree and
commit 77dff1c755c3218691e95e7e38ee14323b35dbdb ("x86: xen: Sanitise
sparse_irq handling") from the tip tree.
I did my best here (including "fixing" other introduced calls to
dynamic_irq_cleanup() - see below). I can carry this (or some better)
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/xen/events.c
index adad3a9,7d24b0d..0000000
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@@ -354,297 -336,33 +354,296 @@@ static void unmask_evtchn(int port
put_cpu();
}
+static int get_nr_hw_irqs(void)
+{
+ int ret = 1;
+
+#ifdef CONFIG_X86_IO_APIC
+ ret = get_nr_irqs_gsi();
+#endif
+
+ return ret;
+}
+
static int find_unbound_irq(void)
{
- int irq;
- struct irq_desc *desc;
+ struct irq_data *data;
+ int irq, res;
+ int start = get_nr_hw_irqs();
- for (irq = 0; irq < nr_irqs; irq++) {
+ if (start == nr_irqs)
+ goto no_irqs;
+
+ /* nr_irqs is a magic value. Must not use it.*/
+ for (irq = nr_irqs-1; irq > start; irq--) {
- desc = irq_to_desc(irq);
+ data = irq_get_irq_data(irq);
/* only 0->15 have init'd desc; handle irq > 16 */
- if (desc == NULL)
+ if (!data)
break;
- if (desc->chip == &no_irq_chip)
+ if (data->chip == &no_irq_chip)
break;
- if (desc->chip != &xen_dynamic_chip)
+ if (data->chip != &xen_dynamic_chip)
continue;
if (irq_info[irq].type == IRQT_UNBOUND)
- break;
+ return irq;
}
- if (irq == nr_irqs)
- panic("No available IRQ to bind to: increase nr_irqs!\n");
+ if (irq == start)
+ goto no_irqs;
- desc = irq_to_desc_alloc_node(irq, 0);
- if (WARN_ON(desc == NULL))
- return -1;
+ res = irq_alloc_desc_at(irq, 0);
- dynamic_irq_init_keep_chip_data(irq);
+ if (WARN_ON(res != irq))
+ return -1;
return irq;
+
+no_irqs:
+ panic("No available IRQ to bind to: increase nr_irqs!\n");
+}
+
+static bool identity_mapped_irq(unsigned irq)
+{
+ /* identity map all the hardware irqs */
+ return irq < get_nr_hw_irqs();
+}
+
+static void pirq_unmask_notify(int irq)
+{
+ struct physdev_eoi eoi = { .irq = irq };
+
+ if (unlikely(pirq_needs_eoi(irq))) {
+ int rc = HYPERVISOR_physdev_op(PHYSDEVOP_eoi, &eoi);
+ WARN_ON(rc);
+ }
+}
+
+static void pirq_query_unmask(int irq)
+{
+ struct physdev_irq_status_query irq_status;
+ struct irq_info *info = info_for_irq(irq);
+
+ BUG_ON(info->type != IRQT_PIRQ);
+
+ irq_status.irq = irq;
+ if (HYPERVISOR_physdev_op(PHYSDEVOP_irq_status_query, &irq_status))
+ irq_status.flags = 0;
+
+ info->u.pirq.flags &= ~PIRQ_NEEDS_EOI;
+ if (irq_status.flags & XENIRQSTAT_needs_eoi)
+ info->u.pirq.flags |= PIRQ_NEEDS_EOI;
+}
+
+static bool probing_irq(int irq)
+{
+ struct irq_desc *desc = irq_to_desc(irq);
+
+ return desc && desc->action == NULL;
+}
+
+static unsigned int startup_pirq(unsigned int irq)
+{
+ struct evtchn_bind_pirq bind_pirq;
+ struct irq_info *info = info_for_irq(irq);
+ int evtchn = evtchn_from_irq(irq);
+ int rc;
+
+ BUG_ON(info->type != IRQT_PIRQ);
+
+ if (VALID_EVTCHN(evtchn))
+ goto out;
+
+ bind_pirq.pirq = irq;
+ /* NB. We are happy to share unless we are probing. */
+ bind_pirq.flags = info->u.pirq.flags & PIRQ_SHAREABLE ?
+ BIND_PIRQ__WILL_SHARE : 0;
+ rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq);
+ if (rc != 0) {
+ if (!probing_irq(irq))
+ printk(KERN_INFO "Failed to obtain physical IRQ %d\n",
+ irq);
+ return 0;
+ }
+ evtchn = bind_pirq.port;
+
+ pirq_query_unmask(irq);
+
+ evtchn_to_irq[evtchn] = irq;
+ bind_evtchn_to_cpu(evtchn, 0);
+ info->evtchn = evtchn;
+
+out:
+ unmask_evtchn(evtchn);
+ pirq_unmask_notify(irq);
+
+ return 0;
+}
+
+static void shutdown_pirq(unsigned int irq)
+{
+ struct evtchn_close close;
+ struct irq_info *info = info_for_irq(irq);
+ int evtchn = evtchn_from_irq(irq);
+
+ BUG_ON(info->type != IRQT_PIRQ);
+
+ if (!VALID_EVTCHN(evtchn))
+ return;
+
+ mask_evtchn(evtchn);
+
+ close.port = evtchn;
+ if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0)
+ BUG();
+
+ bind_evtchn_to_cpu(evtchn, 0);
+ evtchn_to_irq[evtchn] = -1;
+ info->evtchn = 0;
+}
+
+static void enable_pirq(unsigned int irq)
+{
+ startup_pirq(irq);
+}
+
+static void disable_pirq(unsigned int irq)
+{
+}
+
+static void ack_pirq(unsigned int irq)
+{
+ int evtchn = evtchn_from_irq(irq);
+
+ move_native_irq(irq);
+
+ if (VALID_EVTCHN(evtchn)) {
+ mask_evtchn(evtchn);
+ clear_evtchn(evtchn);
+ }
+}
+
+static void end_pirq(unsigned int irq)
+{
+ int evtchn = evtchn_from_irq(irq);
+ struct irq_desc *desc = irq_to_desc(irq);
+
+ if (WARN_ON(!desc))
+ return;
+
+ if ((desc->status & (IRQ_DISABLED|IRQ_PENDING)) ==
+ (IRQ_DISABLED|IRQ_PENDING)) {
+ shutdown_pirq(irq);
+ } else if (VALID_EVTCHN(evtchn)) {
+ unmask_evtchn(evtchn);
+ pirq_unmask_notify(irq);
+ }
+}
+
+static int find_irq_by_gsi(unsigned gsi)
+{
+ int irq;
+
+ for (irq = 0; irq < nr_irqs; irq++) {
+ struct irq_info *info = info_for_irq(irq);
+
+ if (info == NULL || info->type != IRQT_PIRQ)
+ continue;
+
+ if (gsi_from_irq(irq) == gsi)
+ return irq;
+ }
+
+ return -1;
+}
+
+/* xen_allocate_irq might allocate irqs from the top down, as a
+ * consequence don't assume that the irq number returned has a low value
+ * or can be used as a pirq number unless you know otherwise.
+ *
+ * One notable exception is when xen_allocate_irq is called passing an
+ * hardware gsi as argument, in that case the irq number returned
+ * matches the gsi number passed as first argument.
+
+ * Note: We don't assign an
+ * event channel until the irq actually started up. Return an
+ * existing irq if we've already got one for the gsi.
+ */
+int xen_allocate_pirq(unsigned gsi, int shareable, char *name)
+{
+ int irq;
+ struct physdev_irq irq_op;
+
+ spin_lock(&irq_mapping_update_lock);
+
+ irq = find_irq_by_gsi(gsi);
+ if (irq != -1) {
+ printk(KERN_INFO "xen_allocate_pirq: returning irq %d for gsi %u\n",
+ irq, gsi);
+ goto out; /* XXX need refcount? */
+ }
+
+ /* If we are a PV guest, we don't have GSIs (no ACPI passed). Therefore
+ * we are using the !xen_initial_domain() to drop in the function.*/
+ if (identity_mapped_irq(gsi) || !xen_initial_domain()) {
+ irq = gsi;
+ irq_to_desc_alloc_node(irq, 0);
+ dynamic_irq_init(irq);
+ } else
+ irq = find_unbound_irq();
+
+ set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
+ handle_level_irq, name);
+
+ irq_op.irq = irq;
+ irq_op.vector = 0;
+
+ /* Only the privileged domain can do this. For non-priv, the pcifront
+ * driver provides a PCI bus that does the call to do exactly
+ * this in the priv domain. */
+ if (xen_initial_domain() &&
+ HYPERVISOR_physdev_op(PHYSDEVOP_alloc_irq_vector, &irq_op)) {
- dynamic_irq_cleanup(irq);
++ irq_free_desc(irq);
+ irq = -ENOSPC;
+ goto out;
+ }
+
+ irq_info[irq] = mk_pirq_info(0, gsi, irq_op.vector);
+ irq_info[irq].u.pirq.flags |= shareable ? PIRQ_SHAREABLE : 0;
+
+out:
+ spin_unlock(&irq_mapping_update_lock);
+
+ return irq;
+}
+
+int xen_destroy_irq(int irq)
+{
+ struct irq_desc *desc;
+ int rc = -ENOENT;
+
+ spin_lock(&irq_mapping_update_lock);
+
+ desc = irq_to_desc(irq);
+ if (!desc)
+ goto out;
+
+ irq_info[irq] = mk_unbound_info();
+
- dynamic_irq_cleanup(irq);
++ irq_free_desc(irq);
+
+out:
+ spin_unlock(&irq_mapping_update_lock);
+ return rc;
+}
+
+int xen_vector_from_irq(unsigned irq)
+{
+ return vector_from_irq(irq);
+}
+
+int xen_gsi_from_irq(unsigned irq)
+{
+ return gsi_from_irq(irq);
}
int bind_evtchn_to_irq(unsigned int evtchn)
^ permalink raw reply
* Re: linux-next: build failure after merge of the sound-asoc tree
From: Takashi Iwai @ 2010-10-18 5:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Liam Girdwood, linux-next, linux-kernel, Peter Hsiang
In-Reply-To: <20101018143925.9e104b48.sfr@canb.auug.org.au>
At Mon, 18 Oct 2010 14:39:25 +1100,
Stephen Rothwell wrote:
>
> Hi all,
>
> On Mon, 18 Oct 2010 14:29:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the sound-asoc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > sound/soc/codecs/max98088.c:28:28: error: sound/max98088.h: No such file or directory
> .
> .
> >
> > Caused by commit e65d255a5a610ce9e185e0df855250706aca7c21 ("ASoC: Add
> > max98088 CODEC driver").
> >
> > Please, please build test what you are submitting.
> >
> > I have used the sound-asoc tree from next-20101015 for today.
>
> I have also had to use the version of the sound tree from next-20101015
> since it had merged the sound-asoc tree.
Mark now fixed it (just removed the driver), and I pulled it to sound
tree, too. Sorry for inconvenience.
Takashi
^ permalink raw reply
* linux-next: manual merge of the usb tree with the mips tree
From: Stephen Rothwell @ 2010-10-18 6:06 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Anatolij Gustschin, David Daney,
Ralf Baechle
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/Kconfig between commit
cd97084c3aff6f1037e00ee711a872719b60441d ("USB: Add EHCI and OHCH glue
for OCTEON II SOCs") from the mips tree and commit
c67a807cb13570bfc7b78f53158d14a433c59591 ("USB: add USB EHCI support for
MPC5121 SoC") from the usb tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/host/Kconfig
index a03d688,bf2e7d2..0000000
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@@ -93,7 -93,8 +93,8 @@@ config USB_EHCI_TT_NEWSCHE
config USB_EHCI_BIG_ENDIAN_MMIO
bool
- depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX || CPU_CAVIUM_OCTEON)
+ depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || ARCH_IXP4XX || \
- XPS_USB_HCD_XILINX || PPC_MPC512x)
++ XPS_USB_HCD_XILINX || PPC_MPC512x || CPU_CAVIUM_OCTEON)
default y
config USB_EHCI_BIG_ENDIAN_DESC
^ permalink raw reply
* linux-next: manual merge of the usb tree with the mips tree
From: Stephen Rothwell @ 2010-10-18 6:09 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, David Daney, Ralf Baechle,
Anatolij Gustschin
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/Makefile between commit
cd97084c3aff6f1037e00ee711a872719b60441d ("USB: Add EHCI and OHCH glue
for OCTEON II SOCs") from the mips tree and commit
f668f1e9868f9bc1bed3d5df1701879ac89cc3ed ("USB: add platform glue driver
for FSL USB DR controller") from the usb tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/host/Makefile
index 36099ce,91c5a1b..0000000
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@@ -33,5 -33,4 +33,5 @@@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66
obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o
obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o
obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o
+obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
-
+ obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o
^ permalink raw reply
* linux-next: manual merge of the bkl-llseek tree with the wireless tree
From: Stephen Rothwell @ 2010-10-18 6:35 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel, John W. Linville, Felix Fietkau
Hi Arnd,
Today's linux-next merge of the bkl-llseek tree got a conflict in
drivers/net/wireless/ath/ath9k/debug.c between commit
772d5515635fef5bc7a9d0efee785b58b0181ee5 ("ath9k: make rate control
debugfs stats per station") from the wireless tree and commit
6038f373a3dc1f1c26496e60b6c40b164716f07e ("llseek: automatically
add .llseek fop") from the bkl-llseek tree.
The former moved some of the code modified by the latter to another file.
I added this merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Oct 2010 17:33:25 +1100
Subject: [PATCH] ath9k: fix up for .llseek fop change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/wireless/ath/ath9k/rc.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 0cee90c..e4c1ea3 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -1582,7 +1582,8 @@ static ssize_t read_file_rcstat(struct file *file, char __user *user_buf,
static const struct file_operations fops_rcstat = {
.read = read_file_rcstat,
.open = ath9k_debugfs_open,
- .owner = THIS_MODULE
+ .owner = THIS_MODULE,
+ .llseek = default_llseek,
};
static void ath_rate_add_sta_debugfs(void *priv, void *priv_sta,
--
1.7.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: build failure after merge of the final tree (mmc tree related)
From: Stephen Rothwell @ 2010-10-18 7:35 UTC (permalink / raw)
To: Chris Ball; +Cc: linux-next, linux-kernel, Wolfram Sang
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
Hi Chris,
After merging the scsi-post-merge tree, today's linux-next build ()
failed like this:
drivers/mmc/host/sdhci-of-esdhc.c:21:25: error: sdhci-esdhc.c: No such file or directory
drivers/mmc/host/sdhci-of-esdhc.c: In function 'esdhc_writeb':
drivers/mmc/host/sdhci-of-esdhc.c:51: error: 'ESDHC_HOST_CONTROL_RES' undeclared (first use in this function)
drivers/mmc/host/sdhci-of-esdhc.c:51: error: (Each undeclared identifier is reported only once
drivers/mmc/host/sdhci-of-esdhc.c:51: error: for each function it appears in.)
drivers/mmc/host/sdhci-of-esdhc.c: In function 'esdhc_of_enable_dma':
drivers/mmc/host/sdhci-of-esdhc.c:57: error: 'ESDHC_DMA_SYSCTL' undeclared (first use in this function)
drivers/mmc/host/sdhci-of-esdhc.c:57: error: 'ESDHC_DMA_SNOOP' undeclared (first use in this function)
drivers/mmc/host/sdhci-of-esdhc.c: At top level:
drivers/mmc/host/sdhci-of-esdhc.c:76: error: 'ESDHC_DEFAULT_QUIRKS' undeclared here (not in a function)
drivers/mmc/host/sdhci-of-esdhc.c:84: error: 'esdhc_set_clock' undeclared here (not in a function)
Caused by commit a2fe088a5aaa51b54c018cf309cdc728d5f4e540 ("mmc:
sdhci-of-esdhc: factor out common stuff").
This was clearly never build tested ...
I have reverted that commit for today.
--
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
* linux-next: build failure after merge of the final tree (net tree related)
From: Stephen Rothwell @ 2010-10-18 7:36 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, stephen hemminger
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
net/tipc/core.c:249: error: __ksymtab_tipc_get_mode causes a section type conflict
Caused by commit 31e3c3f6f1f9b154981a0e6620df700463db30ee ("tipc: cleanup
function namespace") which made the EXPORTed function tipc_get_mode() static.
I have reverted that commit for today.
--
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
* linux-next: Tree for October 18
From: Stephen Rothwell @ 2010-10-18 7:51 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 13835 bytes --]
Hi all,
Changes since 20101015:
Dropped tree: xen (complex conflict)
The davinci tree gained a conflict against the arm tree.
The msm tree gained a conflict against the arm tree.
The s5p tree gained conflicts against the arm tree.
The pci tree gained a build failure so I used the version from
next-20101015.
The net tree lost its build failure but gained another for which I
reverted a commit.
The sound-asoc tree gained a build failure so I used the version from
next-20101015 (also the sound tree which had merged the sound-asoc tree).
The mmc tree gained a build failure for which I reverted a commit.
The xen tree gained a complex conflict against the swiotlb-xen tree, so I
dropped the xen tree for today.
The tip tree gained a conflict against the swiotlb-xen tree.
The oprofile tree lost its conflicts.
The usb tree gained conflicts the mips tree.
The bkl-llseek tree lost a conflict, but gained another against the
wireless tree.
----------------------------------------------------------------------------
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 176 trees (counting Linus' and 22 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 arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/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 kbuild-current/rc-fixes
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
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 gcl-current/merge
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-cpuimx27.c
Merging davinci/davinci-next
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-da830-evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-da850-evm.c
Merging i.MX/for-next
Merging msm/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-msm/include/mach/debug-macro.S
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (rename/modify): Merge conflict in arch/arm/mach-s5p64x0/mach-smdk6440.c
CONFLICT (delete/modify): arch/arm/mach-s5p6440/include/mach/debug-macro.S deleted in s5p/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5p6440/include/mach/debug-macro.S left in tree.
$ git rm -f arch/arm/mach-s5p6440/include/mach/debug-macro.S
Applying: s5p: merge fix for removal of fielda from machine_desc
Merging tegra/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
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
Merging ubifs/linux-next
Merging xfs/master
Applying: xfs: fix up mismerge of __xfs_inode_clear_reclaim_tag
Merging vfs/for-next
Merging pci/linux-next
$ git reset --hard HEAD^
Merging refs/next/20101015/pci
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
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 ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging swiotlb-xen/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging wireless/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3pandora.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-zoom-peripherals.c
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/if_sdio.c
Merging bluetooth/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (delete/modify): drivers/ieee1394/eth1394.c deleted in HEAD and modified in bluetooth/master. Version bluetooth/master of drivers/ieee1394/eth1394.c left in tree.
$ git rm -f drivers/ieee1394/eth1394.c
Merging net/master
Merging mtd/master
Merging crypto/master
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
Merging sound-asoc/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dev-audio.c
CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/p1022_ds.c
CONFLICT (content): Merge conflict in drivers/video/sh_mobile_hdmi.c
$ git reset --hard HEAD^
Merging refs/next/20101015/sound-asoc
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dev-audio.c
CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/p1022_ds.c
CONFLICT (content): Merge conflict in drivers/video/sh_mobile_hdmi.c
[master d56d2c5] Merge commit 'refs/next/20101015/sound-asoc'
Merging sound/for-next
CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/p1022_ds.c
$ git reset --hard HEAD^
Merging refs/next/20101015/sound
Merging cpufreq/next
Merging quilt/rr
Merging input/next
CONFLICT (content): Merge conflict in drivers/input/keyboard/Kconfig
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ext4/mballoc.c
Applying: ext4: merge fix for blkdev_issue_zeroout API change
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/net/pcmcia/smc91c92_cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
CONFLICT (content): Merge conflict in drivers/char/sysrq.c
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/sh_mobile_sdhi.c
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r600_blit_kms.c
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in net/irda/irnet/irnet_ppp.c
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/ct-ca9x4.c
CONFLICT (content): Merge conflict in arch/arm/mm/flush.c
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
CONFLICT (content): Merge conflict in drivers/spi/Kconfig
CONFLICT (content): Merge conflict in drivers/spi/Makefile
Merging omap_dss2/for-next
Merging rcu/rcu/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/sh/kernel/perf_event.c
CONFLICT (content): Merge conflict in drivers/xen/events.c
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in net/core/dev.c
Merging oprofile/for-next
Merging edac-amd/for-next
Merging percpu/for-next
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in mm/percpu.c
Merging workqueues/for-next
CONFLICT (content): Merge conflict in fs/gfs2/main.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/rndis.c
CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/host/Makefile
Applying: scsi/sd: update for hw_sector_size rename
Merging staging-next/staging-next
CONFLICT (rename/modify): Merge conflict in drivers/misc/ti-st/st_core.c
CONFLICT (rename/modify): Merge conflict in drivers/misc/ti-st/st_kim.c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c
CONFLICT (content): Merge conflict in drivers/misc/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/batman-adv/hard-interface.c
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/Makefile deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/Makefile left in tree.
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/intel-mid-touch.c deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/intel-mid-touch.c left in tree.
CONFLICT (delete/modify): drivers/staging/ti-st/st.h deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/ti-st/st.h left in tree.
CONFLICT (delete/modify): drivers/staging/ti-st/st_core.h deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/ti-st/st_core.h left in tree.
$ git rm -f drivers/staging/mrst-touchscreen/Makefile drivers/staging/mrst-touchscreen/intel-mid-touch.c
$ git rm -f drivers/staging/ti-st/st.h drivers/staging/ti-st/st_core.h
Applying: staging: ath6kl: Fixing the driver to use modified mmc_host structure
Merging slabh/slabh
Merging bkl-trivial/trivial
CONFLICT (content): Merge conflict in drivers/block/ataflop.c
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4000_cs.c
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4040_cs.c
CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
Merging bkl-llseek/llseek
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/debug.c
Applying: ath9k: fix up for .llseek fop change
Merging bkl-vfs/vfs
CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c
CONFLICT (content): Merge conflict in fs/nilfs2/super.c
Merging bkl-config/config
CONFLICT (content): Merge conflict in fs/compat_ioctl.c
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
[master ef7b3a3] Revert "tipc: cleanup function namespace"
[master 72c9307] Revert "mmc: sdhci-of-esdhc: factor out common stuff"
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (net tree related)
From: David Miller @ 2010-10-18 8:06 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, shemminger
In-Reply-To: <20101018183616.ef5cde84.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Oct 2010 18:36:16 +1100
> net/tipc/core.c:249: error: __ksymtab_tipc_get_mode causes a section type conflict
>
> Caused by commit 31e3c3f6f1f9b154981a0e6620df700463db30ee ("tipc: cleanup
> function namespace") which made the EXPORTed function tipc_get_mode() static.
>
> I have reverted that commit for today.
Thanks I just pushed this fix:
--------------------
tipc: Kill tipc_get_mode() completely.
It's completely unused and exporting a static symbol
makes no sense and breaks the build.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/tipc/core.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/net/tipc/core.c b/net/tipc/core.c
index c005303..e2a09eb 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -96,11 +96,6 @@ int tipc_net_id;
int tipc_remote_management;
-static int tipc_get_mode(void)
-{
- return tipc_mode;
-}
-
/**
* tipc_buf_acquire - creates a TIPC message buffer
* @size: message size (including TIPC header)
@@ -246,7 +241,6 @@ MODULE_VERSION(TIPC_MOD_VER);
EXPORT_SYMBOL(tipc_attach);
EXPORT_SYMBOL(tipc_detach);
-EXPORT_SYMBOL(tipc_get_mode);
EXPORT_SYMBOL(tipc_createport);
EXPORT_SYMBOL(tipc_deleteport);
EXPORT_SYMBOL(tipc_ownidentity);
--
1.7.3.1
^ permalink raw reply related
* Re: linux-next: manual merge of the xen tree with the swiotlb-xen tree
From: Jeremy Fitzhardinge @ 2010-10-18 8:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Xen Devel, linux-next, linux-kernel, Konrad Rzeszutek Wilk,
Andrew Morton, Linus
In-Reply-To: <20101018155249.d9267bfe.sfr@canb.auug.org.au>
On 10/17/2010 09:52 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen tree got conplex conflicts in
> drivers/xen/events.c between several commits from the swiotlb-xen tree
> and several commits from the xen tree.
>
> I am unqualified to fix this mess, sorry. I am dropping the xen tree
> for today (and only not dropping the swiotlb-xen tree because that would
> be too much work).
Argh, sorry, I should have coordinated with Konrad. I'd merged my tree
into linux-next to make sure it was OK, but I guess I overlooked something.
> I wonder, of course, why I have seen nothing in either of these trees
> until today (less than a week before the merge window opens).
I had found Xen regressions that had made it into linux-next and wanted
to sort those out before adding anything else to the mix.
> Please sort this mess out. I will drop the swiotlb-xen tree as well
> tomorrow if nothing has changed.
Will do.
Thanks,
J
^ permalink raw reply
* Re: linux-next: manual merge of the msm tree with the arm tree
From: Russell King @ 2010-10-18 8:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Walker, linux-next, linux-kernel, Jeremy Kerr,
Jeff Ohlstein
In-Reply-To: <20101018110207.131b56ee.sfr@canb.auug.org.au>
On Mon, Oct 18, 2010 at 11:02:07AM +1100, Stephen Rothwell wrote:
> [ Just cc'ing Russell, sorry about that]
>
> On Mon, 18 Oct 2010 10:35:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi Daniel,
> >
> > Today's linux-next merge of the msm tree got a conflict in
> > arch/arm/mach-msm/include/mach/debug-macro.S between commit
> > 08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
> > virtual addresses from addruart") from the arm tree and commit
> > 46fe5f29e3062f681cc3cf07a604d82396faea89 ("msm: allow uart to be
> > conditionally disabled") from the msm tree.
> >
> > Just context changes. I fixed it up (see below) and can carry the fix as
> > necessary.
Thanks, but I don't think there's much which can be done about these.
Changes such as 08a610d affect all ARM sub-architectures, and as they're
spread across multiple git trees...
I think there's going to be some problems during this forthcoming merge
window.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply
* RE: linux-next: manual merge of the s5p tree with the arm tree
From: Kukjin Kim @ 2010-10-18 10:39 UTC (permalink / raw)
To: 'Stephen Rothwell'
Cc: linux-next, linux-kernel, 'Jeremy Kerr',
'Lorenzo Pieralisi', 'Jason Wang',
'Tony Lindgren', 'Russell King'
In-Reply-To: <20101018105046.368420c2.sfr@canb.auug.org.au>
Stephen wrote:
>
> Hi Kukjin,
>
Hi Stephen,
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s5p6440/include/mach/debug-macro.S between commit
> 08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
> virtual addresses from addruart") from the arm tree and commit
> 29159b7dd244def6e0073ff0e2d4cbb59599187f ("ARM: S5P64X0: Add S5P64X0
> (S5P6440 and S5P6450) initialization support") from the s5p tree.
>
> The latter removed the file modified by the former. I did that.
>
> The appropriate part of the above arm commit needs to be done for the new
> file arch/arm/mach-s5p64x0/include/mach/debug-macro.S . Unfortunately, I
> am unqualified to do that ...
I fixed it up and finished test on the board also..if any problems, please
let me know.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply
* Re: linux-next: manual merge of the xen tree with the swiotlb-xen tree
From: Konrad Rzeszutek Wilk @ 2010-10-18 13:55 UTC (permalink / raw)
To: Jeremy Fitzhardinge
Cc: Stephen Rothwell, Xen Devel, linux-next, linux-kernel,
Andrew Morton, Linus
In-Reply-To: <4CBC014D.7070302@goop.org>
On Mon, Oct 18, 2010 at 01:11:57AM -0700, Jeremy Fitzhardinge wrote:
> On 10/17/2010 09:52 PM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the xen tree got conplex conflicts in
> > drivers/xen/events.c between several commits from the swiotlb-xen tree
> > and several commits from the xen tree.
> >
> > I am unqualified to fix this mess, sorry. I am dropping the xen tree
> > for today (and only not dropping the swiotlb-xen tree because that would
> > be too much work).
Ugh. Let me revert the branch to pull this from to what it was a week ago.
That way Jeremy's tree should not have any trouble.
>
> Argh, sorry, I should have coordinated with Konrad. I'd merged my tree
> into linux-next to make sure it was OK, but I guess I overlooked something.
>
> > I wonder, of course, why I have seen nothing in either of these trees
> > until today (less than a week before the merge window opens).
That is my fault. I thought the merge window was this _week_ so I happily
pushed the trigger button.
Since I seem to have a knack for making mistakes, let me get some clarification
so that I won't do it again.
When is it Ok for me to put in the #linux-next, new stable features (so
reviewed, acked, etc)? a) Is it post rc7? b) Or is it when Linus releases
the kernel and Linus's merge window opens?
I was thinking it is a), b/c if it would be b), then there is just two weeks
to fix any fallout that might happen due to merging of vast new features.
>
> I had found Xen regressions that had made it into linux-next and wanted
> to sort those out before adding anything else to the mix.
>
> > Please sort this mess out. I will drop the swiotlb-xen tree as well
> > tomorrow if nothing has changed.
>
> Will do.
Sorry about this. Will definitly work this out.
>
> Thanks,
> J
^ permalink raw reply
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