headers
Jens Kasten | 4 Aug 2012 10:51
Picon

git pull

hi list,

Somehow when I do a pull to update the kernel archive i get:

Auto-merging rsbac/data_structures/aci_ata_structures.c
CONFLICT (add/add): Merge conflict in 
rsbac/data_structures/aci_data_structures.c
Automatic merge failed; fix conflicts and then commit the result.

Its not the first time that update the master branch failed.

--

-- 
Mit freundlichen Grüßen

Jens Kasten

http://www.kasten-edv.de
E-bikes: http://www.remsdale.de
_______________________________________________
rsbac mailing list
rsbac <at> rsbac.org
http://www.rsbac.org/mailman/listinfo/rsbac
Permalink | Reply |
headers
Jens Kasten | 4 Aug 2012 15:49
Picon

Re: git pull

When I try to build now kernel i get:

fs/open.c: In function ‘sys_fchdir’:
fs/open.c:548: error: redeclaration of ‘rsbac_target_id’ with no 
linkage
fs/open.c:543: note: previous declaration of ‘rsbac_target_id’ was here
fs/open.c:549: error: redeclaration of ‘rsbac_attribute_value’ with no 
linkage
fs/open.c:544: note: previous declaration of ‘rsbac_attribute_value’ 
was here
make[2]: *** [fs/open.o] Fehler 1

Its the latest git linux-3.4.y (3.4.7)

Am 2012-08-04 10:51, schrieb Jens Kasten:
> hi list,
>
> Somehow when I do a pull to update the kernel archive i get:
>
> Auto-merging rsbac/data_structures/aci_ata_structures.c
> CONFLICT (add/add): Merge conflict in
> rsbac/data_structures/aci_data_structures.c
> Automatic merge failed; fix conflicts and then commit the result.
>
> Its not the first time that update the master branch failed.

--

-- 
Mit freundlichen Grüßen

Jens Kasten
(Continue reading)

Permalink | Reply |
headers
Jens Kasten | 8 Aug 2012 21:23
Picon

Re: git pull

Hi,

this I had to do, see attachment.
Now I can compile the kernel.

Am Samstag, den 04.08.2012, 15:49 +0200 schrieb Jens Kasten:
> When I try to build now kernel i get:
> 
> fs/open.c: In function ‘sys_fchdir’:
> fs/open.c:548: error: redeclaration of ‘rsbac_target_id’ with no 
> linkage
> fs/open.c:543: note: previous declaration of ‘rsbac_target_id’ was here
> fs/open.c:549: error: redeclaration of ‘rsbac_attribute_value’ with no 
> linkage
> fs/open.c:544: note: previous declaration of ‘rsbac_attribute_value’ 
> was here
> make[2]: *** [fs/open.o] Fehler 1
> 
> Its the latest git linux-3.4.y (3.4.7)
> 
> 
> Am 2012-08-04 10:51, schrieb Jens Kasten:
> > hi list,
> >
> > Somehow when I do a pull to update the kernel archive i get:
> >
> > Auto-merging rsbac/data_structures/aci_ata_structures.c
> > CONFLICT (add/add): Merge conflict in
> > rsbac/data_structures/aci_data_structures.c
> > Automatic merge failed; fix conflicts and then commit the result.
(Continue reading)

Permalink | Reply |

Gmane