From: Kalle Valo <kvalo@codeaurora.org>
To: Arnd Bergmann <arnd@kernel.org>
Cc: Ryder Lee <ryder.lee@mediatek.com>, Arnd Bergmann <arnd@arndb.de>,
netdev@vger.kernel.org, linux-wireless@vger.kernel.org,
linux-kernel@vger.kernel.org,
Matthias Brugger <matthias.bgg@gmail.com>,
Yiwei Chung <yiwei.chung@mediatek.com>,
linux-mediatek@lists.infradead.org,
Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>,
Jakub Kicinski <kuba@kernel.org>,
Shayne Chen <shayne.chen@mediatek.com>,
"David S. Miller" <davem@davemloft.net>,
linux-arm-kernel@lists.infradead.org,
Felix Fietkau <nbd@nbd.name>
Subject: Re: [PATCH] mt76: mt7915: fix misplaced #ifdef
Date: Thu, 14 Jan 2021 16:54:04 +0000 (UTC) [thread overview]
Message-ID: <20210114165404.394DAC433ED@smtp.codeaurora.org> (raw)
In-Reply-To: <20210103135811.3749775-1-arnd@kernel.org>
Arnd Bergmann <arnd@kernel.org> wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The lone '|' at the end of a line causes a build failure:
>
> drivers/net/wireless/mediatek/mt76/mt7915/init.c:47:2: error: expected expression before '}' token
>
> Replace the #ifdef with an equivalent IS_ENABLED() check.
>
> Fixes: af901eb4ab80 ("mt76: mt7915: get rid of dbdc debugfs knob")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This was already fixed by:
0bd157fa2aaa mt76: mt7915: fix MESH ifdef block
Recorded preimage for 'drivers/net/wireless/mediatek/mt76/mt7915/init.c'
error: Failed to merge in the changes.
Applying: mt76: mt7915: fix misplaced #ifdef
Using index info to reconstruct a base tree...
M drivers/net/wireless/mediatek/mt76/mt7915/init.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/mediatek/mt76/mt7915/init.c
CONFLICT (content): Merge conflict in drivers/net/wireless/mediatek/mt76/mt7915/init.c
Patch failed at 0001 mt76: mt7915: fix misplaced #ifdef
The copy of the patch that failed is found in: .git/rebase-apply/patch
Patch set to Superseded.
--
https://patchwork.kernel.org/project/linux-wireless/patch/20210103135811.3749775-1-arnd@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
prev parent reply other threads:[~2021-01-14 16:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-03 13:57 [PATCH] mt76: mt7915: fix misplaced #ifdef Arnd Bergmann
2021-01-03 13:57 ` Arnd Bergmann
2021-01-03 13:57 ` Arnd Bergmann
2021-01-06 13:58 ` Petr Štetiar
2021-01-06 13:58 ` Petr Štetiar
2021-01-06 13:58 ` Petr Štetiar
2021-01-14 10:44 ` Kalle Valo
2021-01-14 10:44 ` Kalle Valo
2021-01-14 16:54 ` Kalle Valo
2021-01-14 16:54 ` Kalle Valo [this message]
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=20210114165404.394DAC433ED@smtp.codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi83@gmail.com \
--cc=matthias.bgg@gmail.com \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=ryder.lee@mediatek.com \
--cc=shayne.chen@mediatek.com \
--cc=yiwei.chung@mediatek.com \
/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.