All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rainer Koenig <Rainer.Koenig@ts.fujitsu.com>
To: dri-devel@lists.freedesktop.org
Subject: 2 questions about git and merging
Date: Tue, 26 May 2015 15:09:04 +0200	[thread overview]
Message-ID: <55647070.70909@ts.fujitsu.com> (raw)

Hi,

a week ago I experienced problems on the skylake platform and got the
adivce to try out the drm-intel-nightly branch. I tried and it was a
success.

So after the initial "git clone" of the tree I tried to keep updated by
doing a "git pull" from time to time, but what's really strange is that
I got merge conflicts, usually in the file integration-manifest, but
sometimes also in source files.

That's looks somewhat weird because I didn't touch any of the files in
the tree and I thought that after cloning a frequent "git pull" will
keep me up to date without the need to resolve merge conflicts.

What is wrong with my thought? What did I do wrong?

Second, I pulled the "Linus"-tree today and found some log entries that
said
 Merge branch 'drm-fixes-4.1' of
git://people.freedesktop.org/~agd5f/linux into drm-fixes

and
 Merge tag 'drm-intel-fixes-2015-05-21' of
git://anongit.freedesktop.org/drm-intel into drm-fixes

So I assumed, that the fix I proved to work one week ago now should also
be available in the "vanilla" tree. So I compiled that on my test
machine and got my bug back. :-(

So my other question is, how do fixes from drm-intel-nightly find their
weay into the "vanilla" linux tree? Is there some sort of process
description.

Thanks for any explanation
Rainer
-- 
Dipl.-Inf. (FH) Rainer Koenig
Project Manager Linux Clients
Dept. PDG WPS R&D SW OSE

Fujitsu Technology Solutions
Bürgermeister-Ullrich-Str. 100
86199 Augsburg
Germany

Telephone: +49-821-804-3321
Telefax:   +49-821-804-2131
Mail:      mailto:Rainer.Koenig@ts.fujitsu.com

Internet         ts.fujtsu.com
Company Details  ts.fujitsu.com/imprint.html
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

             reply	other threads:[~2015-05-26 13:09 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-26 13:09 Rainer Koenig [this message]
2015-05-26 14:04 ` 2 questions about git and merging Daniel Vetter
2015-05-26 15:17   ` Jani Nikula
2015-05-27  5:03     ` Rainer Koenig
2015-05-27  5:14     ` Dave Airlie
2015-05-27  6:24       ` Jani Nikula
2015-05-27  9:28         ` Daniel Vetter
2015-05-27  4:55   ` Rainer Koenig

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=55647070.70909@ts.fujitsu.com \
    --to=rainer.koenig@ts.fujitsu.com \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.