| Message ID | 20191209091305.5998-1-sgruszka@redhat.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | MAINTAINERS: change Gruszka's email address | expand |
Stanislaw Gruszka <sgruszka@redhat.com> wrote: > My RedHat email address will soon stop work. Change to my private one. > > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Failed to apply to wireless-drivers, please rebase. Recorded preimage for 'MAINTAINERS' error: Failed to merge in the changes. Applying: MAINTAINERS: change Gruszka's email address Using index info to reconstruct a base tree... M MAINTAINERS Falling back to patching base and 3-way merge... Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Patch failed at 0001 MAINTAINERS: change Gruszka's email address The copy of the patch that failed is found in: .git/rebase-apply/patch Patch set to Changes Requested.
diff --git a/MAINTAINERS b/MAINTAINERS index 9d3a5c54a41d..dc9072717325 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8467,7 +8467,7 @@ S: Maintained F: drivers/platform/x86/intel-vbtn.c INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy) -M: Stanislaw Gruszka <sgruszka@redhat.com> +M: Stanislaw Gruszka <stf_xl@wp.pl> L: linux-wireless@vger.kernel.org S: Supported F: drivers/net/wireless/intel/iwlegacy/ @@ -13615,7 +13615,7 @@ F: arch/mips/ralink RALINK RT2X00 WIRELESS LAN DRIVER P: rt2x00 project -M: Stanislaw Gruszka <sgruszka@redhat.com> +M: Stanislaw Gruszka <stf_xl@wp.pl> M: Helmut Schaa <helmut.schaa@googlemail.com> L: linux-wireless@vger.kernel.org S: Maintained
My RedHat email address will soon stop work. Change to my private one. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)