* Re: linux-next: manual merge of the akpm-current tree with the renesas tree [not found] <20140226182700.4001291b522f958a8da83f58@canb.auug.org.au> @ 2014-02-26 8:46 ` Uwe Kleine-König 2014-03-03 4:27 ` Simon Horman 0 siblings, 1 reply; 2+ messages in thread From: Uwe Kleine-König @ 2014-02-26 8:46 UTC (permalink / raw) To: Stephen Rothwell; +Cc: Andrew Morton, Simon Horman, linux-next, Magnus Damm Hello Stephen, On Wed, Feb 26, 2014 at 06:27:00PM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the akpm-current tree got a conflict in > arch/arm/mach-shmobile/Kconfig between commits 2b2e7c65166a ("ARM: > shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791") and 4a51856b4267 > ("ARM: shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791") from the > renesas tree and commit b096b0b50c4b ("Kconfig: rename HAS_IOPORT to > HAS_IOPORT_MAP") from the akpm-current tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > > (I am not sure why that commit appears twice in the renesas tree) The two commits (4a51856b4267 and 2b2e7c65166a) both base on top of v3.14-rc1, but it seems it's just the CommitData that is different beween the twos. The relevant history can be seen in git log --boundary --graph --oneline 5ffd11e972c4~2..5ffd11e972c4 -- arch/arm/mach-shmobile/Kconfig This shows that heads/defconfig-for-v3.15, heads/soc-for-v3.15 and heads/boards-for-v3.15 where pulled into Simon's devel branch twice. While heads/defconfig-for-v3.15 is identical in both merges, heads/soc-for-v3.15 was rewritten and heads/boards-for-v3.15 got an additional patch. Simon: if you want to fix that in your branch, the most easiest option is probably: git filter-branch -f --parent-filter 'sed s/4a51856b42672cfcb7d6fbab22dcf2caba2be5ab/2b2e7c65166aa4a7d6ca0352b249b38b45680d45/' v3.14-rc1..branch1 branch2 branch3 for all branches that contain 4a51856b4267. (Or alternatively substitute in the opposite direction if you want to drop 2b2e7c65166a instead.) > -- > Cheers, > Stephen Rothwell sfr@canb•auug.org.au > > diff --cc arch/arm/mach-shmobile/Kconfig > index 57069c12f9a4,dac2941fa383..000000000000 > --- a/arch/arm/mach-shmobile/Kconfig > +++ b/arch/arm/mach-shmobile/Kconfig > @@@ -13,8 -13,7 +13,8 @@@ config ARCH_SHMOBILE_MULT > select ARM_GIC > select MIGHT_HAVE_CACHE_L2X0 > select MIGHT_HAVE_PCI > + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE > - select NO_IOPORT > + select NO_IOPORT_MAP > select PINCTRL > select ARCH_REQUIRE_GPIOLIB > select CLKDEV_LOOKUP Obviously looks right. Thanks. Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the akpm-current tree with the renesas tree 2014-02-26 8:46 ` linux-next: manual merge of the akpm-current tree with the renesas tree Uwe Kleine-König @ 2014-03-03 4:27 ` Simon Horman 0 siblings, 0 replies; 2+ messages in thread From: Simon Horman @ 2014-03-03 4:27 UTC (permalink / raw) To: Uwe Kleine-König Cc: Stephen Rothwell, Andrew Morton, linux-next, Magnus Damm On Wed, Feb 26, 2014 at 09:46:27AM +0100, Uwe Kleine-König wrote: > Hello Stephen, > > On Wed, Feb 26, 2014 at 06:27:00PM +1100, Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in > > arch/arm/mach-shmobile/Kconfig between commits 2b2e7c65166a ("ARM: > > shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791") and 4a51856b4267 > > ("ARM: shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791") from the > > renesas tree and commit b096b0b50c4b ("Kconfig: rename HAS_IOPORT to > > HAS_IOPORT_MAP") from the akpm-current tree. > > > > I fixed it up (see below) and can carry the fix as necessary (no action > > is required). > > > > (I am not sure why that commit appears twice in the renesas tree) > The two commits (4a51856b4267 and 2b2e7c65166a) both base on top of > v3.14-rc1, but it seems it's just the CommitData that is different > beween the twos. The relevant history can be seen in > > git log --boundary --graph --oneline 5ffd11e972c4~2..5ffd11e972c4 -- arch/arm/mach-shmobile/Kconfig > > This shows that heads/defconfig-for-v3.15, heads/soc-for-v3.15 and > heads/boards-for-v3.15 where pulled into Simon's devel branch twice. > While heads/defconfig-for-v3.15 is identical in both merges, > heads/soc-for-v3.15 was rewritten and heads/boards-for-v3.15 got an > additional patch. > > Simon: if you want to fix that in your branch, the most easiest option > is probably: > > git filter-branch -f --parent-filter 'sed s/4a51856b42672cfcb7d6fbab22dcf2caba2be5ab/2b2e7c65166aa4a7d6ca0352b249b38b45680d45/' v3.14-rc1..branch1 branch2 branch3 > > for all branches that contain 4a51856b4267. (Or alternatively > substitute in the opposite direction if you want to drop 2b2e7c65166a > instead.) Thanks. I believe that I have removed the duplicate commits. > > > -- > > Cheers, > > Stephen Rothwell sfr@canb•auug.org.au > > > > diff --cc arch/arm/mach-shmobile/Kconfig > > index 57069c12f9a4,dac2941fa383..000000000000 > > --- a/arch/arm/mach-shmobile/Kconfig > > +++ b/arch/arm/mach-shmobile/Kconfig > > @@@ -13,8 -13,7 +13,8 @@@ config ARCH_SHMOBILE_MULT > > select ARM_GIC > > select MIGHT_HAVE_CACHE_L2X0 > > select MIGHT_HAVE_PCI > > + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE > > - select NO_IOPORT > > + select NO_IOPORT_MAP > > select PINCTRL > > select ARCH_REQUIRE_GPIOLIB > > select CLKDEV_LOOKUP > Obviously looks right. Thanks. > > Uwe > > -- > Pengutronix e.K. | Uwe Kleine-König | > Industrial Linux Solutions | http://www.pengutronix.de/ | > ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-03 4:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20140226182700.4001291b522f958a8da83f58@canb.auug.org.au>
2014-02-26 8:46 ` linux-next: manual merge of the akpm-current tree with the renesas tree Uwe Kleine-König
2014-03-03 4:27 ` Simon Horman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox