From: Grant Likely <grant.likely@secretlab•ca>
To: Mauro Carvalho Chehab <m.chehab@samsung•com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard•com>,
Mark Brown <broonie@kernel•org>, Greg KH <greg@kroah•com>,
Philipp Zabel <p.zabel@pengutronix•de>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the staging tree with the tree
Date: Thu, 20 Mar 2014 18:51:01 +0000 [thread overview]
Message-ID: <20140320185101.ED471C4067A@trevor.secretlab.ca> (raw)
In-Reply-To: <20140320140933.4218df22@samsung.com>
On Thu, 20 Mar 2014 14:09:33 -0300, Mauro Carvalho Chehab <m.chehab@samsung•com> wrote:
> Em Thu, 20 Mar 2014 15:44:01 +0000
> Grant Likely <grant.likely@secretlab•ca> escreveu:
>
> > On Thu, 13 Mar 2014 10:17:56 +0100, Laurent Pinchart <laurent.pinchart@ideasonboard•com> wrote:
> > > Hi Mark,
> > >
> > > On Thursday 13 March 2014 00:50:26 Mark Brown wrote:
> > > > Hi Greg,
> > > >
> > > > Today's linux-next merge of the staging tree got a conflict in
> > > > drivers/media/v4l2-core/v4l2-of.c between commit b9db140c1e4644d
> > > > ("[media] v4l: of: Support empty port nodes") from the v4l tree and
> > > > commit fd9fdb78a9bf ("[media] of: move graph helpers from
> > > > drivers/media/v4l2-core to drivers/of") from the staging tree.
> > > >
> > > > I fixed it up by essentially dropping the support for empty port nodes
> > > > since there were more context differences than I was comfortable with
> > > > in the changes in the new code.
> > >
> > > If I'm not mistaken the move of drivers/media/v4l2-core/v4l2-of.c to
> > > drivers/of/of-graph.c has been canceled for v3.15 and related patches should
> > > be dropped from the for-next branches in the very near future (the v4l tree
> > > has already been rebased).
> >
> > I had not actually asked Mauro to revert,
>
> See:
> https://lkml.org/lkml/2014/3/10/283
>
> There, you literally answered me that:
> "All trees containing the branch would need to be reverted."
"would" being the operative word. I then went on to say that because it
is messy, I would be okay with leaving it as is if my concerns are
addressed.
Sorry for the confusion.
g.
> and:
> "It means any tree containing that branch *must* be rewound."
>
> That's what I (unhappily) did.
>
> I won't reapply this series, but, instead, I'll simply wait for the
> staging tree to be merged before sending those patches upstream,
> before sending the topic branch with exynos 5 patches that depend on it.
>
> This way, I can add Stephen patch on such topic branch, to avoid
> compilation breakages after merged.
>
> > but the branch is still in rmk's
> > tree and linux-next. I do not think it needs to be cancelled.
>
> > I do still have issues about it as a generic pattern, but I'm happy with
> > the discussion so far and the documentation will be sorted before the
> > next kernel is released.
> >
> > g.
>
> Regards,
> Mauro
next prev parent reply other threads:[~2014-03-20 18:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-13 0:50 linux-next: manual merge of the staging tree with the tree Mark Brown
2014-03-13 9:17 ` Laurent Pinchart
2014-03-20 15:44 ` Grant Likely
2014-03-20 17:09 ` Mauro Carvalho Chehab
2014-03-20 18:51 ` Grant Likely [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-12-02 20:17 Mark Brown
2015-12-02 22:07 ` Greg KH
2015-12-03 0:07 ` Mark Brown
2014-08-01 6:21 Stephen Rothwell
2014-08-01 7:38 ` Greg KH
2014-07-11 5:21 Stephen Rothwell
2014-07-11 5:32 ` Sachin Kamat
2014-07-11 6:10 ` Stephen Rothwell
2014-07-11 6:22 ` Sachin Kamat
2014-07-12 16:53 ` Greg KH
2014-03-12 1:37 Mark Brown
2014-03-12 1:32 Mark Brown
2014-03-12 1:49 ` Greg KH
2014-03-12 1:27 Mark Brown
2014-03-12 1:48 ` Greg KH
2010-11-10 2:24 Stephen Rothwell
2010-11-10 18:40 ` Greg KH
2009-03-19 10:12 Stephen Rothwell
2009-03-19 15:32 ` Greg KH
2009-03-19 15:53 ` Greg KH
2009-03-19 21:42 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140320185101.ED471C4067A@trevor.secretlab.ca \
--to=grant.likely@secretlab$(echo .)ca \
--cc=broonie@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=laurent.pinchart@ideasonboard$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=m.chehab@samsung$(echo .)com \
--cc=p.zabel@pengutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox