All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
	Simon Horman <horms+renesas@verge.net.au>,
	Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Subject: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Date: Thu, 29 Aug 2013 12:48:14 +1000	[thread overview]
Message-ID: <20130829124814.2c2547a15b5e8927a4a805a1@canb.auug.org.au> (raw)

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

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-shmobile/board-bockw.c between commit fa3e0cee12fb ("ARM:
shmobile: BOCK-W: fix SDHI0 PFC settings") from Linus' tree and commit
9c43952d0f1e ("[media] ARM: shmobile: BOCK-W: add VIN and ML86V7667
support") from the v4l-dvb 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/arm/mach-shmobile/board-bockw.c
index 3354a85,7d44f66..0000000
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@@ -167,13 -188,17 +188,23 @@@ static const struct pinctrl_map bockw_p
  				  "usb1", "usb1"),
  	/* SDHI0 */
  	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 -				  "sdhi0", "sdhi0"),
 +				  "sdhi0_data4", "sdhi0"),
 +	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +				  "sdhi0_ctrl", "sdhi0"),
 +	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +				  "sdhi0_cd", "sdhi0"),
 +	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +				  "sdhi0_wp", "sdhi0"),
+ 	/* VIN0 */
+ 	PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
+ 				  "vin0_clk", "vin0"),
+ 	PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
+ 				  "vin0_data8", "vin0"),
+ 	/* VIN1 */
+ 	PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
+ 				  "vin1_clk", "vin1"),
+ 	PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
+ 				  "vin1_data8", "vin1"),
  };
  
  #define FPGA	0x18200000

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

             reply	other threads:[~2013-08-29  2:48 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-29  2:48 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-10-01  0:33 linux-next: manual merge of the v4l-dvb tree with Linus' tree Stephen Rothwell
2021-10-01  6:46 ` Sean Young
2019-06-24  1:36 Stephen Rothwell
2019-06-06  0:43 Stephen Rothwell
2019-05-23 23:21 Stephen Rothwell
2019-01-31 23:22 Stephen Rothwell
2019-01-31 23:27 ` Stephen Rothwell
2016-08-04  1:02 Stephen Rothwell
2015-09-07 23:20 Stephen Rothwell
2015-04-21  1:54 Stephen Rothwell
2015-04-21  7:49 ` Laurent Pinchart
2015-04-21  8:02   ` Stephen Rothwell
2015-04-21  9:56     ` Mauro Carvalho Chehab
2015-04-21 12:38       ` Laurent Pinchart
2015-04-21 13:12         ` Mauro Carvalho Chehab
2015-04-21 13:36           ` Philipp Zabel
2015-04-21  1:50 Stephen Rothwell
2015-04-10  3:53 Stephen Rothwell
2014-01-14  0:50 Stephen Rothwell
2012-10-02  1:13 Stephen Rothwell
2012-06-19  1:29 Stephen Rothwell
2012-06-19 10:06 ` Jiri Kosina
2012-06-19 11:50   ` Hans de Goede
2012-06-19 11:52     ` Jiri Kosina
2011-07-29  3:17 Stephen Rothwell
2011-07-29  4:10 ` Mauro Carvalho Chehab
2011-07-29  7:29   ` Stephen Rothwell
2011-04-08  3:27 Stephen Rothwell
2011-03-22  1:00 Stephen Rothwell
2010-07-06  2:01 Stephen Rothwell
2010-05-13  1:52 Stephen Rothwell
2010-05-10  0:36 Stephen Rothwell
2010-05-11 23:23 ` Mauro Carvalho Chehab
2010-05-12  0:23   ` Stephen Rothwell
2010-05-10  0:32 Stephen Rothwell
2010-05-11  5:19 ` Hiremath, Vaibhav
2010-05-10  0:29 Stephen Rothwell
2010-04-07  1:00 Stephen Rothwell
2010-04-09  5:22 ` Mauro Carvalho Chehab
2010-04-09  7:13   ` Stephen Rothwell
2009-09-02  2:17 Stephen Rothwell
2009-09-03  2:12 ` Mauro Carvalho Chehab
2009-09-03  6:49   ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130829124814.2c2547a15b5e8927a4a805a1@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=horms+renesas@verge.net.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mchehab@infradead.org \
    --cc=sergei.shtylyov@cogentembedded.com \
    --cc=vladimir.barinov@cogentembedded.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.