linux-kernel - Re: linux-next: build failure after merge of the v4l-dvb 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]

Date:   Thu, 2 Feb 2017 21:24:40 -0200
From:   Mauro Carvalho Chehab <mchehab@....samsung.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Sean Young <sean@...s.org>
Subject: Re: linux-next: build failure after merge of the v4l-dvb tree

Em Fri, 3 Feb 2017 09:59:34 +1100
Stephen Rothwell <sfr@...b.auug.org.au> escreveu:

> Hi Mauro,
> 
> On Thu, 2 Feb 2017 20:46:20 -0200 Mauro Carvalho Chehab <mchehab@....samsung.com> wrote:
> >
> > Gah, forgot to push the fix on the -next branch. Should be ok now.  
> 
> What I fetch for the v4l-dvb tree is the master branch of
> git://linuxtv.org/mchehab/media-next.git

I actually push the patches on a different tree:
	git://linuxtv.org/media_tree.git

At the branches "master" and "fixes", where

master - for rolling develoment patches
fixes - for bug fixes against current -rc release

My current procedure is to manually merge both branches
at git://linuxtv.org/mchehab/media-next.git, but this is a manual
work, that I use to do by the end of the days I merge patches.
Unfortunately, sometimes, I got side-tracked by something and
I forget to do such manual merge.

-- 
Thanks,
Mauro