linux-kernel - Re: [GIT PULL] mfd: Patches due for the v3.12 merge window

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 for Android: free password hash cracker in your pocket

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

Message-ID: <20130731002022.GA20812@zurbaran>
Date:	Wed, 31 Jul 2013 02:20:23 +0200
From:	Samuel Ortiz <sameo@...ux.intel.com>
To:	Lee Jones <lee.jones@...aro.org>
Cc:	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] mfd: Patches due for the v3.12 merge window

Hi Lee,

On Tue, Jul 30, 2013 at 01:28:02PM +0100, Lee Jones wrote:
> The following changes since commit 7b9f21e6a4051bb470d62b0601501376f9fc7db7:
> 
>   Merge tag 'mfd-3.11-1' of
> git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next into
> mfd-3.11-merge (2013-07-08 23:52:21 +0200)
> 
> are available in the git repository at:
> 
> 
>   git://git.linaro.org/people/ljones/mfd.git for-mfd-next
> 
> for you to fetch changes up to 50ef27e35c4fd91d40174a8bfd8220881376733e:
> 
>   mfd: ucb1x00: Explicitely include linux/device.h (2013-07-24 13:28:29 +0100)
I tried to pull those ones on top of a 3.11-rc3 tag and I had a merge
conflict.
So I rebased and applied them on top of 3.11-rc3 instead. Thanks a
bunch.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
--
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/