From: Pavel Machek <pavel@ucw.cz>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: kernel list <linux-kernel@vger.kernel.org>,
Jacek Anaszewski <jacek.anaszewski@gmail.com>,
Linux LED Subsystem <linux-leds@vger.kernel.org>
Subject: Re: [GIT PULL] LEDs changes for v5.13-rc1
Date: Tue, 4 May 2021 17:43:31 +0200 [thread overview]
Message-ID: <YJFro4ue80SIboQd@mobian> (raw)
In-Reply-To: <CAHk-=wg0Cvmxk58f0waakTKo8G5wPWarVw5b2=11f35vBAOYUw@mail.gmail.com>
Hi!
> > This modifies MAINTAINER's file to remove Dan Murphy's email that is
> > bouncing (and does it globally). I hope that does not conflict too badly.
>
> Well, it caused conflicts, but it's not like they were hard to resolve.
>
> In fact, the resolution was to ignore your changes, because those
> email addresses had been removed by the other branches I already
> merged, so they were gone even before your merge (and the conflicts
> were just due to other changes around it)
Oops, sounds like I should have test-merged it and dropped the
change. Thanks for solving it for me.
Best regards,
Pavel
--
next prev parent reply other threads:[~2021-05-04 15:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-02 22:05 [GIT PULL] LEDs changes for v5.13-rc1 Pavel Machek
2021-05-03 19:27 ` Linus Torvalds
2021-05-04 15:43 ` Pavel Machek [this message]
2021-05-04 15:54 ` Linus Torvalds
2021-05-03 19:28 ` pr-tracker-bot
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=YJFro4ue80SIboQd@mobian \
--to=pavel@ucw.cz \
--cc=jacek.anaszewski@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=torvalds@linux-foundation.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.