linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the akpm tree with the mips tree
@ 2019-02-11  6:42 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2019-02-11  6:42 UTC (permalink / raw)
  To: Andrew Morton, Ralf Baechle, James Hogan
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Paul Burton,
	Davidlohr Bueso

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

Hi all,

Today's linux-next merge of the akpm tree got a conflict in:

  arch/mips/mm/c-r4k.c

between commit:

  3315b6b336c8 ("MIPS: Delete unused flush_cache_sigtramp()")

from the mips tree and commit:

   "arch/mips/mm/c-r4k.c: do not use mmap_sem for gup_fast()"

from the akpm tree.

I fixed it up (the former removed the function modified by the latter, so
I just dropped the latter patch) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* linux-next: manual merge of the akpm tree with the mips tree
@ 2015-03-31 12:35 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-03-31 12:35 UTC (permalink / raw)
  To: Andrew Morton, Ralf Baechle; +Cc: linux-next, linux-kernel, Joshua Kinard

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/mips/sgi-ip32/ip32-platform.c between commit 2045a53b8e3f ("MIPS:
IP32: ip32-platform is not a module") from the mips tree and commit
8076ee8258d6 ("mips: ip32: add platform data hooks to use DS1685
driver") from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc arch/mips/sgi-ip32/ip32-platform.c
index 94191a19588d,ec9eb7f3c628..000000000000
--- a/arch/mips/sgi-ip32/ip32-platform.c
+++ b/arch/mips/sgi-ip32/ip32-platform.c
@@@ -97,10 -108,38 +107,34 @@@ static struct resource ip32_rtc_resourc
  	}
  };
  
- static __init int sgio2_cmos_devinit(void)
+ 
+ /* RTC registers on IP32 are each padded by 256 bytes (0x100). */
+ static struct ds1685_rtc_platform_data
+ ip32_rtc_platform_data[] = {
+ 	{
+ 		.regstep = 0x100,
+ 		.bcd_mode = true,
+ 		.no_irq = false,
+ 		.uie_unsupported = false,
+ 		.alloc_io_resources = true,
+ 		.plat_prepare_poweroff = ip32_prepare_poweroff,
+ 	},
+ };
+ 
+ struct platform_device ip32_rtc_device = {
+ 	.name			= "rtc-ds1685",
+ 	.id			= -1,
+ 	.dev			= {
+ 		.platform_data	= ip32_rtc_platform_data,
+ 	},
+ 	.num_resources		= ARRAY_SIZE(ip32_rtc_resources),
+ 	.resource		= ip32_rtc_resources,
+ };
+ 
+ static int __init sgio2_rtc_devinit(void)
  {
- 	return IS_ERR(platform_device_register_simple("rtc_cmos", -1,
- 						      sgio2_cmos_rsrc, 1));
+ 	return platform_device_register(&ip32_rtc_device);
+ 
  }
  
- device_initcall(sgio2_cmos_devinit);
+ device_initcall(sgio2_rtc_devinit);
 -
 -MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
 -MODULE_LICENSE("GPL");
 -MODULE_DESCRIPTION("IP32 platform setup for SGI IP32 aka O2");

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-02-11  6:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-11  6:42 linux-next: manual merge of the akpm tree with the mips tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2015-03-31 12:35 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).