linux-kernel - Re: linux-next: manual merge of the slave-dma tree with the pm, mfd and rtc trees

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: <20150903082046.GX13546@localhost>
Date:	Thu, 3 Sep 2015 13:50:46 +0530
From:	Vinod Koul <vinod.koul@...el.com>
To:	Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	"Rafael J. Wysocki" <rjw@...ysocki.net>,
	Lee Jones <lee.jones@...aro.org>,
	Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
	Linux-Next <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Subject: Re: linux-next: manual merge of the slave-dma tree with the pm, mfd
 and rtc trees

On Tue, Sep 01, 2015 at 09:17:25AM +0200, Geert Uytterhoeven wrote:
> On Thu, Aug 27, 2015 at 5:24 AM, Vinod Koul <vinod.koul@...el.com> wrote:
> > On Thu, Aug 27, 2015 at 11:26:45AM +1000, Stephen Rothwell wrote:
> >> Hi Vinod,
> >>
> >> Today's linux-next merge of the slave-dma tree got conflicts in:
> >>
> >>   drivers/dma/Kconfig
> >>   drivers/dma/Makefile
> >>
> >> between commit:
> >>
> >>   667dfed98615 ("dmaengine: add a driver for Intel integrated DMA 64-bit")
> >>
> >> from the pm, mfd and rtc trees and commits:
> >>
> >>   3c21619077be ("dmaengine: sort the Kconfig")
> >>   7e97229b3920 ("dmaengine: sort the makefile")
> >>
> >> from the slave-dma tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> >
> > Thanks Stephen,
> >
> > I looked at this and merge is sorted, so looks good to me
> 
> Sorted by Kconfig symbol or by name?

I did by symbols. That also reminds me that we are not consistent in our
symbols, right now seems free for all. Ideally we should all be DMA_xxxx


-- 
~Vinod
--
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/