From: Jim C. <jim...@gm...> - 2012-05-15 07:56:52
|
this is on top of Larrys 15 On Tue, May 15, 2012 at 1:50 AM, Jim Cromie <jim...@gm...> wrote: > hi Oliver, Larry, > > heres another batch of merges, sparse fixes, comment wraps and grammar > fixes, and various other stuff. Another chance to amortize your testing efforts over more changes ;-) > > > common.c | 188 +++++++++++++++++++---------- > debugfs.c | 26 ++-- > inlines.h | 75 +++++------- > mem.c | 55 +++++---- > mem.h | 4 +- > merge.c | 408 +++++++++++++++++++++++++++++++------------------------------- > merge.h | 204 +++++++++++++++++++++++-------- > pci.c | 23 ++-- > 8 files changed, 569 insertions(+), 414 deletions(-) > > > 0001-merge.c-fix-ifdef-CONFIG_PCI.patch > 0002-debugfs-refine-config-build-choices.patch > - improve configurability > > 0003-debugfs.c-tweak-commentary.patch > - note use of inode/dentry->privates > > 0004-debugfs.c-make-debugfs_fops-static.patch > 0005-common.c-fix-5-copy_from_user-omissions-in-acx_proc_.patch > - fix sparse issues > > 0006-pci.c-fix-sparse-warnings.patch > 0007-mem-statics-etc-linewraps.patch > 0008-merge-drop-if0d-restore-statics-fixup-headers.patch > 0009-common.c-set-debug-flags-by-symbolic-names.patch > 0010-inlines.h-ifdef-comment-cleanup.patch > 0011-inlines.h-prettier.patch > 0012-merge-stick-with-mem.c-acxmem_proc_diag_output.patch > - merging looks too ugly, defer > > 0013-refactor-for-USB-only-builds.patch > - wrap entire file in ifdef skip unless PCI or MEM > > 0014-merge.c-comment-wrap.patch > 0015-merge.h-make-USB-only-cleanly.patch > - reason for 1,2 > - adds decl_or_stub helper macro, > > 0016-merge.c-drop-if0d-acxmem_get_txhostdesc.patch > - merge cleanup > > 0017-merge.c-add-comments-to-ifdefs-to-aid-searches-greps.patch > - help find remaining merges > > 0018-common.c-fix-var-val-style.patch > 0019-merge-redo-acxpci_upload_fw-as-wrapper-on-_acx_uploa.patch > - finish partial merge of upload-fw > > > |