linux-kernel - linux-next: manual merge of the pinctrl tree with the watchdog tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20140117161834.797f4a7e019e51e756750613@canb.auug.org.au>
Date:	Fri, 17 Jan 2014 16:18:34 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus Walleij <linus.walleij@...aro.org>,
	Wim Van Sebroeck <wim@...ana.be>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sherman Yin <syin@...adcom.com>,
	Markus Mayer <markus.mayer@...aro.org>
Subject: linux-next: manual merge of the pinctrl tree with the watchdog tree

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in
arch/arm/configs/bcm_defconfig between commit bd90ccd42c5d ("watchdog:
bcm281xx: Watchdog Driver") from the watchdog tree and commit
54b1aa5a5b16 ("ARM: pinctrl: Add Broadcom Capri pinctrl driver") from the
pinctrl tree.

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

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

diff --cc arch/arm/configs/bcm_defconfig
index 176e842308a8,bede51171d98..000000000000
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@@ -125,6 -126,4 +125,7 @@@ CONFIG_CRC_ITU_T=
  CONFIG_CRC7=y
  CONFIG_XZ_DEC=y
  CONFIG_AVERAGE=y
 +CONFIG_WATCHDOG=y
 +CONFIG_BCM_KONA_WDT=y
 +CONFIG_BCM_KONA_WDT_DEBUG=y
+ CONFIG_PINCTRL_CAPRI=y

Content of type "application/pgp-signature" skipped