Hi all,
Today's linux-next merge of the thermal-soc tree got a conflict in:
MAINTAINERS
between commit:
f23afd75fc99 ("RDMA/efa: Add driver to Kconfig/Makefile")
from Linus' tree and commit:
7e34eb7dd067 ("thermal: Introduce Amazon's Annapurna Labs Thermal Driver")
from the thermal-soc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index 2ff031b5e620,7defe065470d..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -745,15 -744,12 +745,21 @@@ S: Supporte
F: Documentation/networking/device_drivers/amazon/ena.txt
F: drivers/net/ethernet/amazon/
+ AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
+ M: Talel Shenhar <[email protected]>
+ S: Maintained
+ F: Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt
+ F: drivers/thermal/thermal_mmio.c
+
+AMAZON RDMA EFA DRIVER
+M: Gal Pressman <[email protected]>
+R: Yossi Leybovich <[email protected]>
+L: [email protected]
+Q: https://patchwork.kernel.org/project/linux-rdma/list/
+S: Supported
+F: drivers/infiniband/hw/efa/
+F: include/uapi/rdma/efa-abi.h
+
AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
M: Tom Lendacky <[email protected]>
M: Gary Hook <[email protected]>
Stephen,
On Mon, May 13, 2019 at 10:49:28AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the thermal-soc tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> f23afd75fc99 ("RDMA/efa: Add driver to Kconfig/Makefile")
>
> from Linus' tree and commit:
>
> 7e34eb7dd067 ("thermal: Introduce Amazon's Annapurna Labs Thermal Driver")
>
> from the thermal-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Thanks for spotting this. I am re-doing the branch based off v5.1-rc7,
where the last conflict went in with my current queue.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc MAINTAINERS
> index 2ff031b5e620,7defe065470d..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -745,15 -744,12 +745,21 @@@ S: Supporte
> F: Documentation/networking/device_drivers/amazon/ena.txt
> F: drivers/net/ethernet/amazon/
>
> + AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
> + M: Talel Shenhar <[email protected]>
> + S: Maintained
> + F: Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt
> + F: drivers/thermal/thermal_mmio.c
> +
> +AMAZON RDMA EFA DRIVER
> +M: Gal Pressman <[email protected]>
> +R: Yossi Leybovich <[email protected]>
> +L: [email protected]
> +Q: https://patchwork.kernel.org/project/linux-rdma/list/
> +S: Supported
> +F: drivers/infiniband/hw/efa/
> +F: include/uapi/rdma/efa-abi.h
> +
> AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
> M: Tom Lendacky <[email protected]>
> M: Gary Hook <[email protected]>
Hi Eduardo,
On Mon, 13 May 2019 20:44:11 -0700 Eduardo Valentin <[email protected]> wrote:
>
> Thanks for spotting this. I am re-doing the branch based off v5.1-rc7,
> where the last conflict went in with my current queue.
Its really not worth the rebase. Just fix the build problem and send it
all to Linus.
--
Cheers,
Stephen Rothwell
Hey Stephen,
On Tue, May 14, 2019 at 02:40:06PM +1000, Stephen Rothwell wrote:
> Hi Eduardo,
>
> On Mon, 13 May 2019 20:44:11 -0700 Eduardo Valentin <[email protected]> wrote:
> >
> > Thanks for spotting this. I am re-doing the branch based off v5.1-rc7,
> > where the last conflict went in with my current queue.
>
> Its really not worth the rebase. Just fix the build problem and send it
> all to Linus.
Yeah, I think I was not super clear in my first email. I am about to
send the content of my branch to Linus. This specific conflict was
because a change in MAINTAINERS went in before the change I have in it,
causing a conflict there. The rebase is simply to make it easier for him
to pull when I send the git pull.
>
> --
> Cheers,
> Stephen Rothwell
Hi Eduardo,
On Tue, 14 May 2019 07:15:33 -0700 Eduardo Valentin <[email protected]> wrote:
>
> On Tue, May 14, 2019 at 02:40:06PM +1000, Stephen Rothwell wrote:
> > Hi Eduardo,
> >
> > On Mon, 13 May 2019 20:44:11 -0700 Eduardo Valentin <[email protected]> wrote:
> > >
> > > Thanks for spotting this. I am re-doing the branch based off v5.1-rc7,
> > > where the last conflict went in with my current queue.
> >
> > Its really not worth the rebase. Just fix the build problem and send it
> > all to Linus.
>
> Yeah, I think I was not super clear in my first email. I am about to
> send the content of my branch to Linus. This specific conflict was
> because a change in MAINTAINERS went in before the change I have in it,
> causing a conflict there. The rebase is simply to make it easier for him
> to pull when I send the git pull.
Linus has repeated told people not to do that. He wants to see the
conflicts. You should mention any conflicts you know about in your pull
request - just as a heads up to him.
However, if a conflict is particularly tricky, it may be worth while to
a test merge in another branch and tell him about that other branch in
your pull request.
--
Cheers,
Stephen Rothwell