linux-kernel - Re: linux-next: manual merge of the pcmcia tree with the arm 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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20091202115649.GA2150@rainbow>
Date:	Wed, 2 Dec 2009 14:56:49 +0300
From:	Dmitry Artamonow <mad_soft@...ox.ru>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Dominik Brodowski <linux@...inikbrodowski.net>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the pcmcia tree with the arm tree

On 14:03 Tue 01 Dec     , Stephen Rothwell wrote:
> Hi Dominik,
> 
> Today's linux-next merge of the pcmcia tree got a conflict in
> drivers/pcmcia/sa1100_h3600.c between commit
> 6ce8f65e71f0d80ee23b543be09789dd865a99be ("ARM: 5811/1: pcmcia: convert
> sa1100_h3600 driver to gpiolib") from the arm tree and commit
> 66024db57d5b9011e274b314affad68f370c0d6f ("PCMCIA: stop duplicating
> pci_irq in soc_pcmcia_socket") from the pcmcia tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.  Please
> check the fix below.

Fix looks good to me, and testing next-20091201 on real device (h3600)
shows no problems with pcmcia.

Perhaps this merge conflict can be avoided by merging Russell's PCMCIA
patches through arm tree. But, anyway, it's Russell and Dominik
to decide.

-- 
Best regards,
Dmitry "MAD" Artamonow

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/