Message ID | 20180117193936.26588-1-stephen@that.guru |
---|---|
State | Accepted |
Headers | show |
Series | parser: Handle 'git-request-pull' mails from Git 2.14.3 | expand |
Stephen Finucane <stephen@that.guru> writes: > Make the regex case insensitive to catch both 'git' and 'Git'. > > Signed-off-by: Stephen Finucane <stephen@that.guru> > Fixes: #159 > --- > patchwork/parser.py | 2 +- > .../mail/0017-git-pull-request-git-2-14-3.mbox | 164 +++++++++++++++++++++ > patchwork/tests/test_parser.py | 7 + > 3 files changed, 172 insertions(+), 1 deletion(-) > create mode 100644 patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox > > diff --git a/patchwork/parser.py b/patchwork/parser.py > index 3acc6096..ac7dc5fe 100644 > --- a/patchwork/parser.py > +++ b/patchwork/parser.py > @@ -833,7 +833,7 @@ def parse_pull_request(content): > git_re = re.compile(r'^The following changes since commit.*' + > r'^are available in the git repository at:\n' You could also have used 'the [gG]it repository', but your way means that if someone decides to be 'cool' and send 'ThE fOlLoWinG cHaNgEs SiNcE cOMMit'... we will catch that too, which is probably better. Reviewed-by: Daniel Axtens <dja@axtens.net> I'm happy to poke the OzLabs admins on irc once this is merged - they are more than capable of dealing with a local patch so a release is probably not a prerequisite here. Regards, Daniel > r'^\s*([\S]+://[^\n]+)$', > - re.DOTALL | re.MULTILINE) > + re.DOTALL | re.MULTILINE | re.IGNORECASE) > match = git_re.search(content) > if match: > return match.group(1) > diff --git a/patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox b/patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox > new file mode 100644 > index 00000000..0c92b604 > --- /dev/null > +++ b/patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox > @@ -0,0 +1,164 @@ > +Subject: [GIT] Networking > +From: David Miller <davem@davemloft.net> > +To: torvalds@linux-foundation.org > +CC: akpm@linux-foundation.org, netdev@vger.kernel.org, > + linux-kernel@vger.kernel.org > +Date: Wed, 10 Jan 2018 17:21:11 -0500 (EST) > +Sender: netdev-owner@vger.kernel.org > +X-Mailer: Mew version 6.7 on Emacs 25.3 / Mule 6.0 (HANACHIRUSATO) > + > + > +1) BPF speculation prevention and BPF_JIT_ALWAYS_ON, from Alexei > + Starovoitov. > + > +2) Revert dev_get_random_name() changes as adjust the error code returns > + seen by userspace definitely breaks stuff. > + > +3) Fix TX DMA map/unmap on older iwlwifi devices, from Emmanuel > + Grumbach. > + > +4) From wrong AF family when requesting sock diag modules, from > + Andrii Vladyka. > + > +5) Don't add new ipv6 routes attached to the null_entry, from Wei > + Wang. > + > +6) Some SCTP sockopt length fixes from Marcelo Ricardo Leitner. > + > +7) Don't leak when removing VLAN ID 0, from Cong Wang. > + > +8) Hey there's a potential leak in ipv6_make_skb() too, from Eric > + Dumazet. > + > +Please pull, thanks a lot. > + > +The following changes since commit ef7f8cec80a0ba7bd00ece46844c8994117dc910: > + > + Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2018-01-08 20:21:39 -0800) > + > +are available in the Git repository at: > + > + git://git.kernel.org/pub/scm/linux/kernel/git/davem/net > + > +for you to fetch changes up to ccc12b11c5332c84442ef120dcd631523be75089: > + > + ipv6: sr: fix TLVs not being copied using setsockopt (2018-01-10 16:03:55 -0500) > + > +---------------------------------------------------------------- > +Alexei Starovoitov (3): > + selftests/bpf: fix test_align > + bpf: prevent out-of-bounds speculation > + bpf: introduce BPF_JIT_ALWAYS_ON config > + > +Andrii Vladyka (1): > + net: core: fix module type in sock_diag_bind > + > +Cong Wang (1): > + 8021q: fix a memory leak for VLAN 0 device > + > +Daniel Borkmann (1): > + bpf: avoid false sharing of map refcount with max_entries > + > +David S. Miller (5): > + Merge branch 'Ether-fixes-for-the-SolutionEngine771x-boards' > + Merge git://git.kernel.org/.../bpf/bpf > + Merge branch 'sctp-Some-sockopt-optlen-fixes' > + Merge tag 'wireless-drivers-for-davem-2018-01-09' of git://git.kernel.org/.../kvalo/wireless-drivers > + Merge branch 'mlxsw-couple-of-fixes' > + > +Emmanuel Grumbach (1): > + iwlwifi: pcie: fix DMA memory mapping / unmapping > + > +Eric Dumazet (1): > + ipv6: fix possible mem leaks in ipv6_make_skb() > + > +Jakub Kicinski (1): > + nfp: always unmask aux interrupts at init > + > +Jiri Pirko (1): > + mlxsw: spectrum_qdisc: Don't use variable array in mlxsw_sp_tclass_congestion_enable > + > +John Fastabend (1): > + bpf: sockmap missing NULL psock check > + > +Kalle Valo (1): > + Merge ath-current from git://git.kernel.org/.../kvalo/ath.git > + > +Kornilios Kourtis (1): > + doc: clarification about setting SO_ZEROCOPY > + > +Loic Poulain (1): > + wcn36xx: Fix dynamic power saving > + > +Madalin Bucur (1): > + of_mdio: avoid MDIO bus removal when a PHY is missing > + > +Marcelo Ricardo Leitner (3): > + sctp: GFP_ATOMIC is not needed in sctp_setsockopt_events > + sctp: add a ceiling to optlen in some sockopts > + sctp: make use of pre-calculated len > + > +Mathieu Xhonneux (1): > + ipv6: sr: fix TLVs not being copied using setsockopt > + > +Mike Rapoport (1): > + docs-rst: networking: wire up msg_zerocopy > + > +Nicolai Stange (1): > + net: ipv4: emulate READ_ONCE() on ->hdrincl bit-field in raw_sendmsg() > + > +Sergei Shtylyov (2): > + SolutionEngine771x: fix Ether platform data > + SolutionEngine771x: add Ether TSU resource > + > +Wei Wang (1): > + ipv6: remove null_entry before adding default route > + > +Xiongfeng Wang (2): > + net: caif: use strlcpy() instead of strncpy() > + caif_usb: use strlcpy() instead of strncpy() > + > +Yangbo Lu (1): > + net: gianfar_ptp: move set_fipers() to spinlock protecting area > + > +Yuval Mintz (1): > + mlxsw: pci: Wait after reset before accessing HW > + > + Documentation/networking/index.rst | 2 +- > + Documentation/networking/msg_zerocopy.rst | 4 ++++ > + arch/sh/boards/mach-se/770x/setup.c | 24 ++++++++++++++++++++---- > + arch/sh/include/mach-se/mach/se.h | 1 + > + drivers/net/ethernet/freescale/gianfar_ptp.c | 3 +-- > + drivers/net/ethernet/mellanox/mlxsw/pci.c | 7 ++++++- > + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 1 + > + drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 7 ++++--- > + drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 2 ++ > + drivers/net/wireless/ath/wcn36xx/main.c | 23 ++++++++++++----------- > + drivers/net/wireless/ath/wcn36xx/pmc.c | 6 ++++-- > + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 10 +++++++--- > + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 11 +++-------- > + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 8 ++++---- > + drivers/of/of_mdio.c | 9 +++++++-- > + include/linux/bpf.h | 26 ++++++++++++++++++-------- > + init/Kconfig | 7 +++++++ > + kernel/bpf/arraymap.c | 47 ++++++++++++++++++++++++++++++++++++----------- > + kernel/bpf/core.c | 19 +++++++++++++++++++ > + kernel/bpf/sockmap.c | 11 +++++++++-- > + kernel/bpf/verifier.c | 36 ++++++++++++++++++++++++++++++++++++ > + lib/test_bpf.c | 11 +++++++---- > + net/8021q/vlan.c | 7 +------ > + net/caif/caif_dev.c | 5 ++--- > + net/caif/caif_usb.c | 4 +--- > + net/caif/cfcnfg.c | 10 ++++------ > + net/caif/cfctrl.c | 4 ++-- > + net/core/filter.c | 6 ++---- > + net/core/sock_diag.c | 2 +- > + net/core/sysctl_net_core.c | 6 ++++++ > + net/ipv4/raw.c | 4 +++- > + net/ipv6/exthdrs.c | 9 +++++++++ > + net/ipv6/ip6_fib.c | 38 +++++++++++++++++++++++++++++--------- > + net/ipv6/ip6_output.c | 5 +++-- > + net/sctp/socket.c | 28 +++++++++++++++++++++------- > + net/socket.c | 9 +++++++++ > + tools/testing/selftests/bpf/test_align.c | 22 +--------------------- > + 37 files changed, 303 insertions(+), 131 deletions(-) > diff --git a/patchwork/tests/test_parser.py b/patchwork/tests/test_parser.py > index c21040ee..42f96fe7 100644 > --- a/patchwork/tests/test_parser.py > +++ b/patchwork/tests/test_parser.py > @@ -557,6 +557,13 @@ class PatchParseTest(PatchTest): > def test_git_pull_http_url(self): > self._test_pull_request_parse('0006-git-pull-request-http.mbox') > > + def test_git_pull_git_2_14_3(self): > + """Handle messages from Git 2.14.3+. > + > + See: https://github.com/git/git/commit/e66d7c37a > + """ > + self._test_pull_request_parse('0017-git-pull-request-git-2-14-3.mbox') > + > def test_git_pull_with_diff(self): > diff, message = self._find_content( > '0003-git-pull-request-with-diff.mbox') > -- > 2.14.3 > > _______________________________________________ > Patchwork mailing list > Patchwork@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/patchwork
Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> On 18/01/18 06:39, Stephen Finucane wrote: > Make the regex case insensitive to catch both 'git' and 'Git'. > > Signed-off-by: Stephen Finucane <stephen@that.guru> > Fixes: #159 > --- > patchwork/parser.py | 2 +- > .../mail/0017-git-pull-request-git-2-14-3.mbox | 164 +++++++++++++++++++++ > patchwork/tests/test_parser.py | 7 + > 3 files changed, 172 insertions(+), 1 deletion(-) > create mode 100644 patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox > > diff --git a/patchwork/parser.py b/patchwork/parser.py > index 3acc6096..ac7dc5fe 100644 > --- a/patchwork/parser.py > +++ b/patchwork/parser.py > @@ -833,7 +833,7 @@ def parse_pull_request(content): > git_re = re.compile(r'^The following changes since commit.*' + > r'^are available in the git repository at:\n' > r'^\s*([\S]+://[^\n]+)$', > - re.DOTALL | re.MULTILINE) > + re.DOTALL | re.MULTILINE | re.IGNORECASE) > match = git_re.search(content) > if match: > return match.group(1) > diff --git a/patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox b/patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox > new file mode 100644 > index 00000000..0c92b604 > --- /dev/null > +++ b/patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox > @@ -0,0 +1,164 @@ > +Subject: [GIT] Networking > +From: David Miller <davem@davemloft.net> > +To: torvalds@linux-foundation.org > +CC: akpm@linux-foundation.org, netdev@vger.kernel.org, > + linux-kernel@vger.kernel.org > +Date: Wed, 10 Jan 2018 17:21:11 -0500 (EST) > +Sender: netdev-owner@vger.kernel.org > +X-Mailer: Mew version 6.7 on Emacs 25.3 / Mule 6.0 (HANACHIRUSATO) > + > + > +1) BPF speculation prevention and BPF_JIT_ALWAYS_ON, from Alexei > + Starovoitov. > + > +2) Revert dev_get_random_name() changes as adjust the error code returns > + seen by userspace definitely breaks stuff. > + > +3) Fix TX DMA map/unmap on older iwlwifi devices, from Emmanuel > + Grumbach. > + > +4) From wrong AF family when requesting sock diag modules, from > + Andrii Vladyka. > + > +5) Don't add new ipv6 routes attached to the null_entry, from Wei > + Wang. > + > +6) Some SCTP sockopt length fixes from Marcelo Ricardo Leitner. > + > +7) Don't leak when removing VLAN ID 0, from Cong Wang. > + > +8) Hey there's a potential leak in ipv6_make_skb() too, from Eric > + Dumazet. > + > +Please pull, thanks a lot. > + > +The following changes since commit ef7f8cec80a0ba7bd00ece46844c8994117dc910: > + > + Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2018-01-08 20:21:39 -0800) > + > +are available in the Git repository at: > + > + git://git.kernel.org/pub/scm/linux/kernel/git/davem/net > + > +for you to fetch changes up to ccc12b11c5332c84442ef120dcd631523be75089: > + > + ipv6: sr: fix TLVs not being copied using setsockopt (2018-01-10 16:03:55 -0500) > + > +---------------------------------------------------------------- > +Alexei Starovoitov (3): > + selftests/bpf: fix test_align > + bpf: prevent out-of-bounds speculation > + bpf: introduce BPF_JIT_ALWAYS_ON config > + > +Andrii Vladyka (1): > + net: core: fix module type in sock_diag_bind > + > +Cong Wang (1): > + 8021q: fix a memory leak for VLAN 0 device > + > +Daniel Borkmann (1): > + bpf: avoid false sharing of map refcount with max_entries > + > +David S. Miller (5): > + Merge branch 'Ether-fixes-for-the-SolutionEngine771x-boards' > + Merge git://git.kernel.org/.../bpf/bpf > + Merge branch 'sctp-Some-sockopt-optlen-fixes' > + Merge tag 'wireless-drivers-for-davem-2018-01-09' of git://git.kernel.org/.../kvalo/wireless-drivers > + Merge branch 'mlxsw-couple-of-fixes' > + > +Emmanuel Grumbach (1): > + iwlwifi: pcie: fix DMA memory mapping / unmapping > + > +Eric Dumazet (1): > + ipv6: fix possible mem leaks in ipv6_make_skb() > + > +Jakub Kicinski (1): > + nfp: always unmask aux interrupts at init > + > +Jiri Pirko (1): > + mlxsw: spectrum_qdisc: Don't use variable array in mlxsw_sp_tclass_congestion_enable > + > +John Fastabend (1): > + bpf: sockmap missing NULL psock check > + > +Kalle Valo (1): > + Merge ath-current from git://git.kernel.org/.../kvalo/ath.git > + > +Kornilios Kourtis (1): > + doc: clarification about setting SO_ZEROCOPY > + > +Loic Poulain (1): > + wcn36xx: Fix dynamic power saving > + > +Madalin Bucur (1): > + of_mdio: avoid MDIO bus removal when a PHY is missing > + > +Marcelo Ricardo Leitner (3): > + sctp: GFP_ATOMIC is not needed in sctp_setsockopt_events > + sctp: add a ceiling to optlen in some sockopts > + sctp: make use of pre-calculated len > + > +Mathieu Xhonneux (1): > + ipv6: sr: fix TLVs not being copied using setsockopt > + > +Mike Rapoport (1): > + docs-rst: networking: wire up msg_zerocopy > + > +Nicolai Stange (1): > + net: ipv4: emulate READ_ONCE() on ->hdrincl bit-field in raw_sendmsg() > + > +Sergei Shtylyov (2): > + SolutionEngine771x: fix Ether platform data > + SolutionEngine771x: add Ether TSU resource > + > +Wei Wang (1): > + ipv6: remove null_entry before adding default route > + > +Xiongfeng Wang (2): > + net: caif: use strlcpy() instead of strncpy() > + caif_usb: use strlcpy() instead of strncpy() > + > +Yangbo Lu (1): > + net: gianfar_ptp: move set_fipers() to spinlock protecting area > + > +Yuval Mintz (1): > + mlxsw: pci: Wait after reset before accessing HW > + > + Documentation/networking/index.rst | 2 +- > + Documentation/networking/msg_zerocopy.rst | 4 ++++ > + arch/sh/boards/mach-se/770x/setup.c | 24 ++++++++++++++++++++---- > + arch/sh/include/mach-se/mach/se.h | 1 + > + drivers/net/ethernet/freescale/gianfar_ptp.c | 3 +-- > + drivers/net/ethernet/mellanox/mlxsw/pci.c | 7 ++++++- > + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 1 + > + drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 7 ++++--- > + drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 2 ++ > + drivers/net/wireless/ath/wcn36xx/main.c | 23 ++++++++++++----------- > + drivers/net/wireless/ath/wcn36xx/pmc.c | 6 ++++-- > + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 10 +++++++--- > + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 11 +++-------- > + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 8 ++++---- > + drivers/of/of_mdio.c | 9 +++++++-- > + include/linux/bpf.h | 26 ++++++++++++++++++-------- > + init/Kconfig | 7 +++++++ > + kernel/bpf/arraymap.c | 47 ++++++++++++++++++++++++++++++++++++----------- > + kernel/bpf/core.c | 19 +++++++++++++++++++ > + kernel/bpf/sockmap.c | 11 +++++++++-- > + kernel/bpf/verifier.c | 36 ++++++++++++++++++++++++++++++++++++ > + lib/test_bpf.c | 11 +++++++---- > + net/8021q/vlan.c | 7 +------ > + net/caif/caif_dev.c | 5 ++--- > + net/caif/caif_usb.c | 4 +--- > + net/caif/cfcnfg.c | 10 ++++------ > + net/caif/cfctrl.c | 4 ++-- > + net/core/filter.c | 6 ++---- > + net/core/sock_diag.c | 2 +- > + net/core/sysctl_net_core.c | 6 ++++++ > + net/ipv4/raw.c | 4 +++- > + net/ipv6/exthdrs.c | 9 +++++++++ > + net/ipv6/ip6_fib.c | 38 +++++++++++++++++++++++++++++--------- > + net/ipv6/ip6_output.c | 5 +++-- > + net/sctp/socket.c | 28 +++++++++++++++++++++------- > + net/socket.c | 9 +++++++++ > + tools/testing/selftests/bpf/test_align.c | 22 +--------------------- > + 37 files changed, 303 insertions(+), 131 deletions(-) > diff --git a/patchwork/tests/test_parser.py b/patchwork/tests/test_parser.py > index c21040ee..42f96fe7 100644 > --- a/patchwork/tests/test_parser.py > +++ b/patchwork/tests/test_parser.py > @@ -557,6 +557,13 @@ class PatchParseTest(PatchTest): > def test_git_pull_http_url(self): > self._test_pull_request_parse('0006-git-pull-request-http.mbox') > > + def test_git_pull_git_2_14_3(self): > + """Handle messages from Git 2.14.3+. > + > + See: https://github.com/git/git/commit/e66d7c37a > + """ > + self._test_pull_request_parse('0017-git-pull-request-git-2-14-3.mbox') > + > def test_git_pull_with_diff(self): > diff, message = self._find_content( > '0003-git-pull-request-with-diff.mbox') >
On Thu, 2018-01-18 at 16:59 +1100, Daniel Axtens wrote: > Stephen Finucane <stephen@that.guru> writes: > > > Make the regex case insensitive to catch both 'git' and 'Git'. > > > > Signed-off-by: Stephen Finucane <stephen@that.guru> > > > > Fixes: #159 > > --- > > patchwork/parser.py | 2 +- > > .../mail/0017-git-pull-request-git-2-14-3.mbox | 164 > > +++++++++++++++++++++ > > patchwork/tests/test_parser.py | 7 + > > 3 files changed, 172 insertions(+), 1 deletion(-) > > create mode 100644 patchwork/tests/mail/0017-git-pull-request-git- > > 2-14-3.mbox > > > > diff --git a/patchwork/parser.py b/patchwork/parser.py > > index 3acc6096..ac7dc5fe 100644 > > --- a/patchwork/parser.py > > +++ b/patchwork/parser.py > > @@ -833,7 +833,7 @@ def parse_pull_request(content): > > git_re = re.compile(r'^The following changes since commit.*' + > > r'^are available in the git repository > > at:\n' > > You could also have used 'the [gG]it repository', but your way means > that if someone decides to be 'cool' and send 'ThE fOlLoWinG cHaNgEs > SiNcE cOMMit'... we will catch that too, which is probably better. That was my thinking. > Reviewed-by: Daniel Axtens <dja@axtens.net> > > I'm happy to poke the OzLabs admins on irc once this is merged - they > are more than capable of dealing with a local patch so a release is > probably not a prerequisite here. Spot on. This is available on master and stable/2.0 now. Stephen
diff --git a/patchwork/parser.py b/patchwork/parser.py index 3acc6096..ac7dc5fe 100644 --- a/patchwork/parser.py +++ b/patchwork/parser.py @@ -833,7 +833,7 @@ def parse_pull_request(content): git_re = re.compile(r'^The following changes since commit.*' + r'^are available in the git repository at:\n' r'^\s*([\S]+://[^\n]+)$', - re.DOTALL | re.MULTILINE) + re.DOTALL | re.MULTILINE | re.IGNORECASE) match = git_re.search(content) if match: return match.group(1) diff --git a/patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox b/patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox new file mode 100644 index 00000000..0c92b604 --- /dev/null +++ b/patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox @@ -0,0 +1,164 @@ +Subject: [GIT] Networking +From: David Miller <davem@davemloft.net> +To: torvalds@linux-foundation.org +CC: akpm@linux-foundation.org, netdev@vger.kernel.org, + linux-kernel@vger.kernel.org +Date: Wed, 10 Jan 2018 17:21:11 -0500 (EST) +Sender: netdev-owner@vger.kernel.org +X-Mailer: Mew version 6.7 on Emacs 25.3 / Mule 6.0 (HANACHIRUSATO) + + +1) BPF speculation prevention and BPF_JIT_ALWAYS_ON, from Alexei + Starovoitov. + +2) Revert dev_get_random_name() changes as adjust the error code returns + seen by userspace definitely breaks stuff. + +3) Fix TX DMA map/unmap on older iwlwifi devices, from Emmanuel + Grumbach. + +4) From wrong AF family when requesting sock diag modules, from + Andrii Vladyka. + +5) Don't add new ipv6 routes attached to the null_entry, from Wei + Wang. + +6) Some SCTP sockopt length fixes from Marcelo Ricardo Leitner. + +7) Don't leak when removing VLAN ID 0, from Cong Wang. + +8) Hey there's a potential leak in ipv6_make_skb() too, from Eric + Dumazet. + +Please pull, thanks a lot. + +The following changes since commit ef7f8cec80a0ba7bd00ece46844c8994117dc910: + + Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2018-01-08 20:21:39 -0800) + +are available in the Git repository at: + + git://git.kernel.org/pub/scm/linux/kernel/git/davem/net + +for you to fetch changes up to ccc12b11c5332c84442ef120dcd631523be75089: + + ipv6: sr: fix TLVs not being copied using setsockopt (2018-01-10 16:03:55 -0500) + +---------------------------------------------------------------- +Alexei Starovoitov (3): + selftests/bpf: fix test_align + bpf: prevent out-of-bounds speculation + bpf: introduce BPF_JIT_ALWAYS_ON config + +Andrii Vladyka (1): + net: core: fix module type in sock_diag_bind + +Cong Wang (1): + 8021q: fix a memory leak for VLAN 0 device + +Daniel Borkmann (1): + bpf: avoid false sharing of map refcount with max_entries + +David S. Miller (5): + Merge branch 'Ether-fixes-for-the-SolutionEngine771x-boards' + Merge git://git.kernel.org/.../bpf/bpf + Merge branch 'sctp-Some-sockopt-optlen-fixes' + Merge tag 'wireless-drivers-for-davem-2018-01-09' of git://git.kernel.org/.../kvalo/wireless-drivers + Merge branch 'mlxsw-couple-of-fixes' + +Emmanuel Grumbach (1): + iwlwifi: pcie: fix DMA memory mapping / unmapping + +Eric Dumazet (1): + ipv6: fix possible mem leaks in ipv6_make_skb() + +Jakub Kicinski (1): + nfp: always unmask aux interrupts at init + +Jiri Pirko (1): + mlxsw: spectrum_qdisc: Don't use variable array in mlxsw_sp_tclass_congestion_enable + +John Fastabend (1): + bpf: sockmap missing NULL psock check + +Kalle Valo (1): + Merge ath-current from git://git.kernel.org/.../kvalo/ath.git + +Kornilios Kourtis (1): + doc: clarification about setting SO_ZEROCOPY + +Loic Poulain (1): + wcn36xx: Fix dynamic power saving + +Madalin Bucur (1): + of_mdio: avoid MDIO bus removal when a PHY is missing + +Marcelo Ricardo Leitner (3): + sctp: GFP_ATOMIC is not needed in sctp_setsockopt_events + sctp: add a ceiling to optlen in some sockopts + sctp: make use of pre-calculated len + +Mathieu Xhonneux (1): + ipv6: sr: fix TLVs not being copied using setsockopt + +Mike Rapoport (1): + docs-rst: networking: wire up msg_zerocopy + +Nicolai Stange (1): + net: ipv4: emulate READ_ONCE() on ->hdrincl bit-field in raw_sendmsg() + +Sergei Shtylyov (2): + SolutionEngine771x: fix Ether platform data + SolutionEngine771x: add Ether TSU resource + +Wei Wang (1): + ipv6: remove null_entry before adding default route + +Xiongfeng Wang (2): + net: caif: use strlcpy() instead of strncpy() + caif_usb: use strlcpy() instead of strncpy() + +Yangbo Lu (1): + net: gianfar_ptp: move set_fipers() to spinlock protecting area + +Yuval Mintz (1): + mlxsw: pci: Wait after reset before accessing HW + + Documentation/networking/index.rst | 2 +- + Documentation/networking/msg_zerocopy.rst | 4 ++++ + arch/sh/boards/mach-se/770x/setup.c | 24 ++++++++++++++++++++---- + arch/sh/include/mach-se/mach/se.h | 1 + + drivers/net/ethernet/freescale/gianfar_ptp.c | 3 +-- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 7 ++++++- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 1 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 7 ++++--- + drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 2 ++ + drivers/net/wireless/ath/wcn36xx/main.c | 23 ++++++++++++----------- + drivers/net/wireless/ath/wcn36xx/pmc.c | 6 ++++-- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 10 +++++++--- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 11 +++-------- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 8 ++++---- + drivers/of/of_mdio.c | 9 +++++++-- + include/linux/bpf.h | 26 ++++++++++++++++++-------- + init/Kconfig | 7 +++++++ + kernel/bpf/arraymap.c | 47 ++++++++++++++++++++++++++++++++++++----------- + kernel/bpf/core.c | 19 +++++++++++++++++++ + kernel/bpf/sockmap.c | 11 +++++++++-- + kernel/bpf/verifier.c | 36 ++++++++++++++++++++++++++++++++++++ + lib/test_bpf.c | 11 +++++++---- + net/8021q/vlan.c | 7 +------ + net/caif/caif_dev.c | 5 ++--- + net/caif/caif_usb.c | 4 +--- + net/caif/cfcnfg.c | 10 ++++------ + net/caif/cfctrl.c | 4 ++-- + net/core/filter.c | 6 ++---- + net/core/sock_diag.c | 2 +- + net/core/sysctl_net_core.c | 6 ++++++ + net/ipv4/raw.c | 4 +++- + net/ipv6/exthdrs.c | 9 +++++++++ + net/ipv6/ip6_fib.c | 38 +++++++++++++++++++++++++++++--------- + net/ipv6/ip6_output.c | 5 +++-- + net/sctp/socket.c | 28 +++++++++++++++++++++------- + net/socket.c | 9 +++++++++ + tools/testing/selftests/bpf/test_align.c | 22 +--------------------- + 37 files changed, 303 insertions(+), 131 deletions(-) diff --git a/patchwork/tests/test_parser.py b/patchwork/tests/test_parser.py index c21040ee..42f96fe7 100644 --- a/patchwork/tests/test_parser.py +++ b/patchwork/tests/test_parser.py @@ -557,6 +557,13 @@ class PatchParseTest(PatchTest): def test_git_pull_http_url(self): self._test_pull_request_parse('0006-git-pull-request-http.mbox') + def test_git_pull_git_2_14_3(self): + """Handle messages from Git 2.14.3+. + + See: https://github.com/git/git/commit/e66d7c37a + """ + self._test_pull_request_parse('0017-git-pull-request-git-2-14-3.mbox') + def test_git_pull_with_diff(self): diff, message = self._find_content( '0003-git-pull-request-with-diff.mbox')
Make the regex case insensitive to catch both 'git' and 'Git'. Signed-off-by: Stephen Finucane <stephen@that.guru> Fixes: #159 --- patchwork/parser.py | 2 +- .../mail/0017-git-pull-request-git-2-14-3.mbox | 164 +++++++++++++++++++++ patchwork/tests/test_parser.py | 7 + 3 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox