Re: linux-next: build failure after merge of the v4l-dvb tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: build failure after merge of the v4l-dvb tree
Date	2017-02-03 01:10 +0100
Message-ID	<t6zBU-2Ay-9@gated-at.bofh.it> (permalink)
References	<t5v7k-2HW-7@gated-at.bofh.it> <t6y37-1w5-7@gated-at.bofh.it> <t6ymt-1Da-11@gated-at.bofh.it> <t6ywa-1GA-13@gated-at.bofh.it> <t6yZc-261-19@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Mauro,

On Thu, 2 Feb 2017 21:24:40 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
>
> 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

So maybe I should fetch those 2 branches separately and save you the
bother of merging them yourself?  There will be occasional conflicts,
but I get those with others trees as well.

> 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.

Unless you need to do that for your own testing.

-- 
Cheers,
Stephen Rothwell

Thread

linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-31 02:10 +0100
  Re: linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-02 23:30 +0100
    Re: linux-next: build failure after merge of the v4l-dvb tree Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2017-02-02 23:50 +0100
      Re: linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-03 00:00 +0100
        Re: linux-next: build failure after merge of the v4l-dvb tree Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2017-02-03 00:30 +0100
          Re: linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-03 01:10 +0100
            Re: linux-next: build failure after merge of the v4l-dvb tree Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2017-02-03 01:30 +0100
              Re: linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-05 23:20 +0100
                Re: linux-next: build failure after merge of the v4l-dvb tree Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2017-02-05 23:30 +0100

csiph-web