summaryrefslogtreecommitdiff
path: root/Next/quilt-import.log
blob: b723bb3114738e1f786731e6bcd0f2a363e872f8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
Importing jdelvare-hwmon based on 3.15-rc7
Unknown BASE
Importing rd-docs based on 3.17-rc1
Unknown BASE
Importing jdelvare-hwmon based on 3.15-rc7
Unknown BASE
Importing rd-docs based on 3.17-rc1
Unknown BASE
Importing jdelvare-hwmon based on 3.15-rc7
Unknown BASE
Importing rd-docs based on 3.17-rc1
Unknown BASE
Importing jdelvare-hwmon based on 3.15-rc7
Unknown BASE
Importing rd-docs based on 3.17-rc1
Unknown BASE
Importing jdelvare-hwmon based on 3.15-rc7
Unknown BASE
Importing rd-docs based on 3.17-rc1
Unknown BASE
Importing jdelvare-hwmon based on 3.15-rc7
Unknown BASE
Importing rd-docs based on 3.17-rc1
Unknown BASE
Importing jdelvare-hwmon based on 3.14-rc3
Unknown BASE
Importing jdelvare-hwmon based on 3.14-rc3
Unchanged quilt series jdelvare-hwmon
Importing jdelvare-hwmon based on 3.14-rc3
Unchanged quilt series jdelvare-hwmon
Importing jdelvare-hwmon based on 3.14-rc3
Unchanged quilt series jdelvare-hwmon
Importing jdelvare-hwmon based on 3.14-rc3
$ git clone -s -l -n -q . ../quilt-tmp
$ cd ../quilt-tmp
$ git reset --hard 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2
HEAD is now at 6d0abeca3242 Linux 3.14-rc3
$ git am ../quilt/jdelvare-hwmon/hwmon-f71805f-fix-author-address.patch
Applying: hwmon: (f71805f) Fix author's address
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-01-add-additional-sysfs-group-for-temp2_type-attribute.patch
Applying: hwmon: (lm63) Add additional sysfs group for temp2_type attribute
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-02-introduce-dev-variable-to-point-to-client-dev.patch
Applying: hwmon: (lm63) Introduce 'dev' variable to point to client->dev
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-03-create-all-sysfs-groups-in-one-call.patch
Applying: hwmon: (lm63) Create all sysfs groups in one call
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-04-convert-to-use-devm_hwmon_device_register_with_groups.patch
Applying: hwmon: (lm63) Convert to use devm_hwmon_device_register_with_groups
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-05-avoid-double-initialization.patch
Applying: hwmon: (lm63) Avoid initializing the same field twice
$ git am ../quilt/jdelvare-hwmon/hwmon-adm1021-convert-to-use-devm_hwmon_device_register_with_groups.patch
Applying: hwmon: (adm1021) Convert to use devm_hwmon_device_register_with_groups
$ git am ../quilt/jdelvare-hwmon/hwmon-lm80-convert-to-use-devm_hwmon_device_register_with_groups.patch
Applying: hwmon: (lm80) Convert to use devm_hwmon_device_register_with_groups
$ git am ../quilt/jdelvare-hwmon/hwmon-pc87360-avoid-double-initializations.patch
Applying: hwmon: (pc87360) Avoid initializing the same field twice
$ git am ../quilt/jdelvare-hwmon/hwmon-avoid-double-initializations.patch
Applying: hwmon: Avoid initializing the same field twice
$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-01-create-most-optional.patch
Applying: hwmon: (lm90) Create most optional attributes with sysfs_create_group
$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-02-always-use-the-dev.patch
Applying: hwmon: (lm90) Always use the dev variable in the probe function
$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-03-create-all-sysfs-groups.patch
Applying: hwmon: (lm90) Create all sysfs groups in one call
$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-04-convert-to-use.patch
Applying: hwmon: (lm90) Convert to use hwmon_device_register_with_groups
$ cd /home/broonie/git/next/sfr/next
$ git fetch -f ../quilt-tmp master:jdelvare-hwmon/master
From ../quilt-tmp
 + c7208164e66f...3a3583e25e63 master     -> jdelvare-hwmon/master  (forced update)
Importing jdelvare-hwmon based on 3.14-rc3
Unchanged quilt series jdelvare-hwmon
Importing jdelvare-hwmon based on 3.14-rc3
Unchanged quilt series jdelvare-hwmon
Importing jdelvare-hwmon based on 3.14-rc3
Unchanged quilt series jdelvare-hwmon
Importing jdelvare-hwmon based on 3.14-rc3
Unchanged quilt series jdelvare-hwmon
Importing jdelvare-hwmon based on 3.14-rc3
Unchanged quilt series jdelvare-hwmon
Importing jdelvare-hwmon based on 3.17-rc1
$ git clone -s -l -n -q . ../quilt-tmp
$ cd ../quilt-tmp
$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9
HEAD is now at 7d1311b93e58 Linux 3.17-rc1
$ git am ../quilt/jdelvare-hwmon/hwmon-f71805f-fix-author-address.patch
Applying: hwmon: (f71805f) Fix author's address
error: patch failed: drivers/hwmon/f71805f.c:1648
error: drivers/hwmon/f71805f.c: patch does not apply
Patch failed at 0001 hwmon: (f71805f) Fix author's address
The copy of the patch that failed is found in:
   /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-01-add-additional-sysfs-group-for-temp2_type-attribute.patch
Applying: hwmon: (lm63) Add additional sysfs group for temp2_type attribute
error: patch failed: drivers/hwmon/lm63.c:915
error: drivers/hwmon/lm63.c: patch does not apply
Patch failed at 0001 hwmon: (lm63) Add additional sysfs group for temp2_type attribute
The copy of the patch that failed is found in:
   /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-02-introduce-dev-variable-to-point-to-client-dev.patch
