* pull request: iwlegacy 2011-09-14
@ 2011-09-14 8:59 Stanislaw Gruszka
2011-09-19 19:31 ` John W. Linville
0 siblings, 1 reply; 5+ messages in thread
From: Stanislaw Gruszka @ 2011-09-14 8:59 UTC (permalink / raw)
To: linville; +Cc: Greg Dietsche, linux-wireless
John,
Please pull iwlegacy cleanup changes done by Greg and me, intended
for 3.2. These request include huge patches with file renaming and
automatic code processing done by sed and indent. Work of changing
iwlegacy driver into something that I could consider maintainable
is not done yet, but these massive changes bring closer into that.
Hopefully with having clean, maintainable code I will be able to
fix some nasty, not easy reproducible bugs, we still have in the
iwlegacy driver.
Thanks.
The following changes since commit d82cdad64a0127611724c61849a8487d69fb76ef:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next (2011-08-30 16:34:33 -0400)
are available in the git repository at:
git://github.com/dietsche/linux.git wireless-next-iwlegacy-stanislaw-greg
Greg Dietsche (9):
iwlegacy: change IL_WARN to D_HT in il4965_tx_agg_start
iwlegacy: change IL_ERR to D_HT in iwl4965_rs_tl_turn_on_agg_for_tid
iwlegacy: 4965: remove vif null check in request_scan
iwlegacy: 4965-rs: remove null check on sta in il4965_rs_tx_status
iwlegacy: 4965-rs: remove unnecessary null check for sta and lq_sta
iwlegacy: 4965-rs: il4965_rs_alloc_sta: remove lq_sta local var
iwlegacy: 4965-rs: don't return rate from il4965_rs_update_rate_tbl
iwlegacy: 4965-rs: cleanup il4965_rs_sta_dbgfs_rate_scale_data_read
iwlegacy: debugfs_ops should depend on CONFIG_IWLEGACY_DEBUGFS
Stanislaw Gruszka (65):
iwlegacy: remove tracing
iwlegacy: rename iwl to il
iwlegacy: rename priv to il
iwlegacy: rename iwlegacy to il
iwlegacy: remove DEBUG_IO
iwlegacy: remove DEBUG_LIMIT
iwlegacy: rename IL_DEBUG_ to D_
iwlegacy: remove il argument from IWL_ERR/INFO/WARN/CRIT
iwlegacy: remove IL_CRIT
iwlegacy: rename il_{read,write}32 to _il_{rd,wr}
iwlegacy: mark poll bit as unlocked function
iwlegacy: mark il_{grab,release}_nic_access as unlocked
iwlegacy: remove _il_{read,write}_direct32
iwlegacy: rename i/o direct methods
iwlegacy: rename il_{read,write}_prph
iwlegacy: remove not needed parentheses
iwlegacy: rename remaining IWLs to ILs
iwlegacy: s/iwl_rx_packet/iwl_rx_pkt/
iwlegacy: partial rxon context cleanup
iwlegacy: s/il_rx_mem_buffer/il_rx_buf/
iwlegacy: s/statistics/stats/
iwlegacy: s/window/win/
iwlegacy: s/IL_RATE/RATE/
iwlegacy: s/INDEX/IDX/
iwlegacy: s/index/idx/
iwlegacy: s/TABLE/TBL/
iwlegacy: remove for_each_context
iwlegacy: rename base 4965 and 3945 file names
iwlegacy: merge iwl-4965-led.c into 4965.c
iwlegacy: merge iwl-3945-led.c into 3945.c
iwlegacy: merge iwl-4965-eeprom.c into 4965.c
iwlegacy: merge iwl-4965-ucode.c into 4965.c
iwlegacy: merge iwl-4965-sta.c into 4965-mac.c
iwlegacy: merge iwl-4965-{tx,rx}.c into 4965-mac.c
iwlegacy: merge iwl-4965-lib.c into 4965-mac.c
iwlegacy: rename iwl-4965-{rs,calib,debugfs}.c to 4965-{rs,calib,debug}.c
iwlegacy: rename iwl-3945-{rs,debugfs}.c to 3945-{rs,debug}.c
iwlegacy: move iwl-4965-{,hw,debugfs,calib}.h to 4965.h
iwlegacy: move iwl-3945-{,hw,fh,debugfs}.h to 3945.h
iwlegacy: s/STATUS_/S_/
iwlegacy: s/STATISTICS/STATS/
iwlegacy: rename REPLY_ to N_ or C_
iwlegacy: s/rx_handler/handler/
iwlegacy: s/rx_reply/hdl/
iwlegacy: rename other handlers
iwlegacy: rename iwl-core.c to common.c
iwlegacy: merge common .c files and rename module name
iwlegacy: rename iwl-commands.h to commands.h
iwlegacy: remove il_ieee80211_get_hw_conf
iwlegacy: move IL_MASK
iwlegacy: rename iwl-csr.h to csr.h
iwlegacy: rename iwl-core.h to common.h
iwlegacy: merge common header files
iwlegacy: remove iwl-helpers.h
iwlegacy: merge iwl-legacy-rs.h into common.h
iwlegacy: merge iwl-power.h into common.h
iwlegacy: merge iwl-{eeprom,led}.h into common.h
iwlegacy: rename iwl-prph.h to prph.h
iwlegacy: use FH39_ prefix in 3945 code
iwlegacy: use FH49_ prefix in 4965 code
iwlegacy: merge iwl-fh.h into 4965.h
iwlegacy: rename iwl-debug.c to debug.c
iwlegacy: merge iwl-debug.h into common.h
iwlegacy: indentions and whitespaces
iwlegacy: checkpatch.pl fixes
drivers/net/wireless/Makefile | 2 +-
drivers/net/wireless/iwlegacy/3945-debug.c | 505 ++
drivers/net/wireless/iwlegacy/3945-mac.c | 3978 ++++++++++++
drivers/net/wireless/iwlegacy/3945-rs.c | 995 +++
drivers/net/wireless/iwlegacy/3945.c | 2751 ++++++++
drivers/net/wireless/iwlegacy/3945.h | 626 ++
.../iwlegacy/{iwl-4965-calib.c => 4965-calib.c} | 613 +-
drivers/net/wireless/iwlegacy/4965-debug.c | 746 +++
drivers/net/wireless/iwlegacy/4965-mac.c | 6536 ++++++++++++++++++++
drivers/net/wireless/iwlegacy/4965-rs.c | 2860 +++++++++
drivers/net/wireless/iwlegacy/4965.c | 2423 ++++++++
drivers/net/wireless/iwlegacy/4965.h | 1309 ++++
drivers/net/wireless/iwlegacy/Kconfig | 43 +-
drivers/net/wireless/iwlegacy/Makefile | 22 +-
.../iwlegacy/{iwl-commands.h => commands.h} | 1134 ++--
drivers/net/wireless/iwlegacy/common.c | 5704 +++++++++++++++++
drivers/net/wireless/iwlegacy/common.h | 3424 ++++++++++
drivers/net/wireless/iwlegacy/{iwl-csr.h => csr.h} | 93 +-
drivers/net/wireless/iwlegacy/debug.c | 1410 +++++
drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c | 523 --
drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h | 60 -
drivers/net/wireless/iwlegacy/iwl-3945-fh.h | 187 -
drivers/net/wireless/iwlegacy/iwl-3945-hw.h | 291 -
drivers/net/wireless/iwlegacy/iwl-3945-led.c | 63 -
drivers/net/wireless/iwlegacy/iwl-3945-led.h | 32 -
drivers/net/wireless/iwlegacy/iwl-3945-rs.c | 996 ---
drivers/net/wireless/iwlegacy/iwl-3945.c | 2741 --------
drivers/net/wireless/iwlegacy/iwl-3945.h | 308 -
drivers/net/wireless/iwlegacy/iwl-4965-calib.h | 75 -
drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c | 774 ---
drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h | 59 -
drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c | 154 -
drivers/net/wireless/iwlegacy/iwl-4965-hw.h | 811 ---
drivers/net/wireless/iwlegacy/iwl-4965-led.c | 73 -
drivers/net/wireless/iwlegacy/iwl-4965-led.h | 33 -
drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 1194 ----
drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 2871 ---------
drivers/net/wireless/iwlegacy/iwl-4965-rx.c | 215 -
drivers/net/wireless/iwlegacy/iwl-4965-sta.c | 721 ---
drivers/net/wireless/iwlegacy/iwl-4965-tx.c | 1378 -----
drivers/net/wireless/iwlegacy/iwl-4965-ucode.c | 166 -
drivers/net/wireless/iwlegacy/iwl-4965.c | 2183 -------
drivers/net/wireless/iwlegacy/iwl-4965.h | 282 -
drivers/net/wireless/iwlegacy/iwl-core.c | 2659 --------
drivers/net/wireless/iwlegacy/iwl-core.h | 634 --
drivers/net/wireless/iwlegacy/iwl-debug.h | 198 -
drivers/net/wireless/iwlegacy/iwl-debugfs.c | 1313 ----
drivers/net/wireless/iwlegacy/iwl-dev.h | 1364 ----
drivers/net/wireless/iwlegacy/iwl-devtrace.c | 42 -
drivers/net/wireless/iwlegacy/iwl-devtrace.h | 210 -
drivers/net/wireless/iwlegacy/iwl-eeprom.c | 553 --
drivers/net/wireless/iwlegacy/iwl-eeprom.h | 344 -
drivers/net/wireless/iwlegacy/iwl-fh.h | 513 --
drivers/net/wireless/iwlegacy/iwl-hcmd.c | 271 -
drivers/net/wireless/iwlegacy/iwl-helpers.h | 196 -
drivers/net/wireless/iwlegacy/iwl-io.h | 545 --
drivers/net/wireless/iwlegacy/iwl-led.c | 205 -
drivers/net/wireless/iwlegacy/iwl-led.h | 56 -
drivers/net/wireless/iwlegacy/iwl-legacy-rs.h | 456 --
drivers/net/wireless/iwlegacy/iwl-power.c | 165 -
drivers/net/wireless/iwlegacy/iwl-power.h | 55 -
drivers/net/wireless/iwlegacy/iwl-rx.c | 281 -
drivers/net/wireless/iwlegacy/iwl-scan.c | 549 --
drivers/net/wireless/iwlegacy/iwl-spectrum.h | 4 +-
drivers/net/wireless/iwlegacy/iwl-sta.c | 816 ---
drivers/net/wireless/iwlegacy/iwl-sta.h | 148 -
drivers/net/wireless/iwlegacy/iwl-tx.c | 656 --
drivers/net/wireless/iwlegacy/iwl3945-base.c | 4016 ------------
drivers/net/wireless/iwlegacy/iwl4965-base.c | 3281 ----------
.../net/wireless/iwlegacy/{iwl-prph.h => prph.h} | 133 +-
70 files changed, 34254 insertions(+), 36773 deletions(-)
create mode 100644 drivers/net/wireless/iwlegacy/3945-debug.c
create mode 100644 drivers/net/wireless/iwlegacy/3945-mac.c
create mode 100644 drivers/net/wireless/iwlegacy/3945-rs.c
create mode 100644 drivers/net/wireless/iwlegacy/3945.c
create mode 100644 drivers/net/wireless/iwlegacy/3945.h
rename drivers/net/wireless/iwlegacy/{iwl-4965-calib.c => 4965-calib.c} (55%)
create mode 100644 drivers/net/wireless/iwlegacy/4965-debug.c
create mode 100644 drivers/net/wireless/iwlegacy/4965-mac.c
create mode 100644 drivers/net/wireless/iwlegacy/4965-rs.c
create mode 100644 drivers/net/wireless/iwlegacy/4965.c
create mode 100644 drivers/net/wireless/iwlegacy/4965.h
rename drivers/net/wireless/iwlegacy/{iwl-commands.h => commands.h} (79%)
create mode 100644 drivers/net/wireless/iwlegacy/common.c
create mode 100644 drivers/net/wireless/iwlegacy/common.h
rename drivers/net/wireless/iwlegacy/{iwl-csr.h => csr.h} (84%)
create mode 100644 drivers/net/wireless/iwlegacy/debug.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-fh.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-hw.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-led.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-led.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-rs.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-calib.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-hw.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-led.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-led.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-lib.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rs.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rx.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-sta.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-tx.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-core.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-core.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-debug.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-debugfs.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-dev.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-fh.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-hcmd.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-helpers.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-io.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-led.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-led.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-power.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-power.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-rx.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-scan.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-sta.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-sta.h
delete mode 100644 drivers/net/wireless/iwlegacy/iwl-tx.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl3945-base.c
delete mode 100644 drivers/net/wireless/iwlegacy/iwl4965-base.c
rename drivers/net/wireless/iwlegacy/{iwl-prph.h => prph.h} (83%)
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: pull request: iwlegacy 2011-09-14
2011-09-14 8:59 pull request: iwlegacy 2011-09-14 Stanislaw Gruszka
@ 2011-09-19 19:31 ` John W. Linville
2011-09-19 22:24 ` Greg Dietsche
0 siblings, 1 reply; 5+ messages in thread
From: John W. Linville @ 2011-09-19 19:31 UTC (permalink / raw)
To: Stanislaw Gruszka; +Cc: Greg Dietsche, linux-wireless
On Wed, Sep 14, 2011 at 10:59:16AM +0200, Stanislaw Gruszka wrote:
> John,
>
> Please pull iwlegacy cleanup changes done by Greg and me, intended
> for 3.2. These request include huge patches with file renaming and
> automatic code processing done by sed and indent. Work of changing
> iwlegacy driver into something that I could consider maintainable
> is not done yet, but these massive changes bring closer into that.
> Hopefully with having clean, maintainable code I will be able to
> fix some nasty, not easy reproducible bugs, we still have in the
> iwlegacy driver.
>
> Thanks.
>
> The following changes since commit d82cdad64a0127611724c61849a8487d69fb76ef:
>
> Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next (2011-08-30 16:34:33 -0400)
>
> are available in the git repository at:
>
> git://github.com/dietsche/linux.git wireless-next-iwlegacy-stanislaw-greg
It looks like you pulled something other than wireless-next into this
tree. If you want me to pull directly, then you need to based your
tree (or at least the branch I'm pulling) on wireless-next exclusively.
Thanks,
John
[linville-8530p.local]:> git pull git://github.com/dietsche/linux.git wireless-next-iwlegacy-stanislaw-greg
remote: Counting objects: 5879, done.
remote: Compressing objects: 100% (1686/1686), done.
remote: Total 4450 (delta 3658), reused 3527 (delta 2753)
Receiving objects: 100% (4450/4450), 1.56 MiB | 969 KiB/s, done.
Resolving deltas: 100% (3658/3658), completed with 719 local objects.
>From git://github.com/dietsche/linux
* branch wireless-next-iwlegacy-stanislaw-greg -> FETCH_HEAD
Removing Documentation/DocBook/dvb/dvbproperty.xml
Removing Documentation/DocBook/dvb/dvbstb.png
Removing Documentation/DocBook/dvb/frontend.h.xml
Removing Documentation/DocBook/media-entities.tmpl
Removing Documentation/DocBook/media-indices.tmpl
Auto-merging Documentation/DocBook/media/dvb/audio.xml
Auto-merging Documentation/DocBook/media/dvb/ca.xml
Auto-merging Documentation/DocBook/media/dvb/demux.xml
Auto-merging Documentation/DocBook/media/dvb/dvbapi.xml
Auto-merging Documentation/DocBook/media/dvb/frontend.xml
Auto-merging Documentation/DocBook/media/dvb/intro.xml
Auto-merging Documentation/DocBook/media/dvb/net.xml
Auto-merging Documentation/DocBook/media/dvb/video.xml
Auto-merging Documentation/DocBook/media/v4l/common.xml
Auto-merging Documentation/DocBook/media/v4l/compat.xml
Auto-merging Documentation/DocBook/media/v4l/controls.xml
Auto-merging Documentation/DocBook/media/v4l/lirc_device_interface.xml
Auto-merging Documentation/DocBook/media/v4l/media-func-ioctl.xml
Auto-merging Documentation/DocBook/media/v4l/media-ioc-device-info.xml
Auto-merging Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
Auto-merging Documentation/DocBook/media/v4l/media-ioc-setup-link.xml
Auto-merging Documentation/DocBook/media/v4l/pixfmt.xml
Auto-merging Documentation/DocBook/media/v4l/subdev-formats.xml
Auto-merging Documentation/DocBook/media/v4l/v4l2.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-cropcap.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-dqevent.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-enum-frameintervals.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-enumaudio.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-enumaudioout.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-audio.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-audioout.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-crop.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-fmt.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-input.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-output.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-parm.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-priority.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-g-std.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-log-status.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-overlay.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-qbuf.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-querycap.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-queryctrl.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-querystd.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-reqbufs.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-streamon.xml
Auto-merging Documentation/DocBook/media/v4l/vidioc-subdev-g-fmt.xml
Auto-merging Documentation/DocBook/media_api.tmpl
Removing Documentation/DocBook/v4l/bayer.pdf
Removing Documentation/DocBook/v4l/bayer.png
Removing Documentation/DocBook/v4l/crop.gif
Removing Documentation/DocBook/v4l/dev-event.xml
Removing Documentation/DocBook/v4l/fieldseq_bt.gif
Removing Documentation/DocBook/v4l/fieldseq_tb.gif
Removing Documentation/DocBook/v4l/func-ioctl.xml
Removing Documentation/DocBook/v4l/nv12mt.gif
Removing Documentation/DocBook/v4l/nv12mt_example.gif
Removing Documentation/DocBook/v4l/pipeline.png
Removing Documentation/DocBook/v4l/vbi_525.gif
Removing Documentation/DocBook/v4l/vbi_625.gif
Removing Documentation/DocBook/v4l/vbi_hsync.gif
Removing Documentation/DocBook/v4l/videodev2.h.xml
Removing Documentation/DocBook/v4l/vidioc-subscribe-event.xml
Auto-merging MAINTAINERS
Removing arch/arm/lib/sha1.S
Removing arch/arm/mach-mmp/include/mach/mfp-gplugd.h
Removing arch/arm/mach-msm/gpio.c
Removing arch/arm/mach-msm/gpio_hw.h
Removing arch/arm/mach-zynq/board_dt.c
Removing arch/sparc/include/asm/div64.h
Removing arch/sparc/include/asm/irq_regs.h
Removing arch/sparc/include/asm/local.h
Removing arch/sparc/include/asm/local64.h
Removing arch/sparc/lib/NG2page.S
Removing arch/tile/include/asm/bug.h
Removing arch/tile/include/asm/bugs.h
Removing arch/tile/include/asm/cputime.h
Removing arch/tile/include/asm/device.h
Removing arch/tile/include/asm/div64.h
Removing arch/tile/include/asm/emergency-restart.h
Removing arch/tile/include/asm/errno.h
Removing arch/tile/include/asm/fb.h
Removing arch/tile/include/asm/fcntl.h
Removing arch/tile/include/asm/ioctl.h
Removing arch/tile/include/asm/ioctls.h
Removing arch/tile/include/asm/ipc.h
Removing arch/tile/include/asm/ipcbuf.h
Removing arch/tile/include/asm/irq_regs.h
Removing arch/tile/include/asm/kdebug.h
Removing arch/tile/include/asm/local.h
Removing arch/tile/include/asm/module.h
Removing arch/tile/include/asm/msgbuf.h
Removing arch/tile/include/asm/mutex.h
Removing arch/tile/include/asm/param.h
Removing arch/tile/include/asm/parport.h
Removing arch/tile/include/asm/poll.h
Removing arch/tile/include/asm/posix_types.h
Removing arch/tile/include/asm/resource.h
Removing arch/tile/include/asm/scatterlist.h
Removing arch/tile/include/asm/sembuf.h
Removing arch/tile/include/asm/serial.h
Removing arch/tile/include/asm/shmbuf.h
Removing arch/tile/include/asm/shmparam.h
Removing arch/tile/include/asm/socket.h
Removing arch/tile/include/asm/sockios.h
Removing arch/tile/include/asm/statfs.h
Removing arch/tile/include/asm/termbits.h
Removing arch/tile/include/asm/termios.h
Removing arch/tile/include/asm/types.h
Removing arch/tile/include/asm/ucontext.h
Removing arch/tile/include/asm/xor.h
Auto-merging drivers/gpio/gpio-msm-v2.c
Auto-merging drivers/hwmon/pmbus/adm1275.c
Auto-merging drivers/hwmon/pmbus/max16064.c
Auto-merging drivers/hwmon/pmbus/max34440.c
Auto-merging drivers/hwmon/pmbus/max8688.c
Auto-merging drivers/hwmon/pmbus/pmbus.c
Auto-merging drivers/hwmon/pmbus/pmbus.h
Auto-merging drivers/hwmon/pmbus/pmbus_core.c
Removing drivers/media/video/cafe_ccic-regs.h
Removing drivers/media/video/cafe_ccic.c
Removing drivers/media/video/pwc/pwc-ioctl.h
Removing drivers/media/video/pwc/pwc-uncompress.h
Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Auto-merging drivers/net/wireless/ath/ath9k/ar9003_phy.c
Auto-merging drivers/net/wireless/ath/ath9k/ar9003_phy.h
Auto-merging drivers/net/wireless/ath/ath9k/main.c
Auto-merging drivers/net/wireless/iwlegacy/4965-calib.c
Auto-merging drivers/net/wireless/iwlegacy/commands.h
Auto-merging drivers/net/wireless/iwlegacy/csr.h
Removing drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c
Removing drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h
Removing drivers/net/wireless/iwlegacy/iwl-3945-fh.h
Removing drivers/net/wireless/iwlegacy/iwl-3945-hw.h
Removing drivers/net/wireless/iwlegacy/iwl-3945-led.c
Removing drivers/net/wireless/iwlegacy/iwl-3945-led.h
Removing drivers/net/wireless/iwlegacy/iwl-3945-rs.c
Removing drivers/net/wireless/iwlegacy/iwl-3945.c
Removing drivers/net/wireless/iwlegacy/iwl-3945.h
Removing drivers/net/wireless/iwlegacy/iwl-4965-calib.h
Removing drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
Removing drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h
Removing drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
Removing drivers/net/wireless/iwlegacy/iwl-4965-hw.h
Removing drivers/net/wireless/iwlegacy/iwl-4965-led.c
Removing drivers/net/wireless/iwlegacy/iwl-4965-led.h
Removing drivers/net/wireless/iwlegacy/iwl-4965-lib.c
Removing drivers/net/wireless/iwlegacy/iwl-4965-rs.c
Removing drivers/net/wireless/iwlegacy/iwl-4965-rx.c
Removing drivers/net/wireless/iwlegacy/iwl-4965-sta.c
Removing drivers/net/wireless/iwlegacy/iwl-4965-tx.c
Removing drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
Removing drivers/net/wireless/iwlegacy/iwl-4965.c
Removing drivers/net/wireless/iwlegacy/iwl-4965.h
Removing drivers/net/wireless/iwlegacy/iwl-core.c
Removing drivers/net/wireless/iwlegacy/iwl-core.h
Removing drivers/net/wireless/iwlegacy/iwl-debug.h
Removing drivers/net/wireless/iwlegacy/iwl-debugfs.c
Removing drivers/net/wireless/iwlegacy/iwl-dev.h
Removing drivers/net/wireless/iwlegacy/iwl-devtrace.c
Removing drivers/net/wireless/iwlegacy/iwl-devtrace.h
Removing drivers/net/wireless/iwlegacy/iwl-eeprom.c
Removing drivers/net/wireless/iwlegacy/iwl-eeprom.h
Removing drivers/net/wireless/iwlegacy/iwl-fh.h
Removing drivers/net/wireless/iwlegacy/iwl-hcmd.c
Removing drivers/net/wireless/iwlegacy/iwl-helpers.h
Removing drivers/net/wireless/iwlegacy/iwl-io.h
Removing drivers/net/wireless/iwlegacy/iwl-led.c
Removing drivers/net/wireless/iwlegacy/iwl-led.h
Removing drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
Removing drivers/net/wireless/iwlegacy/iwl-power.c
Removing drivers/net/wireless/iwlegacy/iwl-power.h
Removing drivers/net/wireless/iwlegacy/iwl-rx.c
Removing drivers/net/wireless/iwlegacy/iwl-scan.c
Removing drivers/net/wireless/iwlegacy/iwl-sta.c
Removing drivers/net/wireless/iwlegacy/iwl-sta.h
Removing drivers/net/wireless/iwlegacy/iwl-tx.c
Removing drivers/net/wireless/iwlegacy/iwl3945-base.c
Removing drivers/net/wireless/iwlegacy/iwl4965-base.c
Auto-merging drivers/net/wireless/iwlegacy/prph.h
Auto-merging drivers/net/wireless/iwlwifi/iwl-pci.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-pci.c
Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2800usb.c
Auto-merging drivers/net/wireless/wl12xx/main.c
CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/main.c
Auto-merging drivers/staging/zcache/zcache-main.c
Auto-merging drivers/watchdog/at91sam9_wdt.h
Removing fs/btrfs/ref-cache.c
Removing fs/btrfs/ref-cache.h
Auto-merging fs/exofs/ore.c
Removing fs/exofs/pnfs.h
Auto-merging fs/xfs/xfs_acl.c
Auto-merging fs/xfs/xfs_buf.c
Auto-merging fs/xfs/xfs_buf.h
Auto-merging fs/xfs/xfs_dquot.c
Auto-merging fs/xfs/xfs_linux.h
Auto-merging fs/xfs/xfs_qm.c
Auto-merging fs/xfs/xfs_quotaops.c
Auto-merging fs/xfs/xfs_sync.c
Auto-merging fs/xfs/xfs_trace.c
Auto-merging include/net/cfg80211.h
Auto-merging include/sound/wm8996.h
Auto-merging net/wireless/core.c
Removing scripts/kconfig/kconfig_load.c
Removing sound/soc/codecs/wm8915.c
Removing sound/soc/codecs/wm8915.h
Automatic merge failed; fix conflicts and then commit the result.
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pull request: iwlegacy 2011-09-14
2011-09-19 19:31 ` John W. Linville
@ 2011-09-19 22:24 ` Greg Dietsche
2011-09-19 22:59 ` Greg Dietsche
2011-09-20 7:18 ` Stanislaw Gruszka
0 siblings, 2 replies; 5+ messages in thread
From: Greg Dietsche @ 2011-09-19 22:24 UTC (permalink / raw)
To: John W. Linville; +Cc: Stanislaw Gruszka, linux-wireless
On Mon, 19 Sep 2011 15:31:22 -0400, John W. Linville wrote:
> On Wed, Sep 14, 2011 at 10:59:16AM +0200, Stanislaw Gruszka wrote:
>> John,
>>
>> Please pull iwlegacy cleanup changes done by Greg and me, intended
>> for 3.2. These request include huge patches with file renaming and
>> automatic code processing done by sed and indent. Work of changing
>> iwlegacy driver into something that I could consider maintainable
>> is not done yet, but these massive changes bring closer into that.
>> Hopefully with having clean, maintainable code I will be able to
>> fix some nasty, not easy reproducible bugs, we still have in the
>> iwlegacy driver.
>>
>> Thanks.
>>
>> The following changes since commit
>> d82cdad64a0127611724c61849a8487d69fb76ef:
>>
>> Merge branch 'master' of
>> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
>> (2011-08-30 16:34:33 -0400)
>>
>> are available in the git repository at:
>>
>> git://github.com/dietsche/linux.git
>> wireless-next-iwlegacy-stanislaw-greg
>
> It looks like you pulled something other than wireless-next into this
> tree. If you want me to pull directly, then you need to based your
> tree (or at least the branch I'm pulling) on wireless-next
> exclusively.
Sorry for the confusing branch name! I was naming it based on which
kernel release the code is for and not where it was branched from. Also,
I hadn't anticipated that my git tree might end up in pull request...
The branch wireless-next-iwlegacy-stanislaw-greg is based on John's
wireless-testing tree. Looking at previous emails in this thread, we
referred to wireless-testing as the base for the changes, so branching
from wireless-testing was done on purpose.
I briefly tried to apply the patch set to wireless-next, but it doesn't
like Stanislaw's second patch (rename iwl to il). So some work will need
to be done if we really need to pull into wireless-next.
I'm not real familiar with the pull process... so let me know if you'd
like me to do something.
Greg
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pull request: iwlegacy 2011-09-14
2011-09-19 22:24 ` Greg Dietsche
@ 2011-09-19 22:59 ` Greg Dietsche
2011-09-20 7:18 ` Stanislaw Gruszka
1 sibling, 0 replies; 5+ messages in thread
From: Greg Dietsche @ 2011-09-19 22:59 UTC (permalink / raw)
To: John W. Linville; +Cc: Stanislaw Gruszka, linux-wireless
On 09/19/2011 05:24 PM, Greg Dietsche wrote:
> On Mon, 19 Sep 2011 15:31:22 -0400, John W. Linville wrote:
>> On Wed, Sep 14, 2011 at 10:59:16AM +0200, Stanislaw Gruszka wrote:
>>> John,
>>>
>>> Please pull iwlegacy cleanup changes done by Greg and me, intended
>>> for 3.2. These request include huge patches with file renaming and
>>> automatic code processing done by sed and indent. Work of changing
>>> iwlegacy driver into something that I could consider maintainable
>>> is not done yet, but these massive changes bring closer into that.
>>> Hopefully with having clean, maintainable code I will be able to
>>> fix some nasty, not easy reproducible bugs, we still have in the
>>> iwlegacy driver.
>>>
>>> Thanks.
>>>
>>> The following changes since commit
>>> d82cdad64a0127611724c61849a8487d69fb76ef:
>>>
>>> Merge branch 'master' of
>>> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
>>> (2011-08-30 16:34:33 -0400)
>>>
>>> are available in the git repository at:
>>>
>>> git://github.com/dietsche/linux.git
>>> wireless-next-iwlegacy-stanislaw-greg
>>
>> It looks like you pulled something other than wireless-next into this
>> tree. If you want me to pull directly, then you need to based your
>> tree (or at least the branch I'm pulling) on wireless-next
>> exclusively.
>
> Sorry for the confusing branch name! I was naming it based on which
> kernel release the code is for and not where it was branched from. Also,
> I hadn't anticipated that my git tree might end up in pull request...
>
> The branch wireless-next-iwlegacy-stanislaw-greg is based on John's
> wireless-testing tree. Looking at previous emails in this thread, we
> referred to wireless-testing as the base for the changes, so branching
> from wireless-testing was done on purpose.
>
> I briefly tried to apply the patch set to wireless-next, but it doesn't
> like Stanislaw's second patch (rename iwl to il). So some work will need
> to be done if we really need to pull into wireless-next.
>
> I'm not real familiar with the pull process... so let me know if you'd
> like me to do something.
>
>
> Greg
To make things less confusing, I created a new branch and pushed it. you
can pull from here if you'd like:
git://github.com/dietsche/linux.git
wireless-testing-2011-09-14-iwlegacy-cleanup
Greg
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pull request: iwlegacy 2011-09-14
2011-09-19 22:24 ` Greg Dietsche
2011-09-19 22:59 ` Greg Dietsche
@ 2011-09-20 7:18 ` Stanislaw Gruszka
1 sibling, 0 replies; 5+ messages in thread
From: Stanislaw Gruszka @ 2011-09-20 7:18 UTC (permalink / raw)
To: Greg Dietsche; +Cc: John W. Linville, linux-wireless
On Mon, Sep 19, 2011 at 05:24:41PM -0500, Greg Dietsche wrote:
> On Mon, 19 Sep 2011 15:31:22 -0400, John W. Linville wrote:
> >On Wed, Sep 14, 2011 at 10:59:16AM +0200, Stanislaw Gruszka wrote:
> >>John,
> >>
> >>Please pull iwlegacy cleanup changes done by Greg and me, intended
> >>for 3.2. These request include huge patches with file renaming and
> >>automatic code processing done by sed and indent. Work of changing
> >>iwlegacy driver into something that I could consider maintainable
> >>is not done yet, but these massive changes bring closer into that.
> >>Hopefully with having clean, maintainable code I will be able to
> >>fix some nasty, not easy reproducible bugs, we still have in the
> >>iwlegacy driver.
> >>
> >>Thanks.
> >>
> >>The following changes since commit
> >>d82cdad64a0127611724c61849a8487d69fb76ef:
> >>
> >> Merge branch 'master' of
> >>git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
> >>(2011-08-30 16:34:33 -0400)
> >>
> >>are available in the git repository at:
> >>
> >> git://github.com/dietsche/linux.git
> >>wireless-next-iwlegacy-stanislaw-greg
> >
> >It looks like you pulled something other than wireless-next into this
> >tree. If you want me to pull directly, then you need to based your
> >tree (or at least the branch I'm pulling) on wireless-next
> >exclusively.
>
> Sorry for the confusing branch name! I was naming it based on which
> kernel release the code is for and not where it was branched from.
> Also, I hadn't anticipated that my git tree might end up in pull
> request...
>
> The branch wireless-next-iwlegacy-stanislaw-greg is based on John's
> wireless-testing tree. Looking at previous emails in this thread, we
> referred to wireless-testing as the base for the changes, so
> branching from wireless-testing was done on purpose.
>
> I briefly tried to apply the patch set to wireless-next, but it
> doesn't like Stanislaw's second patch (rename iwl to il). So some
> work will need to be done if we really need to pull into
> wireless-next.
I will setup wireless-next based tree on github. I'll need it anyway
for future changes.
Thanks
Stanislaw
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-09-20 7:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-14 8:59 pull request: iwlegacy 2011-09-14 Stanislaw Gruszka
2011-09-19 19:31 ` John W. Linville
2011-09-19 22:24 ` Greg Dietsche
2011-09-19 22:59 ` Greg Dietsche
2011-09-20 7:18 ` Stanislaw Gruszka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).