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

Message-ID: <20140710161205.GB20239@kroah.com>
Date:	Thu, 10 Jul 2014 09:12:05 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sachin Kamat <sachin.kamat@...sung.com>
Subject: Re: linux-next: manual merge of the akpm tree with the staging tree

On Thu, Jul 10, 2014 at 04:27:50PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/staging/emxx_udc/emxx_udc.c between commit 6de2a1a7b9e2
> ("staging: emxx_udc: Fix build error") from the staging tree and commit
> "drivers/staging/emxx_udc/emxx_udc.c: replace strict_strto() with
> kstrto()" from the akpm tree.
> 
> I fixed it up (I just used the version from the staging tree) and can
> carry the fix as necessary (no action is required).

Sounds good, thanks.

greg k-h
--
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/