Applying: hwmon: (lm63) Introduce 'dev' variable to point to client->dev
error: patch failed: drivers/hwmon/lm63.c:1038
error: drivers/hwmon/lm63.c: patch does not apply
Patch failed at 0001 hwmon: (lm63) Introduce 'dev' variable to point to client->dev
The copy of the patch that failed is found in:
   /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-03-create-all-sysfs-groups-in-one-call.patch
Applying: hwmon: (lm63) Create all sysfs groups in one call
error: patch failed: drivers/hwmon/lm63.c:157
error: drivers/hwmon/lm63.c: patch does not apply
Patch failed at 0001 hwmon: (lm63) Create all sysfs groups in one call
The copy of the patch that failed is found in:
   /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-04-convert-to-use-devm_hwmon_device_register_with_groups.patch
Applying: hwmon: (lm63) Convert to use devm_hwmon_device_register_with_groups
error: patch failed: drivers/hwmon/lm63.c:155
error: drivers/hwmon/lm63.c: patch does not apply
Patch failed at 0001 hwmon: (lm63) Convert to use devm_hwmon_device_register_with_groups
The copy of the patch that failed is found in:
   /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Importing jdelvare-hwmon based on 3.17-rc1
$ git clone -s -l -n -q . ../quilt-tmp
$ cd ../quilt-tmp
$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9
HEAD is now at 7d1311b93e58 Linux 3.17-rc1
$ git am ../quilt/jdelvare-hwmon/hwmon-f71805f-fix-author-address.patch
Applying: hwmon: (f71805f) Fix author's address
error: patch failed: drivers/hwmon/f71805f.c:1648
error: drivers/hwmon/f71805f.c: patch does not apply
Patch failed at 0001 hwmon: (f71805f) Fix author's address
The copy of the patch that failed is found in:
   /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-01-add-additional-sysfs-group-for-temp2_type-attribute.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-02-introduce-dev-variable-to-point-to-client-dev.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-03-create-all-sysfs-groups-in-one-call.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-04-convert-to-use-devm_hwmon_device_register_with_groups.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-05-avoid-double-initialization.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ git am ../quilt/jdelvare-hwmon/hwmon-adm1021-convert-to-use-devm_hwmon_device_register_with_groups.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ git am ../quilt/jdelvare-hwmon/hwmon-lm80-convert-to-use-devm_hwmon_device_register_with_groups.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ git am ../quilt/jdelvare-hwmon/hwmon-pc87360-avoid-double-initializations.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ git am ../quilt/jdelvare-hwmon/hwmon-avoid-double-initializations.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-01-create-most-optional.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-02-always-use-the-dev.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-03-create-all-sysfs-groups.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-04-convert-to-use.patch
previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given.
$ cd /home/broonie/git/next/sfr/next
$ git fetch -f ../quilt-tmp master:jdelvare-hwmon/master
From ../quilt-tmp
 + 3a3583e...7d1311b master     -> jdelvare-hwmon/master  (forced update)
Importing jdelvare-hwmon based on 3.17-rc1
Unchanged quilt series jdelvare-hwmon
Importing jdelvare-hwmon based on 3.17-rc1
Unchanged quilt series jdelvare-hwmon
Importing jdelvare-hwmon based on 3.17-rc1
Unchanged quilt series jdelvare-hwmon
Importing jdelvare-hwmon based on 3.15-rc7
	quilt series is empty
$ git branch -f jdelvare-hwmon/master c7208164e66f63e3ec1759b98087849286410741
Importing jdelvare-hwmon based on 3.15-rc7
Unchanged quilt series jdelvare-hwmon
Importing jdelvare-hwmon based on 3.15-rc7
Unchanged quilt series jdelvare-hwmon
Importing rd-docs based on 3.17-rc1
Unchanged quilt series rd-docs
Importing jdelvare-hwmon based on 3.15-rc7
Unchanged quilt series jdelvare-hwmon
Importing rd-docs based on 3.17-rc1
$ git clone -s -l -n -q . ../quilt-tmp
$ cd ../quilt-tmp
$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9
HEAD is now at 7d1311b93e58 Linux 3.17-rc1
$ git am ../quilt/rd-docs/001-docum-use-subdiry-avoid-builtin.patch
Patch format detection failed.
$ git am ../quilt/rd-docs/002-docum-add-make-more-targets.patch
Patch format detection failed.
$ git am ../quilt/rd-docs/003-docum-funcs-static.patch
Applying: Documentation: make functions static to avoid prototype warnings
$ git am ../quilt/rd-docs/004-docum-misc-warnings.patch
Patch format detection failed.
$ git am ../quilt/rd-docs/docum-submit-patches-add-gregkh-page.patch
Patch format detection failed.
$ git am ../quilt/rd-docs/media-v4l2-pci-skel-dep-pci.patch
Patch format detection failed.
$ git am ../quilt/rd-docs/docum-i2c-fix-interface-example.patch
Patch format detection failed.
$ git am ../quilt/rd-docs/docum-fs-seq-open-release-private.patch
Patch format detection failed.
$ git am ../quilt/rd-docs/docum-misc-devices-freefall.patch
Patch format detection failed.
$ cd /home/broonie/git/next/sfr/next
$ git fetch -f ../quilt-tmp master:rd-docs/master
From ../quilt-tmp
 + 1f65b1aaaa0a...330261642606 master     -> rd-docs/master  (forced update)
Importing jdelvare-hwmon based on 3.15-rc7
Unchanged quilt series jdelvare-hwmon
Importing rd-docs based on 3.17-rc1
Unchanged quilt series rd-docs