From: Hans de Goede <hdegoede@redhat.com>
To: Daniel Vetter <daniel@ffwll.ch>,
Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
"open list:REAL TIME CLOCK (RTC) SUBSYSTEM"
<linux-rtc@vger.kernel.org>,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Mark Gross <mgross@linux.intel.com>,
LINUX-WATCHDOG <linux-watchdog@vger.kernel.org>,
"open list:GPIO SUBSYSTEM" <linux-gpio@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
Platform Driver <platform-driver-x86@vger.kernel.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Guenter Roeck <linux@roeck-us.net>
Subject: Re: [GIT PULL] ib-drm-gpio-pdx86-rtc-wdt-v5.12-1
Date: Thu, 4 Feb 2021 11:50:03 +0100 [thread overview]
Message-ID: <797cf4ac-ffdc-e73e-cb58-d027beb6e3b4@redhat.com> (raw)
In-Reply-To: <CAKMK7uEBaWMz-AjuJO3vvUBvacqMHuevOhMhQ0a+r5TtyDpwuQ@mail.gmail.com>
Hi,
On 2/4/21 11:36 AM, Daniel Vetter wrote:
> On Thu, Feb 4, 2021 at 11:19 AM Patrik Jakobsson
> <patrik.r.jakobsson@gmail.com> wrote:
>>
>> On Wed, Feb 3, 2021 at 1:00 PM Andy Shevchenko
>> <andy.shevchenko@gmail.com> wrote:
>>>
>>> On Tue, Jan 26, 2021 at 5:25 PM Patrik Jakobsson
>>> <patrik.r.jakobsson@gmail.com> wrote:
>>>> On Tue, Jan 26, 2021 at 1:37 PM Andy Shevchenko
>>>> <andriy.shevchenko@linux.intel.com> wrote:
>>>>>
>>>>> Hi guys,
>>>>>
>>>>> This is first part of Intel MID outdated platforms removal. It's collected into
>>>>> immutable branch with a given tag, please pull to yours subsystems.
>>>>
>>>> Hi Andy,
>>>> Do you plan on eventually removing X86_INTEL_MID completely? If so,
>>>> then I should probably start looking at removing the corresponding
>>>> parts in GMA500.
>>>
>>> I have noticed new commits in DRM against GMA500 and it seems now in a
>>> conflict with my immutable branch. Are you sure you don't forget to
>>> pull it?
>>
>> Hi Andy, sorry I missed pulling the immutable branch before taking the
>> gma500 medfield removal. I was unsure how to do that through drm-misc
>> and it's tools so I got sidetracked. What would be the correct way to
>> fix this?
>
> Imo Linus can resolve this, it's pretty trivial, as long as both pull
> requests point it out to him.
The removal of older Intel platforms touches a number of subsystem trees,
the idea about the IM branch was that all subsystem-trees would merge that.
I can certainly point out the problem in the pdx86 pull-req to Linus,
but the GPIO pull-req also contains a merge of the IM branch as will
the x86/tip and rtc pull-reqs I believe. We can add a remark to all
the pull-reqs about the issue I guess ?
But it might be better to still merge the branch into drm-misc-next and
resolve the conflict there. I think that should avoid Linus seeing it ?
Regards,
Hans
next prev parent reply other threads:[~2021-02-04 10:51 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 12:38 [GIT PULL] ib-drm-gpio-pdx86-rtc-wdt-v5.12-1 Andy Shevchenko
2021-01-26 14:18 ` Hans de Goede
2021-01-26 14:26 ` Andy Shevchenko
2021-02-03 9:54 ` Andy Shevchenko
2021-02-03 10:35 ` Hans de Goede
2021-02-03 11:08 ` Andy Shevchenko
2021-01-26 15:22 ` Patrik Jakobsson
2021-01-26 15:51 ` Andy Shevchenko
2021-01-26 16:55 ` Patrik Jakobsson
2021-01-26 17:14 ` Andy Shevchenko
2021-01-26 18:33 ` Hans de Goede
2021-01-26 20:54 ` Andy Shevchenko
2021-01-26 23:19 ` Patrik Jakobsson
2021-01-27 19:59 ` Hans de Goede
2021-02-03 11:59 ` Andy Shevchenko
2021-02-04 10:19 ` Patrik Jakobsson
2021-02-04 10:36 ` Daniel Vetter
2021-02-04 10:50 ` Hans de Goede [this message]
2021-02-04 10:57 ` Alexandre Belloni
2021-02-04 14:27 ` Andy Shevchenko
2021-02-03 9:57 ` Andy Shevchenko
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=797cf4ac-ffdc-e73e-cb58-d027beb6e3b4@redhat.com \
--to=hdegoede@redhat.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=andy.shevchenko@gmail.com \
--cc=bgolaszewski@baylibre.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mgross@linux.intel.com \
--cc=patrik.r.jakobsson@gmail.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=wim@linux-watchdog.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).