From: Johan Hovold <johan@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, Johan Hovold <johan@kernel.org>
Subject: [PATCH char-misc] dt-bindings: vendor-prefixes: fix bad merge
Date: Wed, 4 Jul 2018 08:46:26 +0200 [thread overview]
Message-ID: <20180704064626.3003-1-johan@kernel.org> (raw)
Remove the vendor-prefix reject file which was accidentally added when
merging the gnss sirfstar binding. The wi2wi prefix had already been
added by commit a593bff82cae2 ("dt-bindings: define vendor prefix for
Wi2Wi, Inc.").
Fixes: 176193b7dd6e ("dt-bindings: gnss: add sirfstar binding")
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
This applies to the char-misc tree.
.../devicetree/bindings/vendor-prefixes.txt.rej | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/vendor-prefixes.txt.rej
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt.rej b/Documentation/devicetree/bindings/vendor-prefixes.txt.rej
deleted file mode 100644
index a32acd9ce2b2..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt.rej
+++ /dev/null
@@ -1,10 +0,0 @@
---- Documentation/devicetree/bindings/vendor-prefixes.txt
-+++ Documentation/devicetree/bindings/vendor-prefixes.txt
-@@ -395,6 +397,7 @@ vot Vision Optical Technology Co., Ltd.
- wd Western Digital Corp.
- wetek WeTek Electronics, limited.
- wexler Wexler
-+wi2wi Wi2Wi, Inc.
- winbond Winbond Electronics corp.
- winstar Winstar Display Corp.
- wlf Wolfson Microelectronics
--
2.18.0
reply other threads:[~2018-07-04 6:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20180704064626.3003-1-johan@kernel.org \
--to=johan@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.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.