[pull] all patches complete

[pull] all patches complete

[Jan Engelhardt]

All patches have been gathered and collected, pullable at the usual 
place of
	git://dev.medozas.de/iptables master

with contents:
Jamal Hadi Salim (5):
      libxtables: set names of programs
      libxtables: add xtables_set_revision
      libxtables: make iptables and ip6tables use xtables_free_opts
      libxtables: consolidate merge_options into xtables_merge_options
      libxtables: consolidate init calls into one function

Jan Engelhardt (4):
      libipq: add missing doc for NF_ values
      build: restructure Makefile for include/ directory
      libipq: fix compile error
      build: remove unneeded -ldl from iptables_xml_LDADD

Marc Fournier (1):
      doc: fix option typo in libxt_multiport

Shaul Karl (1):
      doc: fix one layout issue in iptables-restore.8


 Makefile.am                    |    8 ++--
 configure.ac                   |    3 +-
 extensions/libxt_multiport.man |    4 +-
 include/Makefile.am            |    8 +++
 include/ip6tables.h            |    2 +
 include/iptables.h             |    2 +
 include/xtables.h.in           |    9 +++-
 ip6tables-restore.c            |   10 +++-
 ip6tables-save.c               |   10 +++-
 ip6tables-standalone.c         |   11 ++++-
 ip6tables.c                    |   70 ++++------------------------
 iptables-restore.8             |    1 -
 iptables-restore.c             |   10 +++-
 iptables-save.c                |   10 +++-
 iptables-standalone.c          |   10 +++-
 iptables.c                     |   76 +++++--------------------------
 libipq/Makefile.am             |    1 -
 libipq/ipq_set_verdict.3       |    7 +++
 libipq/libipq.c                |    2 +
 xtables.c                      |   99 +++++++++++++++++++++++++++++-----------
 20 files changed, 180 insertions(+), 173 deletions(-)

Re: [pull] all patches complete

[Patrick McHardy]

Jan Engelhardt wrote:
> 
> All patches have been gathered and collected, pullable at the usual 
> place of
> 	git://dev.medozas.de/iptables master
>
>  20 files changed, 180 insertions(+), 173 deletions(-)

I wanted to pull this, but I'm again getting a quite different
diffstat:

  Makefile.am                    |    8 +-
  configure.ac                   |    3 +-
  extensions/libxt_multiport.man |    4 +-
  include/Makefile.am            |    8 +++
  include/ip6tables.h            |    2 +
  include/iptables.h             |    2 +
  include/xtables.h.in           |   10 +++-
  ip6tables-restore.c            |   31 +++++++----
  ip6tables-save.c               |   14 +++--
  ip6tables-standalone.c         |   13 +++--
  ip6tables.c                    |   89 ++++++----------------------
  iptables-restore.8             |    1 -
  iptables-restore.c             |   27 +++++----
  iptables-save.c                |   14 +++--
  iptables-standalone.c          |   14 +++--
  iptables-xml.c                 |   32 +++++------
  iptables.c                     |   94 +++++++-----------------------
  libipq/Makefile.am             |    1 -
  libipq/ipq_set_verdict.3       |    7 ++
  libipq/libipq.c                |    2 +
  xtables.c                      |  124 
+++++++++++++++++++++++++++-------------
  21 files changed, 242 insertions(+), 258 deletions(-)
  create mode 100644 include/Makefile.am

Re: [pull] all patches complete

[Jan Engelhardt]

On Monday 2009-02-16 11:41, Patrick McHardy wrote:

> Jan Engelhardt wrote:
>>
>> All patches have been gathered and collected, pullable at the usual place of
>> 	git://dev.medozas.de/iptables master
>>
>> 20 files changed, 180 insertions(+), 173 deletions(-)
>
> I wanted to pull this, but I'm again getting a quite different
> diffstat:

This is because another patch was added at jamal's request.

I am not quite sure how the preferred workflow is for when
only a subset of a branch is supposed to be merged (because
the branch already moved on). I guess
`git fetch...; git merge $sha1` would work, but that looks
a bit odd in the changelog.
stat is currently
 21 files changed, 242 insertions(+), 258 deletions(-)

Re: [pull] all patches complete

[Patrick McHardy]

Jan Engelhardt wrote:
> On Monday 2009-02-16 11:41, Patrick McHardy wrote:
> 
>> Jan Engelhardt wrote:
>>> All patches have been gathered and collected, pullable at the usual place of
>>> 	git://dev.medozas.de/iptables master
>>>
>>> 20 files changed, 180 insertions(+), 173 deletions(-)
>> I wanted to pull this, but I'm again getting a quite different
>> diffstat:
> 
> This is because another patch was added at jamal's request.
> 
> I am not quite sure how the preferred workflow is for when
> only a subset of a branch is supposed to be merged (because
> the branch already moved on). I guess
> `git fetch...; git merge $sha1` would work, but that looks
> a bit odd in the changelog.
> stat is currently
>  21 files changed, 242 insertions(+), 258 deletions(-)

The preferred way is to not change the public tree after a pull request
until it has been pulled. Not sure how you work, but I assume you have
a local tree that you push to the public one. In that case simply wait
until I've pulled before you update again.

Re: [pull] all patches complete

[Patrick McHardy]

Jan Engelhardt wrote:
> stat is currently
>  21 files changed, 242 insertions(+), 258 deletions(-)

Pulled and pushed out again, thanks.

Re: [pull] all patches complete

[Jan Engelhardt]

On Monday 2009-02-16 13:17, Patrick McHardy wrote:
> Jan Engelhardt wrote:
>> stat is currently
>> 21 files changed, 242 insertions(+), 258 deletions(-)
>
> Pulled and pushed out again, thanks.
>
Great, how about a release now? :)

Re: [pull] all patches complete

[Patrick McHardy]

Jan Engelhardt wrote:
> On Monday 2009-02-16 13:17, Patrick McHardy wrote:
>> Jan Engelhardt wrote:
>>> stat is currently
>>> 21 files changed, 242 insertions(+), 258 deletions(-)
>> Pulled and pushed out again, thanks.
>>
> Great, how about a release now? :)

Its a bit too early in the kernel release cycle, also my current
testing status of these latest changes consists of typing "make" :)