public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the microblaze tree with Linus' tree
@ 2013-05-09  0:35 Stephen Rothwell
  2013-05-09  6:55 ` Michal Simek
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2013-05-09  0:35 UTC (permalink / raw)
  To: Michal Simek; +Cc: linux-next, linux-kernel, Jiang Liu, Andrew Morton

[-- Attachment #1: Type: text/plain, Size: 600 bytes --]

Hi Michal,

Today's linux-next merge of the microblaze tree got a conflict in
arch/microblaze/mm/init.c between commit 7beb5987875b ("mm/microblaze:
use common help functions to free reserved pages") from Linus' tree and
commits 17408c87ba9e ("microblaze: Fix free_init_pages function") and
c5c09c08718b ("microblaze: Fix initrd support") from the microblaze tree.

I just used the version from Linus' tree (I am not sure if that is the
correct solution) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the microblaze tree with Linus' tree
@ 2011-07-26  1:46 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-07-26  1:46 UTC (permalink / raw)
  To: Michal Simek; +Cc: linux-next, linux-kernel, Benjamin Herrenschmidt

[-- Attachment #1: Type: text/plain, Size: 561 bytes --]

Hi Michal,

Today's linux-next merge of the microblaze tree got a conflict in
arch/microblaze/pci/pci_32.c between commit 98d9f30c820d ("pci/of: Match
PCI devices to OF nodes dynamically") from Linus' tree and commit
c9d761b7c4b6 ("microblaze: PCI fix typo fault in of_node pointer moving
into pci_bus") from the microblaze tree.

The former removed the line fixed up by the latter.  The file was then
removed in a later commit, 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	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the microblaze tree with Linus' tree
@ 2010-02-09  0:07 Stephen Rothwell
  2010-02-09  8:18 ` Michal Simek
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-02-09  0:07 UTC (permalink / raw)
  To: Michal Simek; +Cc: linux-next, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

Hi Michal,

Today's linux-next merge of the microblaze tree got a conflict in
arch/microblaze/kernel/setup.c between commit
a6013411118a6c8c34f1bd8b047b36fdf9711590 ("microblaze: Invalidate dcache
before enabling it") from Linus' tree and commit
578059c56c816db2b696a196d3656afc187c7edd ("microblaze: Move cache
function to cache.c") from the microblaze tree.

The microblaze tree version supercedes the version from Linus' tree, so I
used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-05-09  6:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-09  0:35 linux-next: manual merge of the microblaze tree with Linus' tree Stephen Rothwell
2013-05-09  6:55 ` Michal Simek
  -- strict thread matches above, loose matches on Subject: below --
2011-07-26  1:46 Stephen Rothwell
2010-02-09  0:07 Stephen Rothwell
2010-02-09  8:18 ` Michal Simek
2010-02-09 10:46   ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox